This is the master branch of nixpkgs, initially pulled from commit 8debf2f9a63d54ae4f28994290437ba54c681c7b The intent of this repo is to be merged onto nixpkgs master. This will also be of help for https://git.suyu.dev/BoomMicrophone/suyu-nix-test which I will need in order for development (it will also be helpful to know what to do for setting up the environment for the master server. Currently I am focusing on this so I can actually see what is still missing) This repo will be removed once the PR to the nixpkgs github goes through
Find a 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