From 862911fd227110e16739fe5cebe710cb29d28942 Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 30 Aug 2024 17:25:24 +0100 Subject: [PATCH] nixos/release-small: remove minimal installer ISOs These take up 2 GiB every time anything in the minimal installer changes, or up to 4 GiB per day. We already stopped building Amazon images in 9426d90c6784aa19f11a8cfc5171a46f0b21cd94. Meaningful installer changes are rare enough, and the couple of days it takes for them to trickle down to the large channel acceptable enough, that this is mostly a waste of space. This should buy enough slack to build `stdenv` on `staging` without contributing to cache size growth. --- nixos/doc/manual/release-notes/rl-2411.section.md | 3 +++ nixos/release-combined.nix | 1 + nixos/release-small.nix | 12 +++--------- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 1720dfea3525..11d8da634125 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -407,6 +407,9 @@ - The NixOS installation media no longer support the ReiserFS or JFS file systems by default. +- Minimal installer ISOs are no longer built on the small channel. + Please obtain installer images from the full release channels. + ## Other Notable Changes {#sec-release-24.11-notable-changes} diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 00ab7efb03b4..969ff3bf68f6 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -86,6 +86,7 @@ in rec { # Upstream issue: https://gitlab.com/qemu-project/qemu/-/issues/2321 # (onSystems ["x86_64-linux"] "nixos.tests.hibernate") (onFullSupported "nixos.tests.i3wm") + (onSystems ["aarch64-linux"] "nixos.tests.installer.simpleUefiSystemdBoot") (onSystems ["x86_64-linux"] "nixos.tests.installer.btrfsSimple") (onSystems ["x86_64-linux"] "nixos.tests.installer.btrfsSubvolDefault") (onSystems ["x86_64-linux"] "nixos.tests.installer.btrfsSubvolEscape") diff --git a/nixos/release-small.nix b/nixos/release-small.nix index d4d7b7b4149b..3a1ebd5e7c88 100644 --- a/nixos/release-small.nix +++ b/nixos/release-small.nix @@ -53,12 +53,8 @@ in rec { inherit (nixos'.tests.installer) lvm separateBoot - simple; - }; - boot = { - inherit (nixos'.tests.boot) - biosCdrom - uefiCdrom; + simple + simpleUefiSystemdBoot; }; }; }; @@ -107,18 +103,16 @@ in rec { "nixpkgs.tarball" "nixpkgs.release-checks" ] + (onSystems [ "aarch64-linux" ] "nixos.tests.installer.simpleUefiSystemdBoot") (map (onSystems [ "x86_64-linux" ]) [ - "nixos.tests.boot.biosCdrom" "nixos.tests.installer.lvm" "nixos.tests.installer.separateBoot" "nixos.tests.installer.simple" ]) (map onSupported [ "nixos.dummy" - "nixos.iso_minimal" "nixos.manual" "nixos.tests.acme" - "nixos.tests.boot.uefiCdrom" "nixos.tests.containers-imperative" "nixos.tests.containers-ip" "nixos.tests.firewall"