Shea Levy c45372f038 Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae' ... Partial staging merge, including cc-wrapper fixes Conflicts: pkgs/applications/audio/spotify/default.nix pkgs/build-support/cc-wrapper/default.nix pkgs/development/compilers/cryptol/1.8.x.nix		2015-02-02 21:14:28 -05: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 commit 'cfb29ab882323d379aba20a95020c7c24f883eae'	2015-02-02 21:14:28 -05:00
windows	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00