From 89def9fcce5f733e128f915dfc83fa256b6245a3 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Wed, 17 Dec 2025 18:35:40 -0800 Subject: [PATCH] vmTools: add Rocky Linux 9 --- pkgs/build-support/vm/default.nix | 35 +++++++++++++++++++++++++++++++ pkgs/build-support/vm/test.nix | 1 + 2 files changed, 36 insertions(+) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 6c3e6ac21bc4..fc8b44baf1a3 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -1104,6 +1104,35 @@ let ]; 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 = { + name = "rocky-9.5-x86_64"; + fullName = "Rocky Linux 9.5 (x86_64)"; + packagesLists = [ + (fetchurl { + url = "https://dl.rockylinux.org/vault/rocky/9.5/BaseOS/x86_64/os/repodata/554cd09406b7bf632fc7014d0a567094272d37ac08f75af955de96183425dfa8-primary.xml.gz"; + hash = "sha256-VUzQlAa3v2MvxwFNClZwlCctN6wI91r5Vd6WGDQl36g="; + }) + (fetchurl { + url = "https://dl.rockylinux.org/vault/rocky/9.5/AppStream/x86_64/os/repodata/db8f32057dd37687574ea660d322ff7a0b5dc01bfba42888818b48ef686837cd-primary.xml.gz"; + hash = "sha256-248yBX3TdodXTqZg0yL/egtdwBv7pCiIgYtI72hoN80="; + }) + ]; + urlPrefixes = [ + "https://dl.rockylinux.org/vault/rocky/9.5/BaseOS/x86_64/os" + "https://dl.rockylinux.org/vault/rocky/9.5/AppStream/x86_64/os" + ]; + archs = [ + "noarch" + "x86_64" + ]; + packages = commonRockyPackages ++ [ + "annobin" + ]; + unifiedSystemDir = true; + }; }; # The set of supported Dpkg-based distributions. @@ -1345,6 +1374,12 @@ let "pkgconf" ]; + commonRockyPackages = baseRHELFamilyPackages ++ [ + "gcc-plugin-annobin" + "pkgconf" + "rocky-release" + ]; + # Common packages for openSUSE images. commonOpenSUSEPackages = [ "aaa_base" diff --git a/pkgs/build-support/vm/test.nix b/pkgs/build-support/vm/test.nix index cebe45cc8a3d..e308a5a58771 100644 --- a/pkgs/build-support/vm/test.nix +++ b/pkgs/build-support/vm/test.nix @@ -50,5 +50,6 @@ in testFedora43Image = makeImageTestScript diskImages.fedora43x86_64; testCentOSStream9Image = makeImageTestScript diskImages.centosStream9x86_64; testCentOSStream10Image = makeImageTestScript diskImages.centosStream10x86_64; + testRocky9Image = makeImageTestScript diskImages.rocky9x86_64; testUbuntuImage = makeImageTestScript diskImages.ubuntu2404x86_64; }