public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

release-cross: Reformat to be far more legible

Browse Source
This commit is contained in:
John Ericson 2016-12-25 08:11:12 -08:00
parent da70d3da0f
commit 74753d01f8
1 changed files with 80 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
pkgs/top-level/release-cross.nix
View File

@ -20,10 +20,10 @@ let
basic = basicCrossDrv // basicNativeDrv; basic = basicCrossDrv // basicNativeDrv;
in in
(
/* Test some cross builds to the Sheevaplug */ {
let /* Test some cross builds to the Sheevaplug */
crossSheevaplugLinux = let
crossSystem = { crossSystem = {
config = "armv5tel-unknown-linux-gnueabi"; config = "armv5tel-unknown-linux-gnueabi";
bigEndian = false; bigEndian = false;
@ -34,25 +34,20 @@ let
libc = "glibc"; libc = "glibc";
openssl.system = "linux-generic32"; openssl.system = "linux-generic32";
}; };
in mapTestOnCross crossSystem (basic // {
in {
crossSheevaplugLinux = mapTestOnCross crossSystem (
basic //
{
ubootSheevaplug.crossDrv = nativePlatforms; ubootSheevaplug.crossDrv = nativePlatforms;
}); });
}) // (
/* Test some cross builds on 32 bit mingw-w64 */
let /* Test some cross builds on 32 bit mingw-w64 */
crossMingw32 = let
crossSystem = { crossSystem = {
config = "i686-w64-mingw32"; config = "i686-w64-mingw32";
arch = "x86"; # Irrelevant arch = "x86"; # Irrelevant
libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain
platform = {}; platform = {};
}; };
in { in mapTestOnCross crossSystem {
crossMingw32 = mapTestOnCross crossSystem {
coreutils.crossDrv = nativePlatforms; coreutils.crossDrv = nativePlatforms;
boehmgc.crossDrv = nativePlatforms; boehmgc.crossDrv = nativePlatforms;
gmp.crossDrv = nativePlatforms; gmp.crossDrv = nativePlatforms;
@ -62,10 +57,10 @@ in {
libunistring.crossDrv = nativePlatforms; libunistring.crossDrv = nativePlatforms;
windows.wxMSW.crossDrv = nativePlatforms; windows.wxMSW.crossDrv = nativePlatforms;
}; };
}) // (
/* Test some cross builds on 64 bit mingw-w64 */
let /* Test some cross builds on 64 bit mingw-w64 */
crossMingwW64 = let
crossSystem = { crossSystem = {
# That's the triplet they use in the mingw-w64 docs. # That's the triplet they use in the mingw-w64 docs.
config = "x86_64-w64-mingw32"; config = "x86_64-w64-mingw32";
@ -73,8 +68,7 @@ let
libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain
platform = {}; platform = {};
}; };
in { in mapTestOnCross crossSystem {
crossMingwW64 = mapTestOnCross crossSystem {
coreutils.crossDrv = nativePlatforms; coreutils.crossDrv = nativePlatforms;
boehmgc.crossDrv = nativePlatforms; boehmgc.crossDrv = nativePlatforms;
gmp.crossDrv = nativePlatforms; gmp.crossDrv = nativePlatforms;
@ -84,10 +78,10 @@ in {
libunistring.crossDrv = nativePlatforms; libunistring.crossDrv = nativePlatforms;
windows.wxMSW.crossDrv = nativePlatforms; windows.wxMSW.crossDrv = nativePlatforms;
}; };
}) // (
/* Linux on the fuloong */
let /* Linux on the fuloong */
fuloongminipc = let
crossSystem = { crossSystem = {
config = "mips64el-unknown-linux"; config = "mips64el-unknown-linux";
bigEndian = false; bigEndian = false;
@ -111,17 +105,15 @@ let
abi = "n32"; abi = "n32";
}; };
}; };
in { in mapTestOnCross crossSystem {
fuloongminipc = mapTestOnCross crossSystem {
coreutils.crossDrv = nativePlatforms; coreutils.crossDrv = nativePlatforms;
ed.crossDrv = nativePlatforms; ed.crossDrv = nativePlatforms;
patch.crossDrv = nativePlatforms; patch.crossDrv = nativePlatforms;
}; };
}) // (
/* Linux on Raspberrypi */
let /* Linux on Raspberrypi */
rpi = let
crossSystem = { crossSystem = {
config = "armv6l-unknown-linux-gnueabi"; config = "armv6l-unknown-linux-gnueabi";
bigEndian = false; bigEndian = false;
@ -139,8 +131,7 @@ let
abi = "aapcs-linux"; abi = "aapcs-linux";
}; };
}; };
in { in mapTestOnCross crossSystem {
rpi = mapTestOnCross crossSystem {
coreutils.crossDrv = nativePlatforms; coreutils.crossDrv = nativePlatforms;
ed.crossDrv = nativePlatforms; ed.crossDrv = nativePlatforms;
patch.crossDrv = nativePlatforms; patch.crossDrv = nativePlatforms;
@ -152,13 +143,12 @@ in {
binutils.crossDrv = nativePlatforms; binutils.crossDrv = nativePlatforms;
mpg123.crossDrv = nativePlatforms; mpg123.crossDrv = nativePlatforms;
}; };
}) // (
/* Cross-built bootstrap tools for every supported platform */
let /* Cross-built bootstrap tools for every supported platform */
bootstrapTools = let
tools = import ../stdenv/linux/make-bootstrap-tools-cross.nix { system = "x86_64-linux"; }; tools = import ../stdenv/linux/make-bootstrap-tools-cross.nix { system = "x86_64-linux"; };
maintainers = [ pkgs.lib.maintainers.dezgeg ]; maintainers = [ pkgs.lib.maintainers.dezgeg ];
mkBootstrapToolsJob = bt: hydraJob' (pkgs.lib.addMetaAttrs { inherit maintainers; } bt.dist); mkBootstrapToolsJob = bt: hydraJob' (pkgs.lib.addMetaAttrs { inherit maintainers; } bt.dist);
in { in pkgs.lib.mapAttrs (name: mkBootstrapToolsJob) tools;
bootstrapTools = pkgs.lib.mapAttrs (name: mkBootstrapToolsJob) tools; }
})