alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Updating the hydra builds for release-cross.nix

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


svn path=/nixpkgs/trunk/; revision=20492
This commit is contained in:
Lluís Batlle i Rossell 2010-03-09 14:14:30 +00:00
parent d2f598122c
commit da8c9de5a8
2 changed files with 35 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
pkgs/top-level/release-cross.nix
View file

@ -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;
})

2
pkgs/top-level/release-lib.nix
View file

@ -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; };