diff options
author | John Ericson <Ericson2314@Yahoo.com> | 2017-05-23 18:04:15 -0400 |
---|---|---|
committer | John Ericson <Ericson2314@Yahoo.com> | 2017-05-29 18:56:03 -0400 |
commit | 20e756a0936fb75ce8f9d9ef0b7a511198bf7eea (patch) | |
tree | efe83f0252c5097c00fff2d67afc90c9d6dd7b42 /pkgs/top-level/release-cross.nix | |
parent | b20f20d3eb80de83abe5047c2ada9abad54ae0b6 (diff) | |
download | nixpkgs-20e756a0936fb75ce8f9d9ef0b7a511198bf7eea.tar nixpkgs-20e756a0936fb75ce8f9d9ef0b7a511198bf7eea.tar.gz nixpkgs-20e756a0936fb75ce8f9d9ef0b7a511198bf7eea.tar.bz2 nixpkgs-20e756a0936fb75ce8f9d9ef0b7a511198bf7eea.tar.lz nixpkgs-20e756a0936fb75ce8f9d9ef0b7a511198bf7eea.tar.xz nixpkgs-20e756a0936fb75ce8f9d9ef0b7a511198bf7eea.tar.zst nixpkgs-20e756a0936fb75ce8f9d9ef0b7a511198bf7eea.zip |
lib: Consolidate platform configurations (used for crossSystem)
This is good for maintenance and education.
Diffstat (limited to 'pkgs/top-level/release-cross.nix')
-rw-r--r-- | pkgs/top-level/release-cross.nix | 89 |
1 files changed, 7 insertions, 82 deletions
diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index c81d65ad0e0..94c1e6c7ad2 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -89,101 +89,26 @@ in guile = nativePlatforms; }; - darwinToAarch64 = let - crossSystem = { - config = "aarch64-apple-darwin14"; - arch = "arm64"; - libc = "libSystem"; - }; - in mapTestOnCross crossSystem darwinCommon; + crossIphone64 = mapTestOnCross lib.systems.examples.iphone64 darwinCommon; - darwinToArm = let - crossSystem = { - config = "arm-apple-darwin10"; - arch = "armv7-a"; - libc = "libSystem"; - }; - in mapTestOnCross crossSystem darwinCommon; + crossIphone32 = mapTestOnCross lib.systems.examples.iphone32 darwinCommon; /* Test some cross builds to the Sheevaplug */ - crossSheevaplugLinux = let - crossSystem = { - config = "armv5tel-unknown-linux-gnueabi"; - bigEndian = false; - arch = "arm"; - float = "soft"; - withTLS = true; - platform = lib.systems.platforms.sheevaplug; - libc = "glibc"; - openssl.system = "linux-generic32"; - }; - in mapTestOnCross crossSystem (linuxCommon // { + crossSheevaplugLinux = mapTestOnCross lib.systems.examples.sheevaplug (linuxCommon // { ubootSheevaplug = nativePlatforms; }); - /* Test some cross builds on 32 bit mingw-w64 */ - crossMingw32 = let - crossSystem = { - config = "i686-pc-mingw32"; - arch = "x86"; # Irrelevant - libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain - platform = {}; - }; - in mapTestOnCross crossSystem windowsCommon; - + crossMingw32 = mapTestOnCross lib.systems.examples.mingw32 windowsCommon; /* Test some cross builds on 64 bit mingw-w64 */ - crossMingwW64 = let - crossSystem = { - # That's the triplet they use in the mingw-w64 docs. - config = "x86_64-pc-mingw32"; - arch = "x86_64"; # Irrelevant - libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain - platform = {}; - }; - in mapTestOnCross crossSystem windowsCommon; - + crossMingwW64 = mapTestOnCross lib.systems.examples.mingwW64 windowsCommon; /* Linux on the fuloong */ - fuloongminipc = let - crossSystem = { - config = "mips64el-unknown-linux-gnu"; - bigEndian = false; - arch = "mips"; - float = "hard"; - withTLS = true; - libc = "glibc"; - platform = lib.systems.platforms.fuloong2f_n32; - openssl.system = "linux-generic32"; - gcc = { - arch = "loongson2f"; - abi = "n32"; - }; - }; - in mapTestOnCross crossSystem linuxCommon; - + fuloongminipc = mapTestOnCross lib.systems.examples.fuloongminipc linuxCommon; /* Linux on Raspberrypi */ - rpi = let - crossSystem = { - config = "armv6l-unknown-linux-gnueabi"; - bigEndian = false; - arch = "arm"; - float = "hard"; - fpu = "vfp"; - withTLS = true; - libc = "glibc"; - platform = lib.systems.platforms.raspberrypi; - openssl.system = "linux-generic32"; - gcc = { - arch = "armv6"; - fpu = "vfp"; - float = "softfp"; - abi = "aapcs-linux"; - }; - }; - in mapTestOnCross crossSystem (linuxCommon // { + rpi = mapTestOnCross lib.systems.examples.raspberryPi (linuxCommon // { vim = nativePlatforms; unzip = nativePlatforms; ddrescue = nativePlatforms; |