Vladimír Čunát 87c3c0e885 Merge master into #2129 ... Conflicts (easy, just UID shifted): nixos/modules/misc/ids.nix nixos/modules/module-list.nix		2014-08-12 19:24:08 +02:00
..
all-packages.nix	Merge master into #2129	2014-08-12 19:24:08 +02:00
guile-2-test.nix
haskell-defaults.nix	Revert "Many minor fixes to get things building after recent compiler changes".	2014-08-11 14:48:35 +02:00
haskell-packages.nix	haskell-Allure: add version 0.4.99.0	2014-08-12 12:37:44 +02:00
make-tarball.nix
node-packages-generated.nix
node-packages.json
node-packages.nix
perl-packages.nix	Enable perl-libwww-perl-6.05 on OS X	2014-08-08 09:32:48 +02:00
php-packages.nix
platforms.nix
python-packages-generated.nix
python-packages.json
python-packages.nix	obnam: Update from 1.6.1 to 1.8	2014-08-12 13:32:24 +02:00
release-cross.nix
release-lib.nix
release-python.nix
release-small.nix	Make platforms.allBut accept a list rather than a single platform	2014-08-09 12:31:33 +02:00
release.nix	Make platforms.allBut accept a list rather than a single platform	2014-08-09 12:31:33 +02:00