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
..
builder.sh
default-builder.sh
default.nix	stdenv: fix eval - the return	2015-01-29 10:54:07 +01:00
setup.sh	Merge pull request #5714 from vcunat/p/stdenv-subst	2015-01-23 23:15:16 +01:00