Lluís Batlle i Rossell 9183f21f7e Merging from trunk. ... I fixed conflicts regarding the renaming 'kernel' -> 'linux' in all-packages. Also a small conflict in all-packages about making openssl overridable. And I some linux 2.6.31-zen kernel files also marked in conflict. svn path=/nixpkgs/branches/stdenv-updates/; revision=19438		2010-01-14 14:49:31 +00:00
..
all-packages.nix	Merging from trunk.	2010-01-14 14:49:31 +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 Agda to 2.2.6.	2010-01-12 10:18:00 +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	* Remove execute permission.	2006-09-11 13:37:46 +00:00
perl-packages.nix	newer version Variable-Magic (0.36)	2010-01-13 21:14:42 +00:00
platforms.nix	Adding MD kernel option for the sheevaplug	2009-12-28 22:29:17 +00:00
python-packages.nix	Merge the two BuildBot expressions.	2010-01-11 17:00:46 +00:00
release.nix	Merging from trunk.	2010-01-14 14:49:31 +00:00