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

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

@ -20,39 +20,34 @@ let
basic = basicCrossDrv // basicNativeDrv; basic = basicCrossDrv // basicNativeDrv;
in in
(
/* Test some cross builds to the Sheevaplug */ {
let /* Test some cross builds to the Sheevaplug */
crossSystem = { crossSheevaplugLinux = let
config = "armv5tel-unknown-linux-gnueabi"; crossSystem = {
bigEndian = false; config = "armv5tel-unknown-linux-gnueabi";
arch = "arm"; bigEndian = false;
float = "soft"; arch = "arm";
withTLS = true; float = "soft";
platform = pkgs.platforms.sheevaplug; withTLS = true;
libc = "glibc"; platform = pkgs.platforms.sheevaplug;
openssl.system = "linux-generic32"; libc = "glibc";
}; openssl.system = "linux-generic32";
};
in mapTestOnCross crossSystem (basic // {
ubootSheevaplug.crossDrv = nativePlatforms;
});
in {
crossSheevaplugLinux = mapTestOnCross crossSystem (
basic //
{
ubootSheevaplug.crossDrv = nativePlatforms;
});
}) // (
/* Test some cross builds on 32 bit mingw-w64 */ /* Test some cross builds on 32 bit mingw-w64 */
let 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,19 +57,18 @@ 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 */
crossSystem = { crossMingwW64 = let
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";
arch = "x86_64"; # Irrelevant arch = "x86_64"; # 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 {
crossMingwW64 = mapTestOnCross crossSystem {
coreutils.crossDrv = nativePlatforms; coreutils.crossDrv = nativePlatforms;
boehmgc.crossDrv = nativePlatforms; boehmgc.crossDrv = nativePlatforms;
gmp.crossDrv = nativePlatforms; gmp.crossDrv = nativePlatforms;
@ -84,63 +78,60 @@ in {
libunistring.crossDrv = nativePlatforms; libunistring.crossDrv = nativePlatforms;
windows.wxMSW.crossDrv = nativePlatforms; windows.wxMSW.crossDrv = nativePlatforms;
}; };
}) // (
/* Linux on the fuloong */
let
crossSystem = {
config = "mips64el-unknown-linux";
bigEndian = false;
arch = "mips";
float = "hard";
withTLS = true;
libc = "glibc";
platform = {
name = "fuloong-minipc";
kernelMajor = "2.6";
kernelBaseConfig = "lemote2f_defconfig";
kernelHeadersBaseConfig = "fuloong2e_defconfig";
uboot = null;
kernelArch = "mips";
kernelAutoModules = false;
kernelTarget = "vmlinux";
};
openssl.system = "linux-generic32";
gcc = {
arch = "loongson2f";
abi = "n32";
};
};
in {
fuloongminipc = mapTestOnCross crossSystem {
/* Linux on the fuloong */
fuloongminipc = let
crossSystem = {
config = "mips64el-unknown-linux";
bigEndian = false;
arch = "mips";
float = "hard";
withTLS = true;
libc = "glibc";
platform = {
name = "fuloong-minipc";
kernelMajor = "2.6";
kernelBaseConfig = "lemote2f_defconfig";
kernelHeadersBaseConfig = "fuloong2e_defconfig";
uboot = null;
kernelArch = "mips";
kernelAutoModules = false;
kernelTarget = "vmlinux";
};
openssl.system = "linux-generic32";
gcc = {
arch = "loongson2f";
abi = "n32";
};
};
in 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 */
crossSystem = { rpi = let
config = "armv6l-unknown-linux-gnueabi"; crossSystem = {
bigEndian = false; config = "armv6l-unknown-linux-gnueabi";
arch = "arm"; bigEndian = false;
float = "hard"; arch = "arm";
fpu = "vfp"; float = "hard";
withTLS = true;
libc = "glibc";
platform = pkgs.platforms.raspberrypi;
openssl.system = "linux-generic32";
gcc = {
arch = "armv6";
fpu = "vfp"; fpu = "vfp";
float = "softfp"; withTLS = true;
abi = "aapcs-linux"; libc = "glibc";
platform = pkgs.platforms.raspberrypi;
openssl.system = "linux-generic32";
gcc = {
arch = "armv6";
fpu = "vfp";
float = "softfp";
abi = "aapcs-linux";
};
}; };
}; in mapTestOnCross crossSystem {
in {
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 */
tools = import ../stdenv/linux/make-bootstrap-tools-cross.nix { system = "x86_64-linux"; }; bootstrapTools = let
maintainers = [ pkgs.lib.maintainers.dezgeg ]; tools = import ../stdenv/linux/make-bootstrap-tools-cross.nix { system = "x86_64-linux"; };
mkBootstrapToolsJob = bt: hydraJob' (pkgs.lib.addMetaAttrs { inherit maintainers; } bt.dist); maintainers = [ pkgs.lib.maintainers.dezgeg ];
in { mkBootstrapToolsJob = bt: hydraJob' (pkgs.lib.addMetaAttrs { inherit maintainers; } bt.dist);
bootstrapTools = pkgs.lib.mapAttrs (name: mkBootstrapToolsJob) tools; in pkgs.lib.mapAttrs (name: mkBootstrapToolsJob) tools;
}) }