From da8c9de5a8076cc762bda13e6bfd53275f5fe774 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 9 Mar 2010 14:14:30 +0000
Subject: [PATCH] Updating the hydra builds for release-cross.nix

Now the attributes listed as Jobs will look even uglier - very long names, too much repeating.


svn path=/nixpkgs/trunk/; revision=20492
---
 pkgs/top-level/release-cross.nix | 79 ++++++++++++++------------------
 pkgs/top-level/release-lib.nix   |  2 +-
 2 files changed, 35 insertions(+), 46 deletions(-)

diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index 8d96ad009219..52fa7b09fe66 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -1,5 +1,31 @@
 with (import ./release-lib.nix);
+let
+  nativePlatforms = linux;
 
+  /* Basic list of packages to cross-build */
+  basicHostDrv = {
+    bison.hostDrv = nativePlatforms;
+    tightvnc.hostDrv = nativePlatforms;
+    #openoffice.hostDrv = nativePlatforms;
+    wxGTK.hostDrv = nativePlatforms;
+    #firefox = nativePlatforms;
+    xorg = {
+      #xorgserver.hostDrv = nativePlatforms;
+    };
+    nixUnstable.hostDrv = nativePlatforms;
+    linuxPackages_2_6_32.kernel.hostDrv = linux;
+    linuxPackages_2_6_33.kernel.hostDrv = linux;
+  };
+
+  /* Basic list of packages to be natively built,
+     but need a crossSystem defined to get meaning */
+  basicBuildDrv = {
+    gdbCross = nativePlatforms;
+  };
+
+  basic = basicHostDrv // basicBuildDrv;
+
+in
 (
 
 /* Test some cross builds to the Sheevaplug */
@@ -13,22 +39,13 @@ let
     platform = pkgs.platforms.sheevaplug;
     openssl.system = "linux-generic32";
   };
-  nativePlatforms = linux;
+
 in {
-  crossSheevaplugLinux = mapTestOnCross crossSystem (rec {
-    bison = nativePlatforms;
-    tightvnc = nativePlatforms;
-    #openoffice = nativePlatforms;
-    wxGTK = nativePlatforms;
-    #firefox = nativePlatforms;
-    xorg = {
-      #xorgserver = nativePlatforms;
-    };
-    nixUnstable = linux;
-    linuxPackages_2_6_32.kernel = linux;
-    linuxPackages_2_6_33.kernel = linux;
-    gdbCross = nativePlatforms;
-  });
+  crossSheevaplugLinux = mapTestOnCross crossSystem (
+    basic //
+    {
+      ubootSheevaplug.hostDrv = nativePlatforms;
+    });
 }) // (
 
 /* Test some cross builds to the mipsel */
@@ -50,22 +67,8 @@ let
     };
     openssl.system = "linux-generic32";
   };
-  nativePlatforms = linux;
 in {
-  crossMipselLinux = mapTestOnCross crossSystem (rec {
-    bison = nativePlatforms;
-    tightvnc = nativePlatforms;
-    #openoffice = nativePlatforms;
-    wxGTK = nativePlatforms;
-    #firefox = nativePlatforms;
-    xorg = {
-      #xorgserver = nativePlatforms;
-    };
-    nixUnstable = linux;
-    linuxPackages_2_6_32.kernel = linux;
-    linuxPackages_2_6_33.kernel = linux;
-    gdbCross = nativePlatforms;
-  });
+  crossMipselLinux = mapTestOnCross crossSystem basic;
 }) // (
 
 /* Test some cross builds to the ultrasparc */
@@ -88,20 +91,6 @@ let
     };
     openssl.system = "linux64-sparcv9";
   };
-  nativePlatforms = linux;
 in {
-  crossUltraSparcLinux = mapTestOnCross crossSystem (rec {
-    bison = nativePlatforms;
-    tightvnc = nativePlatforms;
-    #openoffice = nativePlatforms;
-    wxGTK = nativePlatforms;
-    #firefox = nativePlatforms;
-    xorg = {
-      #xorgserver = nativePlatforms;
-    };
-    nixUnstable = linux;
-    linuxPackages_2_6_32.kernel = linux;
-    linuxPackages_2_6_33.kernel = linux;
-    gdbCross = nativePlatforms;
-  });
+  crossUltraSparcLinux = mapTestOnCross crossSystem basic;
 })
diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix
index b65296b5ea23..1f88684d6337 100644
--- a/pkgs/top-level/release-lib.nix
+++ b/pkgs/top-level/release-lib.nix
@@ -54,7 +54,7 @@ rec {
         job = toJob value;
         getPkg = pkgs: setCrossMaintainers
           (pkgs.lib.addMetaAttrs { schedulingPriority = toString job.schedulingPriority; }
-          (pkgs.lib.getAttrFromPath (path ++ ["hostDrv"]) pkgs));
+          (pkgs.lib.getAttrFromPath path pkgs));
       in testOnCross crossSystem job.systems getPkg);
 
   setCrossMaintainers = pkg: pkg // { meta.maintainers = crossMaintainers; };