From 64bfa05b36ae13bb94327bb9154afdf4d7bfbdf7 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 6 Jun 2023 12:34:22 +0000 Subject: [PATCH 1/3] vmTools: download debs from snapshot URLs The deb files we want are no longer available in the Debian mirrors, so we need to download them from the snapshots we download the package lists from. This makes it possible to build the os-prober NixOS test again. --- pkgs/build-support/vm/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 403bc9b1d2d..5cc107d2c4a 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -1018,7 +1018,7 @@ rec { url = "https://snapshot.debian.org/archive/debian/20221126T084953Z/dists/buster/main/binary-i386/Packages.xz"; hash = "sha256-n9JquhtZgxw3qr9BX0MQoY3ZTIHN0dit+iru3DC31UY="; }; - urlPrefix = "mirror://debian"; + urlPrefix = "https://snapshot.debian.org/archive/debian/20221126T084953Z"; packages = commonDebianPackages; }; @@ -1029,7 +1029,7 @@ rec { url = "https://snapshot.debian.org/archive/debian/20221126T084953Z/dists/buster/main/binary-amd64/Packages.xz"; hash = "sha256-YukIIB3u87jgp9oudwklsxyKVKjSL618wFgDSXiFmjU="; }; - urlPrefix = "mirror://debian"; + urlPrefix = "https://snapshot.debian.org/archive/debian/20221126T084953Z"; packages = commonDebianPackages; }; @@ -1040,7 +1040,7 @@ rec { url = "https://snapshot.debian.org/archive/debian/20230131T034648Z/dists/bullseye/main/binary-i386/Packages.xz"; hash = "sha256-z9eG7RlvelEnZAaeCfIO+XxTZVL3d+zTA7ShU43l/pw="; }; - urlPrefix = "mirror://debian"; + urlPrefix = "https://snapshot.debian.org/archive/debian/20230131T034648Z"; packages = commonDebianPackages; }; @@ -1051,7 +1051,7 @@ rec { url = "https://snapshot.debian.org/archive/debian/20230131T034648Z/dists/bullseye/main/binary-amd64/Packages.xz"; hash = "sha256-mz0eCWdn6uWt40OxsSPheHzEnMeLE52yR/vpb48/VF0="; }; - urlPrefix = "mirror://debian"; + urlPrefix = "https://snapshot.debian.org/archive/debian/20230131T034648Z"; packages = commonDebianPackages; }; }; From ee0c8cd15cd4ef5c3cf2292dc7c760de5e709eac Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 11 Jun 2023 19:13:48 +0000 Subject: [PATCH 2/3] nixosTests.os-prober: fix filesystem for Debian Debian's e2fsprogs does not understand the metadata_csum_seed ext4 feature, which our e2fsprogs enables by default, so we have to disable it. --- nixos/tests/os-prober.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/os-prober.nix b/nixos/tests/os-prober.nix index 8f3e2494047..0f7b723d5b3 100644 --- a/nixos/tests/os-prober.nix +++ b/nixos/tests/os-prober.nix @@ -8,7 +8,7 @@ let ${parted}/bin/parted --script /dev/vda mklabel msdos ${parted}/sbin/parted --script /dev/vda -- mkpart primary ext2 1M -1s mkdir /mnt - ${e2fsprogs}/bin/mkfs.ext4 /dev/vda1 + ${e2fsprogs}/bin/mkfs.ext4 -O '^metadata_csum_seed' /dev/vda1 ${util-linux}/bin/mount -t ext4 /dev/vda1 /mnt if test -e /mnt/.debug; then From d48e365ff604796ecfd970bc6bc3a7546d8b0a12 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 20 Jun 2023 10:20:37 +0000 Subject: [PATCH 3/3] nixosTests.os-prober: add missing kbd extra dep --- nixos/tests/os-prober.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/tests/os-prober.nix b/nixos/tests/os-prober.nix index 0f7b723d5b3..22e720824c8 100644 --- a/nixos/tests/os-prober.nix +++ b/nixos/tests/os-prober.nix @@ -83,6 +83,8 @@ in { docbook5 docbook_xsl_ns grub2 + kbd + kbd.dev kmod.dev libarchive libarchive.dev