diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2023-05-25 22:07:14 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-05-25 22:07:14 +0200 |
commit | 86b0cdb24b65cb81f0f7ed7952b2338bcb84ea2a (patch) | |
tree | 3ab95c3b51debc870002584b972cb4d480aaff17 /nixos | |
parent | 32e61ec5ad43dca193245e3d81908fe5dd808994 (diff) | |
parent | 6a20c1325880ff0f4d894fa4d008d901ceac4529 (diff) | |
download | nixlib-86b0cdb24b65cb81f0f7ed7952b2338bcb84ea2a.tar nixlib-86b0cdb24b65cb81f0f7ed7952b2338bcb84ea2a.tar.gz nixlib-86b0cdb24b65cb81f0f7ed7952b2338bcb84ea2a.tar.bz2 nixlib-86b0cdb24b65cb81f0f7ed7952b2338bcb84ea2a.tar.lz nixlib-86b0cdb24b65cb81f0f7ed7952b2338bcb84ea2a.tar.xz nixlib-86b0cdb24b65cb81f0f7ed7952b2338bcb84ea2a.tar.zst nixlib-86b0cdb24b65cb81f0f7ed7952b2338bcb84ea2a.zip |
Merge pull request #233517 from illustris/pve-fix
nixos/proxmox-image: fix qemu build failure
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/virtualisation/proxmox-image.nix | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/nixos/modules/virtualisation/proxmox-image.nix b/nixos/modules/virtualisation/proxmox-image.nix index 82b33a341799..b5d4ecd02683 100644 --- a/nixos/modules/virtualisation/proxmox-image.nix +++ b/nixos/modules/virtualisation/proxmox-image.nix @@ -187,20 +187,20 @@ with lib; guestAgentSupport = false; }).overrideAttrs ( super: rec { - version = "7.0.0"; + version = "7.2.1"; src = pkgs.fetchurl { url= "https://download.qemu.org/qemu-${version}.tar.xz"; - sha256 = "sha256-9rN1x5UfcoQCeYsLqrsthkeMpT1Eztvvq74cRr9G+Dk="; + sha256 = "sha256-jIVpms+dekOl/immTN1WNwsMLRrQdLr3CYqCTReq1zs="; }; patches = [ # Proxmox' VMA tool is published as a particular patch upon QEMU (pkgs.fetchpatch { url = let - rev = "1976ca460796f28447b41e3618e5c1e234035dd5"; - path = "debian/patches/pve/0026-PVE-Backup-add-vma-backup-format-code.patch"; + rev = "abb04bb6272c1202ca9face0827917552b9d06f6"; + path = "debian/patches/pve/0027-PVE-Backup-add-vma-backup-format-code.patch"; in "https://git.proxmox.com/?p=pve-qemu.git;a=blob_plain;hb=${rev};f=${path}"; - hash = "sha256-2Dz+ceTwrcyYYxi76RtyY3v15/2pwGcDhFuoZWlgbjc="; + hash = "sha256-3d0HHdvaExCry6zcULnziYnWIAnn24vECkI4sjj2BMg="; }) # Proxmox' VMA tool uses O_DIRECT which fails on tmpfs @@ -220,6 +220,7 @@ with lib; ]; buildInputs = super.buildInputs ++ [ pkgs.libuuid ]; + nativeBuildInputs = super.nativeBuildInputs ++ [ pkgs.perl ]; }); in |