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	rename gcc-wrapper to cc-wrapper.	2015-01-14 20:26:56 -08:00
generic	Merge branch 'master' into staging	2015-01-31 19:34:57 +01: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