From 16316a12880b16cd86f73eb9376b4d806bbcdd44 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Fri, 21 Dec 2018 20:27:21 -0500 Subject: [PATCH 1/2] nixos/release-combined.nix: Adds missing aarch64 constituents This will block channel advancing, even if it is limited support. --- nixos/release-combined.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 429afe2b145..13f6e65b36d 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -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) From 1bfe8f189bd25de73340635d4e94673000f273ec Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Fri, 21 Dec 2018 20:28:21 -0500 Subject: [PATCH 2/2] nixos/release-combined.nix: makes aarch64-linux limited support This is because it will not eval properly with `hydra-eval-jobs`. ``` $ ...hydra/result/bin/hydra-eval-jobs \ --arg nixpkgs '{ outPath = ./.; revCount = 123; shortRev = "4567"; }' \ -I "$PWD" \ nixos/release-combined.nix ``` It fails with: ``` Too many heap sections: Increase MAXHINCR or MAX_HEAP_SECTS ``` --- nixos/release-combined.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 13f6e65b36d..ea8b92e94f0 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