3
0
Fork 0
forked from mirrors/nixpkgs
Nix Packages collection
Go to file
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
doc garden 2015-01-26 12:12:14 +01:00
lib Merge branch 'master' into staging 2015-01-31 19:34:57 +01:00
maintainers Merge branch 'master' into staging. 2015-01-19 18:41:17 +01:00
nixos Merge branch 'master' into staging 2015-01-31 19:34:57 +01:00
pkgs Merge branch 'master' into staging 2015-01-31 19:34:57 +01:00
.gitignore gitignore: ignore autonix tmp files 2015-01-26 20:59:52 -06:00
.travis.yml Travis: chop build in install and build phases 2014-10-15 11:05:12 +02:00
.version release: 15.04 -> 15.05 2014-12-09 15:09:06 +01:00
COPYING
default.nix if we abort with too old Nix, hint docs 2015-01-21 21:41:40 +01:00
README.md fix mailinglist link 2015-01-21 11:21:45 +01:00