b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #237235 from alyssais/vmTools-deb

Browse source 
nixosTests.os-prober: fix
This commit is contained in:
Guillaume Girol 2023-06-22 19:14:11 +00:00 committed by GitHub
parent faef939f46 d48e365ff6
commit a3a23358fc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nixos/tests/os-prober.nix
View file

@ -8,7 +8,7 @@ let
${parted}/bin/parted --script /dev/vda mklabel msdos ${parted}/bin/parted --script /dev/vda mklabel msdos
${parted}/sbin/parted --script /dev/vda -- mkpart primary ext2 1M -1s ${parted}/sbin/parted --script /dev/vda -- mkpart primary ext2 1M -1s
mkdir /mnt 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 ${util-linux}/bin/mount -t ext4 /dev/vda1 /mnt
if test -e /mnt/.debug; then if test -e /mnt/.debug; then
@ -83,6 +83,8 @@ in {
docbook5 docbook5
docbook_xsl_ns docbook_xsl_ns
grub2 grub2
kbd
kbd.dev
kmod.dev kmod.dev
libarchive libarchive
libarchive.dev libarchive.dev

8
pkgs/build-support/vm/default.nix
View file

@ -1018,7 +1018,7 @@ rec {
url = "https://snapshot.debian.org/archive/debian/20221126T084953Z/dists/buster/main/binary-i386/Packages.xz"; url = "https://snapshot.debian.org/archive/debian/20221126T084953Z/dists/buster/main/binary-i386/Packages.xz";
hash = "sha256-n9JquhtZgxw3qr9BX0MQoY3ZTIHN0dit+iru3DC31UY="; hash = "sha256-n9JquhtZgxw3qr9BX0MQoY3ZTIHN0dit+iru3DC31UY=";
}; };
urlPrefix = "mirror://debian"; urlPrefix = "https://snapshot.debian.org/archive/debian/20221126T084953Z";
packages = commonDebianPackages; packages = commonDebianPackages;
}; };
@ -1029,7 +1029,7 @@ rec {
url = "https://snapshot.debian.org/archive/debian/20221126T084953Z/dists/buster/main/binary-amd64/Packages.xz"; url = "https://snapshot.debian.org/archive/debian/20221126T084953Z/dists/buster/main/binary-amd64/Packages.xz";
hash = "sha256-YukIIB3u87jgp9oudwklsxyKVKjSL618wFgDSXiFmjU="; hash = "sha256-YukIIB3u87jgp9oudwklsxyKVKjSL618wFgDSXiFmjU=";
}; };
urlPrefix = "mirror://debian"; urlPrefix = "https://snapshot.debian.org/archive/debian/20221126T084953Z";
packages = commonDebianPackages; packages = commonDebianPackages;
}; };
@ -1040,7 +1040,7 @@ rec {
url = "https://snapshot.debian.org/archive/debian/20230131T034648Z/dists/bullseye/main/binary-i386/Packages.xz"; url = "https://snapshot.debian.org/archive/debian/20230131T034648Z/dists/bullseye/main/binary-i386/Packages.xz";
hash = "sha256-z9eG7RlvelEnZAaeCfIO+XxTZVL3d+zTA7ShU43l/pw="; hash = "sha256-z9eG7RlvelEnZAaeCfIO+XxTZVL3d+zTA7ShU43l/pw=";
}; };
urlPrefix = "mirror://debian"; urlPrefix = "https://snapshot.debian.org/archive/debian/20230131T034648Z";
packages = commonDebianPackages; packages = commonDebianPackages;
}; };
@ -1051,7 +1051,7 @@ rec {
url = "https://snapshot.debian.org/archive/debian/20230131T034648Z/dists/bullseye/main/binary-amd64/Packages.xz"; url = "https://snapshot.debian.org/archive/debian/20230131T034648Z/dists/bullseye/main/binary-amd64/Packages.xz";
hash = "sha256-mz0eCWdn6uWt40OxsSPheHzEnMeLE52yR/vpb48/VF0="; hash = "sha256-mz0eCWdn6uWt40OxsSPheHzEnMeLE52yR/vpb48/VF0=";
}; };
urlPrefix = "mirror://debian"; urlPrefix = "https://snapshot.debian.org/archive/debian/20230131T034648Z";
packages = commonDebianPackages; packages = commonDebianPackages;
}; };
}; };