3
0
Fork 0
forked from mirrors/nixpkgs
nixpkgs/pkgs/os-specific
Vladimír Čunát dbae4f109f Merge branch 'master' into staging
Conflicts (relatively simple):
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
2015-01-31 19:34:57 +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-31 19:34:57 +01:00
windows Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00