From 8da1da9d740bf9d9b0d301890aeb2c3f523fd79b Mon Sep 17 00:00:00 2001 From: volth Date: Sun, 5 May 2019 21:58:11 +0000 Subject: [PATCH] libvirt: 4.10.0 -> 5.3.0 --- pkgs/development/libraries/libvirt/default.nix | 7 +++---- pkgs/development/python-modules/libvirt/default.nix | 4 ++-- pkgs/top-level/perl-packages.nix | 6 +++--- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 85b8b128d208..d9c551f9bdae 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; }; @@ -82,7 +82,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 1c216dfaa455..107f6661aefa 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14562,12 +14562,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 ];