Vladimír Čunát 1575bc652e Merge branch 'master' into staging ... Conflicts (simple): pkgs/os-specific/linux/util-linux/default.nix It seems this merge creates a new stdenv hash, because we had changes on both branches :-/		2015-01-13 18:07:11 +01:00
..
darwin	Revert "Introduce patchShebangsPhase ran in preConfigurePhases"	2015-01-08 10:26:49 +01:00
gnu	gnu: Fix (evaluation of the) call to forceSystem.	2014-07-28 20:46:32 +02:00
linux	Merge branch 'master' into staging	2015-01-13 18:07:11 +01:00
windows	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00