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
..
default.nix	rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc	2015-01-14 20:27:55 -08:00
generate_sources.rb	firefox-bin: uses sha1 provided by Mozilla	2014-10-15 23:00:26 +09:00
sources.nix	Update firefox-bin to 35.0.1	2015-01-28 09:49:33 +09:00