From 52fbdf3dee5cefc25c3858c5b9f74ca43a9d14b0 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Mon, 5 Jan 2026 10:32:30 -0800 Subject: [PATCH] vmTools: drop CentOS Stream As @uninsane points out, these are designed to rot rapidly. --- doc/build-helpers/special/vm-tools.section.md | 3 - pkgs/build-support/vm/default.nix | 62 +------------------ pkgs/build-support/vm/test.nix | 2 - 3 files changed, 1 insertion(+), 66 deletions(-) diff --git a/doc/build-helpers/special/vm-tools.section.md b/doc/build-helpers/special/vm-tools.section.md index 4e4de3e85b54..47988eb3f4a1 100644 --- a/doc/build-helpers/special/vm-tools.section.md +++ b/doc/build-helpers/special/vm-tools.section.md @@ -111,9 +111,6 @@ A set of functions that build a predefined set of minimal Linux distributions im * Fedora * `fedora42x86_64` * `fedora43x86_64` -* CentOS Stream - * `centosStream9x86_64` - * `centosStream10x86_64` * Rocky Linux * `rocky9x86_64` * `rocky10x86_64` diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 805ac8afb950..ca5719ba6c31 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -1052,60 +1052,6 @@ let unifiedSystemDir = true; }; - centosStream9x86_64 = { - name = "centos-stream-9-x86_64"; - fullName = "CentOS Stream 9 (x86_64)"; - packagesLists = [ - (fetchurl { - url = "https://mirror.stream.centos.org/9-stream/BaseOS/x86_64/os/repodata/737e7bb91d5464e0cc258ff5ae5070a00d682c39fc2de0b9b55df671022ba732-primary.xml.gz"; - hash = "sha256-c357uR1UZODMJY/1rlBwoA1oLDn8LeC5tV32cQIrpzI="; - }) - (fetchurl { - url = "https://mirror.stream.centos.org/9-stream/AppStream/x86_64/os/repodata/9f0c1578e5df33e6479a1d3e5397b87ecaa1b5bac7fd34de6c837bddb3949fde-primary.xml.gz"; - hash = "sha256-nwwVeOXfM+ZHmh0+U5e4fsqhtbrH/TTebIN73bOUn94="; - }) - ]; - urlPrefixes = [ - "https://mirror.stream.centos.org/9-stream/BaseOS/x86_64/os" - "https://mirror.stream.centos.org/9-stream/AppStream/x86_64/os" - ]; - archs = [ - "noarch" - "x86_64" - ]; - packages = commonCentOSStreamPackages ++ [ - "annobin" - ]; - unifiedSystemDir = true; - }; - - centosStream10x86_64 = { - name = "centos-stream-10-x86_64"; - fullName = "CentOS Stream 10 (x86_64)"; - packagesLists = [ - (fetchurl { - url = "https://mirror.stream.centos.org/10-stream/BaseOS/x86_64/os/repodata/b3bb8f59e9c3dfedf3439c8357dc6fb727dc3e6fd2e351ab5e1fb0cfbbf07381-primary.xml.gz"; - hash = "sha256-s7uPWenD3+3zQ5yDV9xvtyfcPm/S41GrXh+wz7vwc4E="; - }) - (fetchurl { - url = "https://mirror.stream.centos.org/10-stream/AppStream/x86_64/os/repodata/962343afafa14dcc36a6c054608ae9bbf700c8ead08d1ca8898b5b1a192e3106-primary.xml.gz"; - hash = "sha256-liNDr6+hTcw2psBUYIrpu/cAyOrQjRyoiYtbGhkuMQY="; - }) - ]; - urlPrefixes = [ - "https://mirror.stream.centos.org/10-stream/BaseOS/x86_64/os" - "https://mirror.stream.centos.org/10-stream/AppStream/x86_64/os" - ]; - archs = [ - "noarch" - "x86_64" - ]; - packages = commonCentOSStreamPackages ++ [ - "annobin-plugin-gcc" - ]; - unifiedSystemDir = true; - }; - # Rocky Linux's /pub/rocky/9/ URL is rolling and changes with each minor release. We use the # vault instead, which provides stable URLs for specific minor versions. rocky9x86_64 = { @@ -1482,7 +1428,7 @@ let }; }; - # Base packages for all RHEL-family distros (Fedora, CentOS Stream, Rocky, Alma, etc.) + # Base packages for all RHEL-family distros (Fedora, Rocky, Alma, etc.) baseRHELFamilyPackages = [ "autoconf" "automake" @@ -1511,12 +1457,6 @@ let "pkgconf-pkg-config" ]; - commonCentOSStreamPackages = baseRHELFamilyPackages ++ [ - "centos-stream-release" - "gcc-plugin-annobin" - "pkgconf" - ]; - commonRockyPackages = baseRHELFamilyPackages ++ [ "gcc-plugin-annobin" "pkgconf" diff --git a/pkgs/build-support/vm/test.nix b/pkgs/build-support/vm/test.nix index 7472e0f73226..3a7adcbd216e 100644 --- a/pkgs/build-support/vm/test.nix +++ b/pkgs/build-support/vm/test.nix @@ -49,8 +49,6 @@ in # RPM-based distros testFedora42Image = makeImageTestScript diskImages.fedora42x86_64; testFedora43Image = makeImageTestScript diskImages.fedora43x86_64; - testCentOSStream9Image = makeImageTestScript diskImages.centosStream9x86_64; - testCentOSStream10Image = makeImageTestScript diskImages.centosStream10x86_64; testRocky9Image = makeImageTestScript diskImages.rocky9x86_64; testRocky10Image = makeImageTestScript diskImages.rocky10x86_64; testAlma9Image = makeImageTestScript diskImages.alma9x86_64;