diff options
| author | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2018-12-23 13:28:22 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-23 13:28:22 -0500 |
| commit | 772759173d362a557a78ad58605579b417a9b08c (patch) | |
| tree | 8def6bac35e8990c2ca078e6956f8d62de437e3d /nixos | |
| parent | 044ff3dc6632d45bcf25ad1d86589531792a0af9 (diff) | |
| parent | 1bfe8f189bd25de73340635d4e94673000f273ec (diff) | |
Merge pull request #52721 from samueldr/aarch64/limited-support
Fixes eval issues in hydra by setting AArch64 as limited support
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/release-combined.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 429afe2b145e6..ea8b92e94f01e 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -4,8 +4,8 @@ { nixpkgs ? { outPath = (import ../lib).cleanSource ./..; revCount = 56789; shortRev = "gfedcba"; } , stableBranch ? false -, supportedSystems ? [ "x86_64-linux" "aarch64-linux" ] -, limitedSupportedSystems ? [ "i686-linux" ] +, supportedSystems ? [ "x86_64-linux" ] +, limitedSupportedSystems ? [ "i686-linux" "aarch64-linux" ] }: let @@ -54,10 +54,12 @@ in rec { (all nixos.dummy) (all nixos.manual) - nixos.iso_minimal.x86_64-linux or [] - nixos.iso_minimal.i686-linux or [] nixos.iso_graphical.x86_64-linux or [] + nixos.iso_minimal.aarch64-linux or [] + nixos.iso_minimal.i686-linux or [] + nixos.iso_minimal.x86_64-linux or [] nixos.ova.x86_64-linux or [] + nixos.sd_image.aarch64-linux or [] #(all nixos.tests.containers) (all nixos.tests.containers-imperative) |