nixpkgs/pkgs/stdenv
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 rename gcc-wrapper to cc-wrapper. 2015-01-14 20:26:56 -08:00
generic Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae' 2015-02-02 21:14:28 -05:00
linux mpc: also rename the attribute to libmpc 2015-01-17 09:55:32 +01:00
native rename gcc-wrapper to cc-wrapper. 2015-01-14 20:26:56 -08:00
nix rename gcc-wrapper to cc-wrapper. 2015-01-14 20:26:56 -08:00
adapters.nix rename gcc-wrapper to cc-wrapper. 2015-01-14 20:26:56 -08:00
common-path.nix
default.nix Merge branch 'darwin-stdenv' of github.com:joelteon/nixpkgs into staging 2014-09-23 11:27:53 +02:00