diff options
author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-03-09 14:14:30 +0000 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-03-09 14:14:30 +0000 |
commit | da8c9de5a8076cc762bda13e6bfd53275f5fe774 (patch) | |
tree | 268473cf00c4d1b7b83551e1946aa78c92ee1e42 /pkgs/top-level/release-cross.nix | |
parent | d2f598122c18396a43be8de6569c508a4cf2267b (diff) | |
download | nixpkgs-da8c9de5a8076cc762bda13e6bfd53275f5fe774.tar nixpkgs-da8c9de5a8076cc762bda13e6bfd53275f5fe774.tar.gz nixpkgs-da8c9de5a8076cc762bda13e6bfd53275f5fe774.tar.bz2 nixpkgs-da8c9de5a8076cc762bda13e6bfd53275f5fe774.tar.lz nixpkgs-da8c9de5a8076cc762bda13e6bfd53275f5fe774.tar.xz nixpkgs-da8c9de5a8076cc762bda13e6bfd53275f5fe774.tar.zst nixpkgs-da8c9de5a8076cc762bda13e6bfd53275f5fe774.zip |
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
Diffstat (limited to 'pkgs/top-level/release-cross.nix')
-rw-r--r-- | pkgs/top-level/release-cross.nix | 79 |
1 files changed, 34 insertions, 45 deletions
diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index 8d96ad00921..52fa7b09fe6 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; }) |