mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-21 12:59:04 +02:00
nixos/proxmox-image: qemu 6.2.0 -> 7.0.0 and fix failing build
This commit is contained in:
parent
14e2055527
commit
265e6a668e
|
@ -129,21 +129,16 @@ with lib;
|
|||
# Build qemu with PVE's patch that adds support for the VMA format
|
||||
vma = pkgs.qemu_kvm.overrideAttrs ( super: rec {
|
||||
|
||||
# proxmox's VMA patch doesn't work with qemu 7.0 yet
|
||||
version = "6.2.0";
|
||||
src = pkgs.fetchurl {
|
||||
url= "https://download.qemu.org/qemu-${version}.tar.xz";
|
||||
hash = "sha256-aOFdjkWsVjJuC5pK+otJo9/oq6NIgiHQmMhGmLymW0U=";
|
||||
};
|
||||
|
||||
patches = let
|
||||
rev = "b37b17c286da3d32945fbee8ee4fd97a418a50db";
|
||||
path = "debian/patches/pve/0026-PVE-Backup-add-vma-backup-format-code.patch";
|
||||
vma-patch = pkgs.fetchpatch {
|
||||
url = "https://git.proxmox.com/?p=pve-qemu.git;a=blob_plain;h=${rev};f=${path}";
|
||||
hash = "sha256-siuDWDUnM9Zq0/L2Faww3ELAOUHhVIHu5RAQn6L4Atc=";
|
||||
};
|
||||
in [ vma-patch ];
|
||||
patches = [
|
||||
(pkgs.fetchpatch {
|
||||
url =
|
||||
let
|
||||
rev = "1976ca460796f28447b41e3618e5c1e234035dd5";
|
||||
path = "debian/patches/pve/0026-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=";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = super.buildInputs ++ [ pkgs.libuuid ];
|
||||
|
||||
|
|
Loading…
Reference in a new issue