From dd1c4ff5fc4ee926b7640ef2eecd81c7bbb4d2c4 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 26 Nov 2022 23:53:24 +0300 Subject: [PATCH] vmTools: update current maintained debian versions --- nixos/tests/os-prober.nix | 2 +- pkgs/build-support/vm/default.nix | 60 +++++++++++++++---------------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/nixos/tests/os-prober.nix b/nixos/tests/os-prober.nix index 1c89cf8c1c67..8f3e2494047c 100644 --- a/nixos/tests/os-prober.nix +++ b/nixos/tests/os-prober.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ({pkgs, lib, ...}: let # A filesystem image with a (presumably) bootable debian - debianImage = pkgs.vmTools.diskImageFuns.debian9i386 { + debianImage = pkgs.vmTools.diskImageFuns.debian11i386 { # os-prober cannot detect systems installed on disks without a partition table # so we create the disk ourselves createRootFS = with pkgs; '' diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 06e1deb47845..6ddb2c573cb9 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -977,45 +977,45 @@ rec { packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; }; - debian9i386 = { - name = "debian-9.13-stretch-i386"; - fullName = "Debian 9.13 Stretch (i386)"; - packagesList = fetchurl { - url = "https://snapshot.debian.org/archive/debian/20210526T143040Z/dists/stretch/main/binary-i386/Packages.xz"; - sha256 = "sha256-fFRumd20wuVaYxzw0VPkAw5mQo8kIg+eXII15VSz9wA="; - }; - urlPrefix = "mirror://debian"; - packages = commonDebianPackages; - }; - - debian9x86_64 = { - name = "debian-9.13-stretch-amd64"; - fullName = "Debian 9.13 Stretch (amd64)"; - packagesList = fetchurl { - url = "https://snapshot.debian.org/archive/debian/20210526T143040Z/dists/stretch/main/binary-amd64/Packages.xz"; - sha256 = "sha256-1p4DEVpTGlBE3PtbQ90kYw4QNHkW0F4rna/Xz+ncMhw="; - }; - urlPrefix = "mirror://debian"; - packages = commonDebianPackages; - }; - debian10i386 = { - name = "debian-10.9-buster-i386"; - fullName = "Debian 10.9 Buster (i386)"; + name = "debian-10.13-buster-i386"; + fullName = "Debian 10.13 Buster (i386)"; packagesList = fetchurl { - url = "https://snapshot.debian.org/archive/debian/20210526T143040Z/dists/buster/main/binary-i386/Packages.xz"; - sha256 = "sha256-zlkbKV+IGBCyWKD4v4LFM/EUA4TYS9fkLBPuF6MgUDo="; + url = "https://snapshot.debian.org/archive/debian/20221126T084953Z/dists/buster/main/binary-i386/Packages.xz"; + hash = "sha256-n9JquhtZgxw3qr9BX0MQoY3ZTIHN0dit+iru3DC31UY="; }; urlPrefix = "mirror://debian"; packages = commonDebianPackages; }; debian10x86_64 = { - name = "debian-10.9-buster-amd64"; - fullName = "Debian 10.9 Buster (amd64)"; + name = "debian-10.13-buster-amd64"; + fullName = "Debian 10.13 Buster (amd64)"; packagesList = fetchurl { - url = "https://snapshot.debian.org/archive/debian/20210526T143040Z/dists/buster/main/binary-amd64/Packages.xz"; - sha256 = "sha256-k13toY1b3CX7GBPQ7Jm24OMqCEsgPlGK8M99x57o69o="; + url = "https://snapshot.debian.org/archive/debian/20221126T084953Z/dists/buster/main/binary-amd64/Packages.xz"; + hash = "sha256-YukIIB3u87jgp9oudwklsxyKVKjSL618wFgDSXiFmjU="; + }; + urlPrefix = "mirror://debian"; + packages = commonDebianPackages; + }; + + debian11i386 = { + name = "debian-11.5-bullseye-i386"; + fullName = "Debian 11.5 Bullseye (i386)"; + packagesList = fetchurl { + url = "https://snapshot.debian.org/archive/debian/20221126T084953Z/dists/bullseye/main/binary-i386/Packages.xz"; + hash = "sha256-tHrWSd4K5TCwIaLTPqK/Rcon0O0r+Jsxb7OcchOo8Vo="; + }; + urlPrefix = "mirror://debian"; + packages = commonDebianPackages; + }; + + debian11x86_64 = { + name = "debian-11.5-bullseye-amd64"; + fullName = "Debian 11.5 Bullseye (amd64)"; + packagesList = fetchurl { + url = "https://snapshot.debian.org/archive/debian/20221126T084953Z/dists/bullseye/main/binary-amd64/Packages.xz"; + hash = "sha256-whpBERKOPyhrWguVQ2QchrwRHU4tCkGwu42x6khF/2g="; }; urlPrefix = "mirror://debian"; packages = commonDebianPackages;