Merging from trunk. I had to give away some structure to build the native

sheevaplug kernel, so the kernel does not build in the sheevaplug right now.
I will try to fix that in next commits.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19045

1 files changed, 8 insertions, 6 deletions

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index f1ea5e9dad54..fa3d7c682251 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -132,7 +132,6 @@ in {
   dico = linux;
   dietlibc = linux;
   diffutils = all;
-  dmtx = all;
   docbook5 = all;
   docbook5_xsl = all;
   docbook_xml_dtd_42 = all;
@@ -275,6 +274,7 @@ in {
   mpg321 = linux;
   mutt = linux;
   mysql = linux;
+  mysql51 = linux;
   namazu = all;
   nano = allBut "i686-cygwin";
   ncat = linux;
@@ -528,11 +528,6 @@ in {
     kernel = linux;
   };
 
-  kernelPackages_2_6_26 = {
-    aufs = linux;
-    kernel = linux;
-  };
-  
   kernelPackages_2_6_27 = {
     aufs = linux;
     kernel = linux;
@@ -566,6 +561,13 @@ in {
     kernel = linux;
   };
 
+  kernelPackages_2_6_32 = {
+    aufs = linux;
+    kernel = linux;
+    virtualbox = linux;
+    virtualboxGuestAdditions = linux;
+  };
+
   strategoPackages = {
     sdf = all;
     strategoxt = all;