diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 333848f1bdca..4d4965a9f7e2 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -1072,7 +1072,36 @@ let "noarch" "x86_64" ]; - packages = commonCentOSStreamPackages; + 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; }; }; @@ -1330,14 +1359,13 @@ let ]; commonCentOSStreamPackages = [ - "annobin" "autoconf" "automake" "basesystem" "bzip2" + "centos-stream-release" "curl" "diffutils" - "centos-stream-release" "findutils" "gawk" "gcc-c++" diff --git a/pkgs/build-support/vm/test.nix b/pkgs/build-support/vm/test.nix index 6c4d7cb8b0dd..cebe45cc8a3d 100644 --- a/pkgs/build-support/vm/test.nix +++ b/pkgs/build-support/vm/test.nix @@ -49,5 +49,6 @@ in testFedora42Image = makeImageTestScript diskImages.fedora42x86_64; testFedora43Image = makeImageTestScript diskImages.fedora43x86_64; testCentOSStream9Image = makeImageTestScript diskImages.centosStream9x86_64; + testCentOSStream10Image = makeImageTestScript diskImages.centosStream10x86_64; testUbuntuImage = makeImageTestScript diskImages.ubuntu2404x86_64; }