Eelco Dolstra a85dcf4a00 Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/development/libraries/libav/default.nix pkgs/shells/bash/bash-4.2-patches.nix pkgs/stdenv/generic/default.nix		2014-10-07 00:09:37 +02:00
..
darwin	Clean up command-line tools a bit to allow us to use an impure	2014-10-04 20:21:15 +01:00
gnu	gnu: Fix (evaluation of the) call to forceSystem.	2014-07-28 20:46:32 +02:00
linux	Merge remote-tracking branch 'origin/master' into staging	2014-10-07 00:09:37 +02:00
windows	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00