Lluís Batlle i Rossell a3403e6828 Finishing the update from trunk, having resolved the eclipse related directory ... renaming. I think directory renaming breaks the usual merges... because it leaves the 'to be removed' directory in the working directory still. A manual 'rm' of the 'to be removed' directory fixed the commit. svn merge ^/nixpkgs/trunk svn path=/nixpkgs/branches/stdenv-updates/; revision=18661		2009-11-26 21:46:08 +00:00
..
all-packages.nix	Finishing the update from trunk, having resolved the eclipse related directory	2009-11-26 21:46:08 +00:00
guile-2-test.nix	GNU Guile 1.9 with coverage analysis builds.	2009-10-28 16:16:23 +00:00
haskell-packages.nix	Updated utf8-string, added mpppc.	2009-11-06 14:09:30 +00:00
make-tarball.nix	* Use the stable Nix to test the Nixpkgs expressions, since we always	2009-11-18 12:22:24 +00:00
mingw.nix
perl-packages.nix	* Added Digest::SHA.	2009-11-17 13:07:14 +00:00
python-packages.nix	Updating from trunk.	2009-11-08 00:40:07 +00:00
release.nix	* Bring back Emacs 22 by request from Ludovic.	2009-11-22 16:29:15 +00:00