Vladimír Čunát b770365574 ReRevert Merge x-updates into master ... This reverts commit ec3965d8d0. Conflicts (taken x-updates): pkgs/development/libraries/libgcrypt/default.nix pkgs/development/libraries/libgpg-error/default.nix pkgs/development/libraries/poppler/default.nix		2013-05-29 23:25:02 +02:00
..
all-packages.nix	ReRevert Merge x-updates into master	2013-05-29 23:25:02 +02:00
guile-2-test.nix	guile-2-test: Update to 2.0.	2011-02-22 13:39:56 +00:00
haskell-defaults.nix	Switch GHC 7.6.x to Haskell Platform 2013.2.0.0.	2013-05-12 16:13:10 +02:00
haskell-packages.nix	haskell: add pop3-client and smtp-mail (by cabal2nix)	2013-05-28 11:08:43 +02:00
make-tarball.nix	Add an "unstable" aggregate to replace the "unstable" view	2013-03-26 11:59:00 +01:00
mingw.nix
node-packages-generated.nix	Update nodePackages	2013-05-29 11:25:34 -04:00
node-packages.json	npm2nix now supports simple strings in the JSON file if no range is specified	2013-05-28 13:19:44 -04:00
node-packages.nix	Make the function to import npm2nix-generated packages accessible outside of node-packages.nix	2013-05-29 11:22:23 -04:00
perl-packages.nix	Crypt::RandPasswd: Update to 0.03	2013-05-28 12:09:44 +02:00
platforms.nix	fuloong linux: add CGROUPS and disable FTRACE	2013-03-30 23:38:39 +01:00
python-packages.nix	gyp: Fix on darwin	2013-05-28 18:38:22 -04:00
release-cross.nix	rpi: more packages to cross-compile	2013-05-26 12:54:26 +02:00
release-haskell.nix	release-haskell.nix: test-build alsa-core and alsa-pcm libraries	2013-05-18 19:32:28 +02:00
release-lib.nix	mercurial: Update to 2.6.1	2013-05-15 13:15:53 +02:00
release-python.nix	ReRevert Merge x-updates into master	2013-05-29 23:25:02 +02:00
release-small.nix	ReRevert Merge x-updates into master	2013-05-29 23:25:02 +02:00
release.nix	mercurial: Update to 2.6.1	2013-05-15 13:15:53 +02:00