From 608528afe6cde19f8aad7aa7308d027b16131994 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 17 Jan 2023 08:14:00 +0100
Subject: [PATCH] libvirt: 8.10.0 -> 9.0.0

---
 ...n-patch-in-an-install-prefix-for-building-on-nix.patch | 4 +++-
 pkgs/development/libraries/libvirt/default.nix            | 8 ++++----
 pkgs/development/python-modules/libvirt/default.nix       | 4 ++--
 pkgs/top-level/perl-packages.nix                          | 4 ++--
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch b/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch
index b8d8ddcb1411..75d2ac1f0873 100644
--- a/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch
+++ b/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch
@@ -305,7 +305,7 @@ diff --git a/src/qemu/meson.build b/src/qemu/meson.build
 index 39f0f615cc..5f6f30f82b 100644
 --- a/src/qemu/meson.build
 +++ b/src/qemu/meson.build
-@@ -175,24 +175,24 @@ if conf.has('WITH_QEMU')
+@@ -200,25 +200,25 @@ if conf.has('WITH_QEMU')
    endif
  
    virt_install_dirs += [
@@ -326,6 +326,7 @@ index 39f0f615cc..5f6f30f82b 100644
 -    localstatedir / 'log' / 'swtpm' / 'libvirt' / 'qemu',
 -    runstatedir / 'libvirt' / 'qemu',
 -    runstatedir / 'libvirt' / 'qemu' / 'dbus',
+-    runstatedir / 'libvirt' / 'qemu' / 'passt',
 -    runstatedir / 'libvirt' / 'qemu' / 'slirp',
 -    runstatedir / 'libvirt' / 'qemu' / 'swtpm',
 +    install_prefix + confdir / 'qemu',
@@ -345,6 +346,7 @@ index 39f0f615cc..5f6f30f82b 100644
 +    install_prefix + localstatedir / 'log' / 'swtpm' / 'libvirt' / 'qemu',
 +    install_prefix + runstatedir / 'libvirt' / 'qemu',
 +    install_prefix + runstatedir / 'libvirt' / 'qemu' / 'dbus',
++    install_prefix + runstatedir / 'libvirt' / 'qemu' / 'passt',
 +    install_prefix + runstatedir / 'libvirt' / 'qemu' / 'slirp',
 +    install_prefix + runstatedir / 'libvirt' / 'qemu' / 'swtpm',
    ]
diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index 8f4479a763be..2a56a0cde209 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -42,7 +42,7 @@
 , attr ? null
 , audit ? null
 , dmidecode ? null
-, fuse ? null
+, fuse3 ? null
 , kmod ? null
 , libapparmor ? null
 , libcap_ng ? null
@@ -114,13 +114,13 @@ stdenv.mkDerivation rec {
   # NOTE: You must also bump:
   # <nixpkgs/pkgs/development/python-modules/libvirt/default.nix>
   # SysVirt in <nixpkgs/pkgs/top-level/perl-packages.nix>
-  version = "8.10.0";
+  version = "9.0.0";
 
   src = fetchFromGitLab {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-MboJLQ0R3l9lUQDjNVACvmxISjypvfxxMHSKF0+k6WM=";
+    sha256 = "sha256-YnkgTl6C3QkvMBGm95JgWmWaP4mAECe9B0wwjOx94p8=";
     fetchSubmodules = true;
   };
 
@@ -201,7 +201,7 @@ stdenv.mkDerivation rec {
     acl
     attr
     audit
-    fuse
+    fuse3
     libapparmor
     libcap_ng
     libnl
diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix
index f3dd61f84948..f56fcd0e9ac1 100644
--- a/pkgs/development/python-modules/libvirt/default.nix
+++ b/pkgs/development/python-modules/libvirt/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "libvirt";
-  version = "8.10.0";
+  version = "9.0.0";
 
   src = fetchFromGitLab {
     owner = "libvirt";
     repo = "libvirt-python";
     rev = "v${version}";
-    sha256 = "sha256-f2ZWBNCgylKQCmbLCaJsIb5alvZDRZUWQAMOMsxwGbk=";
+    sha256 = "sha256-/u6sctXn4Jmn2bUl1FjjrKpHReaTg+O9LprKXx3OAyU=";
   };
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 58940bb1e5ae..ab7154805998 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -22646,12 +22646,12 @@ let
 
   SysVirt = buildPerlModule rec {
     pname = "Sys-Virt";
-    version = "8.10.0";
+    version = "9.0.0";
     src = fetchFromGitLab {
       owner = "libvirt";
       repo = "libvirt-perl";
       rev = "v${version}";
-      hash = "sha256-rVTofRtnYDF5CmWp3SB2+kJZz4u6+OTzNAUwiDrqdTo=";
+      hash = "sha256-QiaB272kxs/Y3/l8KbFy8f9iyOCxhzfA/h2FnfGzmE4=";
     };
     nativeBuildInputs = [ pkgs.pkg-config ];
     buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ];