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

Merge pull request #52534 from samueldr/aarch64/supported 

nixos/release-combined: adds aarch64-linux as supported
This commit is contained in:
Samuel Dionne-Riel 2018-12-20 20:58:59 -05:00 committed by GitHub
parent a2389cc318 42e7e39cd3
commit 7b2b5b3f47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
nixos/release-combined.nix
View File

@ -4,7 +4,7 @@
{ nixpkgs ? { outPath = (import ../lib).cleanSource ./..; revCount = 56789; shortRev = "gfedcba"; } { nixpkgs ? { outPath = (import ../lib).cleanSource ./..; revCount = 56789; shortRev = "gfedcba"; }
, stableBranch ? false , stableBranch ? false
, supportedSystems ? [ "x86_64-linux" ] , supportedSystems ? [ "x86_64-linux" "aarch64-linux" ]
, limitedSupportedSystems ? [ "i686-linux" ] , limitedSupportedSystems ? [ "i686-linux" ]
}: }:
@ -46,7 +46,9 @@ in rec {
}; };
constituents = constituents =
let let
all = x: map (system: x.${system}) supportedSystems; # Except for the given systems, return the system-specific constituent
except = systems: x: map (system: x.${system}) (pkgs.lib.subtractLists systems supportedSystems);
all = x: except [] x;
in [ in [
nixos.channel nixos.channel
(all nixos.dummy) (all nixos.dummy)
@ -63,24 +65,24 @@ in rec {
nixos.tests.chromium.x86_64-linux or [] nixos.tests.chromium.x86_64-linux or []
(all nixos.tests.firefox) (all nixos.tests.firefox)
(all nixos.tests.firewall) (all nixos.tests.firewall)
(all nixos.tests.gnome3) (except ["aarch64-linux"] nixos.tests.gnome3)
nixos.tests.installer.zfsroot.x86_64-linux or [] # ZFS is 64bit only nixos.tests.installer.zfsroot.x86_64-linux or [] # ZFS is 64bit only
(all nixos.tests.installer.lvm) (except ["aarch64-linux"] nixos.tests.installer.lvm)
(all nixos.tests.installer.luksroot) (except ["aarch64-linux"] nixos.tests.installer.luksroot)
(all nixos.tests.installer.separateBoot) (except ["aarch64-linux"] nixos.tests.installer.separateBoot)
(all nixos.tests.installer.separateBootFat) (except ["aarch64-linux"] nixos.tests.installer.separateBootFat)
(all nixos.tests.installer.simple) (except ["aarch64-linux"] nixos.tests.installer.simple)
(all nixos.tests.installer.simpleLabels) (except ["aarch64-linux"] nixos.tests.installer.simpleLabels)
(all nixos.tests.installer.simpleProvided) (except ["aarch64-linux"] nixos.tests.installer.simpleProvided)
(all nixos.tests.installer.simpleUefiSystemdBoot) (except ["aarch64-linux"] nixos.tests.installer.simpleUefiSystemdBoot)
(all nixos.tests.installer.swraid) (except ["aarch64-linux"] nixos.tests.installer.swraid)
(all nixos.tests.installer.btrfsSimple) (except ["aarch64-linux"] nixos.tests.installer.btrfsSimple)
(all nixos.tests.installer.btrfsSubvols) (except ["aarch64-linux"] nixos.tests.installer.btrfsSubvols)
(all nixos.tests.installer.btrfsSubvolDefault) (except ["aarch64-linux"] nixos.tests.installer.btrfsSubvolDefault)
(all nixos.tests.boot.biosCdrom) (except ["aarch64-linux"] nixos.tests.boot.biosCdrom)
#(all nixos.tests.boot.biosUsb) # disabled due to issue #15690 #(except ["aarch64-linux"] nixos.tests.boot.biosUsb) # disabled due to issue #15690
(all nixos.tests.boot.uefiCdrom) (except ["aarch64-linux"] nixos.tests.boot.uefiCdrom)
(all nixos.tests.boot.uefiUsb) (except ["aarch64-linux"] nixos.tests.boot.uefiUsb)
(all nixos.tests.boot-stage1) (all nixos.tests.boot-stage1)
(all nixos.tests.hibernate) (all nixos.tests.hibernate)
nixos.tests.docker.x86_64-linux or [] nixos.tests.docker.x86_64-linux or []
@ -132,7 +134,8 @@ in rec {
nixpkgs.tarball nixpkgs.tarball
(all allSupportedNixpkgs.emacs) (all allSupportedNixpkgs.emacs)
(all allSupportedNixpkgs.jdk) # The currently available aarch64 JDK is unfree
(except ["aarch64-linux"] allSupportedNixpkgs.jdk)
]; ];
}); });

2
nixos/release.nix
View File

@ -157,7 +157,7 @@ in rec {
# A variant with a more recent (but possibly less stable) kernel # A variant with a more recent (but possibly less stable) kernel
# that might support more hardware. # that might support more hardware.
iso_minimal_new_kernel = forMatchingSystems [ "x86_64-linux" ] (system: makeIso { iso_minimal_new_kernel = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system: makeIso {
module = ./modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix; module = ./modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix;
type = "minimal-new-kernel"; type = "minimal-new-kernel";
inherit system; inherit system;