Vladimír Čunát 30f31c9afc Merge 'master' into staging ... (relatively simple conflicts)		2015-04-26 22:52:08 +02:00
..
all-packages.nix	Merge 'master' into staging	2015-04-26 22:52:08 +02:00
emacs-packages.nix	Merge pull request #7456 from bcdarwin/button-lock	2015-04-19 09:52:06 +02:00
go-packages.nix	goPackages: add confd, grafana and vulcand	2015-04-25 15:58:55 +02:00
guile-2-test.nix
haskell-defaults.nix	haskell-defaults.nix: remove obsolete override for cabal2nix	2015-04-23 19:55:55 +02:00
haskell-ng.nix
haskell-packages.nix	cabal2nix: bump to latest version and wrap it to include nix-prefetch-scripts in $PATH	2015-04-23 14:12:43 +02:00
lua-packages.nix	prosody: add dependency on zlib (close #6894)	2015-04-09 18:40:20 +02:00
make-tarball.nix
node-packages-generated.nix	node-packages: add a few packages, fix, regenerate	2015-04-25 14:54:26 +02:00
node-packages.json	node-packages: add a few packages, fix, regenerate	2015-04-25 14:54:26 +02:00
node-packages.nix	node-packages: add a few packages, fix, regenerate	2015-04-25 14:54:26 +02:00
perl-packages.nix	perl-packages: add Parse::DebControl	2015-04-20 04:08:59 +02:00
php-packages.nix
platforms.nix
python-packages-generated.nix
python-packages.json
python-packages.nix	Merge 'master' into staging	2015-04-26 22:52:08 +02:00
release-cross.nix
release-lib.nix
release-python.nix
release-small.nix
release.nix