about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorGraham Christensen <graham@grahamc.com>2019-06-28 16:06:17 -0400
committerGitHub <noreply@github.com>2019-06-28 16:06:17 -0400
commitcc588bd420c93d0ae722e5a1d9750dc24e822bff (patch)
tree6e2fd847775853f0f6206049d0e6fa53c0d29762 /pkgs
parentfe9a15211a003ea869acdef899fa0ff9f8c57aec (diff)
parent8da1da9d740bf9d9b0d301890aeb2c3f523fd79b (diff)
downloadnixlib-cc588bd420c93d0ae722e5a1d9750dc24e822bff.tar
nixlib-cc588bd420c93d0ae722e5a1d9750dc24e822bff.tar.gz
nixlib-cc588bd420c93d0ae722e5a1d9750dc24e822bff.tar.bz2
nixlib-cc588bd420c93d0ae722e5a1d9750dc24e822bff.tar.lz
nixlib-cc588bd420c93d0ae722e5a1d9750dc24e822bff.tar.xz
nixlib-cc588bd420c93d0ae722e5a1d9750dc24e822bff.tar.zst
nixlib-cc588bd420c93d0ae722e5a1d9750dc24e822bff.zip
Merge pull request #61011 from volth/libvirt-5.3.0
libvirt: 4.10.0 -> 5.3.0
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/libraries/libvirt/default.nix7
-rw-r--r--pkgs/development/python-modules/libvirt/default.nix4
-rw-r--r--pkgs/top-level/perl-packages.nix6
3 files changed, 8 insertions, 9 deletions
diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index 310d24862d09..181fad05a0b8 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -17,19 +17,19 @@ let
   buildFromTarball = stdenv.isDarwin;
 in stdenv.mkDerivation rec {
   name = "libvirt-${version}";
-  version = "4.10.0";
+  version = "5.3.0";
 
   src =
     if buildFromTarball then
       fetchurl {
         url = "http://libvirt.org/sources/${name}.tar.xz";
-        sha256 = "0v17zzyyb25nn9l18v5244myg7590dp6ppwgi8xysipifc0q77bz";
+        sha256 = "00f1blazv589cbfc85p4347x68kr45mz1r37z9bkjyw10vavsr45";
       }
     else
       fetchgit {
         url = git://libvirt.org/libvirt.git;
         rev = "v${version}";
-        sha256 = "0dlpv3v6jpbmgvhpn29ryp0w2a1xny8ciqid8hnlf3klahz9kwz9";
+        sha256 = "10amj2aibc1cywiwn989n09sdngiw8ghp5jvdr7lwh9wdb0a3r57";
         fetchSubmodules = true;
       };
 
@@ -84,7 +84,6 @@ in stdenv.mkDerivation rec {
     "--with-numad"
     "--with-macvtap"
     "--with-virtualport"
-    "--with-init-script=systemd+redhat"
     "--with-storage-disk"
   ] ++ optionals (stdenv.isLinux && zfs != null) [
     "--with-storage-zfs"
diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix
index d6924d9d65cf..c1386085f366 100644
--- a/pkgs/development/python-modules/libvirt/default.nix
+++ b/pkgs/development/python-modules/libvirt/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "libvirt";
-  version = "4.10.0";
+  version = "5.3.0";
 
   src = assert version == libvirt.version; fetchgit {
     url = git://libvirt.org/libvirt-python.git;
     rev = "v${version}";
-    sha256 = "184gd857fkks9ivh4zzbmva2fs2dfxg9lihvhfrwyd2pxflglvyf";
+    sha256 = "1l2a0gxmf071rd198c1z0ls3idr30i0aarf04bi9v705zdv90sxa";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index aaca6ddc333b..aedef3cee009 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -14674,12 +14674,12 @@ let
   };
 
   SysVirt = buildPerlModule rec {
-    version = "4.10.0";
+    version = "5.3.0";
     name = "Sys-Virt-${version}";
     src = assert version == pkgs.libvirt.version; pkgs.fetchgit {
       url = git://libvirt.org/libvirt-perl.git;
-      rev = "v${version}";
-      sha256 = "1dfwq4d46kx18lz27rb3jkxb0g1hirpq70vr4572sc38rybpq59v";
+      rev = "a1e85f96e3897f56e8686e9312c69de764f5a48c"; # there is no "v5.3.0" tag
+      sha256 = "1w80bhsdpcrk99cv355jyhl510a0nawnn9adffwj50a59ka77ihw";
     };
     nativeBuildInputs = [ pkgs.pkgconfig ];
     buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ];