Vladimír Čunát e51f73652d Merge recent master into staging ... Hydra: ?compare=1149952 Conflicts: nixos/doc/manual/configuration.xml (changed split file) nixos/modules/config/users-groups.nix (choosing filterNull instead of inline definition) pkgs/development/libraries/readline/readline6.3.nix (auto-solved)		2014-08-30 10:04:02 +02:00
..
all-packages.nix	Merge recent master into staging	2014-08-30 10:04:02 +02:00
guile-2-test.nix
haskell-defaults.nix	Build cabal-install-0.14.0 with network 2.3.x on GHC 7.4.2 and below.	2014-08-25 12:17:16 +02:00
haskell-packages.nix	use camelCase instead of dashes for servant package names in haskell-packages.nix	2014-08-27 18:27:18 +02:00
make-tarball.nix	Nixpkgs manual: Add a Nix expression to build	2014-08-24 11:03:55 +02:00
node-packages-generated.nix	Update node-packages-generated. Remove packages from node-packages.json that use an npm package that has a cyclic dependency. See also npm2nix#3	2014-08-21 11:27:56 +02:00
node-packages.json	Update node-packages-generated. Remove packages from node-packages.json that use an npm package that has a cyclic dependency. See also npm2nix#3	2014-08-21 11:27:56 +02:00
node-packages.nix
perl-packages.nix	perlPackages.TaskCatalystTutorial: fix build	2014-08-27 19:20:39 +02:00
php-packages.nix	Add zendopcache php package	2014-08-27 03:21:03 -04:00
platforms.nix
python-packages-generated.nix	python-packages-generated: fix WebTest	2014-08-26 18:11:26 +02:00
python-packages.json
python-packages.nix	Merge pull request #3316 from aherrmann/pr_mpi	2014-08-29 01:22:02 +04:00
release-cross.nix
release-lib.nix
release-python.nix
release-small.nix	remove icecat3	2014-08-25 09:52:38 +02:00
release.nix	remove icecat3	2014-08-25 09:52:38 +02:00