nixpkgs/pkgs
Shea Levy 064155ad38 Merge branch 'recode.130306' of git://github.com/jcumming/nixpkgs
Attempts to fix recode build on darwin, verified by inspection (don't
have a readily available darwin machine for testing right now, will let
hydra see if this worked).

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-08 18:22:13 -05:00
..
applications Merge branch 'makemkv.130223.0' of git://github.com/jcumming/nixpkgs 2013-03-08 17:26:53 -05:00
build-support Merge branch 'vlada/xfce-notg' of git://github.com/vcunat/nixpkgs 2013-03-08 17:03:22 -05:00
data
desktops Merge branch 'vlada/xfce-notg' of git://github.com/vcunat/nixpkgs 2013-03-08 17:03:22 -05:00
development Merge branch 'p/selinux' of git://github.com/vcunat/nixpkgs 2013-03-08 18:00:16 -05:00
games games/unvanquished: Update to 0.13.1. 2013-03-08 20:58:48 +04:00
lib Add myself to maintainers, remove 0.9.4, set maintainer for this packge to me 2013-03-08 22:59:54 +01:00
misc Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-03-07 19:33:52 +01:00
os-specific Merge branch 'p/selinux' of git://github.com/vcunat/nixpkgs 2013-03-08 18:00:16 -05:00
servers Merge branch 'fixVmwareFix' of git://github.com/Davorak/nixpkgs 2013-03-08 18:19:02 -05:00
shells
stdenv Enable __ignoreNulls globally 2013-03-07 19:42:01 +01:00
test
tools Merge branch 'recode.130306' of git://github.com/jcumming/nixpkgs 2013-03-08 18:22:13 -05:00
top-level Merge branch 'p/selinux' of git://github.com/vcunat/nixpkgs 2013-03-08 18:00:16 -05:00