git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #52534 from samueldr/aarch64/supported

nixos/release-combined: adds aarch64-linux as supported

commit7b2b5b3f47717916fb6a850d80382a9f576e0361 authorSamuel Dionne-Riel <samuel@dionne-riel.com> dateThu 20 Dec 2018, 20:58 (8 years ago) parenta2389cc42e7e39
2 files changed+24−21
nixos/release-combined.nix+23−20 nixos/release.nix+1−1
nixos/release-combined.nix+23−20
@@ -4,7 +4,7 @@
44
55{ nixpkgs ? { outPath = (import ../lib).cleanSource ./..; revCount = 56789; shortRev = "gfedcba"; }
66, stableBranch ? false
7−, supportedSystems ? [ "x86_64-linux" ]
7+, supportedSystems ? [ "x86_64-linux" "aarch64-linux" ]
88, limitedSupportedSystems ? [ "i686-linux" ]
99}:
1010
@@ -46,7 +46,9 @@ in rec {
4646 };
4747 constituents =
4848 let
49− all = x: map (system: x.${system}) supportedSystems;
49+ # Except for the given systems, return the system-specific constituent
50+ except = systems: x: map (system: x.${system}) (pkgs.lib.subtractLists systems supportedSystems);
51+ all = x: except [] x;
5052 in [
5153 nixos.channel
5254 (all nixos.dummy)
@@ -63,24 +65,24 @@ in rec {
6365 nixos.tests.chromium.x86_64-linux or []
6466 (all nixos.tests.firefox)
6567 (all nixos.tests.firewall)
66− (all nixos.tests.gnome3)
68+ (except ["aarch64-linux"] nixos.tests.gnome3)
6769 nixos.tests.installer.zfsroot.x86_64-linux or [] # ZFS is 64bit only
68− (all nixos.tests.installer.lvm)
69− (all nixos.tests.installer.luksroot)
70− (all nixos.tests.installer.separateBoot)
71− (all nixos.tests.installer.separateBootFat)
72− (all nixos.tests.installer.simple)
73− (all nixos.tests.installer.simpleLabels)
74− (all nixos.tests.installer.simpleProvided)
75− (all nixos.tests.installer.simpleUefiSystemdBoot)
76− (all nixos.tests.installer.swraid)
77− (all nixos.tests.installer.btrfsSimple)
78− (all nixos.tests.installer.btrfsSubvols)
79− (all nixos.tests.installer.btrfsSubvolDefault)
80− (all nixos.tests.boot.biosCdrom)
81− #(all nixos.tests.boot.biosUsb) # disabled due to issue #15690
82− (all nixos.tests.boot.uefiCdrom)
83− (all nixos.tests.boot.uefiUsb)
70+ (except ["aarch64-linux"] nixos.tests.installer.lvm)
71+ (except ["aarch64-linux"] nixos.tests.installer.luksroot)
72+ (except ["aarch64-linux"] nixos.tests.installer.separateBoot)
73+ (except ["aarch64-linux"] nixos.tests.installer.separateBootFat)
74+ (except ["aarch64-linux"] nixos.tests.installer.simple)
75+ (except ["aarch64-linux"] nixos.tests.installer.simpleLabels)
76+ (except ["aarch64-linux"] nixos.tests.installer.simpleProvided)
77+ (except ["aarch64-linux"] nixos.tests.installer.simpleUefiSystemdBoot)
78+ (except ["aarch64-linux"] nixos.tests.installer.swraid)
79+ (except ["aarch64-linux"] nixos.tests.installer.btrfsSimple)
80+ (except ["aarch64-linux"] nixos.tests.installer.btrfsSubvols)
81+ (except ["aarch64-linux"] nixos.tests.installer.btrfsSubvolDefault)
82+ (except ["aarch64-linux"] nixos.tests.boot.biosCdrom)
83+ #(except ["aarch64-linux"] nixos.tests.boot.biosUsb) # disabled due to issue #15690
84+ (except ["aarch64-linux"] nixos.tests.boot.uefiCdrom)
85+ (except ["aarch64-linux"] nixos.tests.boot.uefiUsb)
8486 (all nixos.tests.boot-stage1)
8587 (all nixos.tests.hibernate)
8688 nixos.tests.docker.x86_64-linux or []
@@ -132,7 +134,8 @@ in rec {
132134
133135 nixpkgs.tarball
134136 (all allSupportedNixpkgs.emacs)
135− (all allSupportedNixpkgs.jdk)
137+ # The currently available aarch64 JDK is unfree
138+ (except ["aarch64-linux"] allSupportedNixpkgs.jdk)
136139 ];
137140 });
138141
nixos/release.nix+1−1
@@ -157,7 +157,7 @@ in rec {
157157
158158 # A variant with a more recent (but possibly less stable) kernel
159159 # that might support more hardware.
160− iso_minimal_new_kernel = forMatchingSystems [ "x86_64-linux" ] (system: makeIso {
160+ iso_minimal_new_kernel = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system: makeIso {
161161 module = ./modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix;
162162 type = "minimal-new-kernel";
163163 inherit system;