diff --git a/pkgs/development/libraries/libvirt/5.4.0.nix b/pkgs/development/libraries/libvirt/5.9.0.nix similarity index 77% rename from pkgs/development/libraries/libvirt/5.4.0.nix rename to pkgs/development/libraries/libvirt/5.9.0.nix index dd0a88974d0..3a57a91a22a 100644 --- a/pkgs/development/libraries/libvirt/5.4.0.nix +++ b/pkgs/development/libraries/libvirt/5.9.0.nix @@ -4,7 +4,7 @@ , iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext , libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages -, curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode +, curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode, glib , enableXen ? false, xen ? null , enableIscsi ? false, openiscsi , enableCeph ? false, ceph @@ -17,50 +17,26 @@ let buildFromTarball = stdenv.isDarwin; in stdenv.mkDerivation rec { pname = "libvirt"; - version = "5.4.0"; + version = "5.9.0"; src = if buildFromTarball then fetchurl { url = "http://libvirt.org/sources/${pname}-${version}.tar.xz"; - sha256 = "0ywf8m9yz2hxnic7fylzlmgy4m353r4vv5zsvp89zq5yh4h81yhw"; + sha256 = "0fc9jxw3v6x5hc10bkd7bbcayn24hbld5adj2gh5s648v7hx55il"; } else fetchgit { url = git://libvirt.org/libvirt.git; rev = "v${version}"; - sha256 = "1dja1mf295w0sl83zag62c4j55cfbzzfbhdxpkyv2zm3zv0mwdyc"; + sha256 = "0smm77ag8bg24xkbhl4akqikjrsq2pd3wk31nj0hk1avqnl00gmk"; fetchSubmodules = true; }; - patches = optionals (!stdenv.isDarwin) [ - (fetchpatch { - name = "5.4.0-CVE-2019-10161.patch"; - url = "https://libvirt.org/git/?p=libvirt.git;a=patch;h=aed6a032cead4386472afb24b16196579e239580"; - sha256 = "19k9z9xx68nf03igbgy1imxnlp5ppj7cgdbq9kri3s834hkjcygs"; - }) - ] ++ [ - (fetchpatch { - name = "5.4.0-CVE-2019-10166.patch"; - url = "https://libvirt.org/git/?p=libvirt.git;a=patch;h=db0b78457f183e4c7ac45bc94de86044a1e2056a"; - sha256 = "17pd1rab2mxj4q0vg30vi2gh78mf52ik1p5l12wrghb0wjf7swml"; - }) - (fetchpatch { - name = "5.4.0-CVE-2019-10167.patch"; - url = "https://libvirt.org/git/?p=libvirt.git;a=patch;h=8afa68bac0cf99d1f8aaa6566685c43c22622f26"; - sha256 = "0hgbwk0y2n6ihzjk8vqabhw914axjqgzcb7c5xx893r86c54c0ml"; - }) - (fetchpatch { - name = "5.4.0-CVE-2019-10168.patch"; - url = "https://libvirt.org/git/?p=libvirt.git;a=patch;h=bf6c2830b6c338b1f5699b095df36f374777b291"; - sha256 = "0s4hc3hsjncx1852ndjas1nng9v23pxf4mi1jxcajsqvhw89la0g"; - }) - ]; - nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = [ libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl - libxslt xhtml1 perlPackages.XMLXPath curl libpcap + libxslt xhtml1 perlPackages.XMLXPath curl libpcap glib ] ++ optionals (!buildFromTarball) [ libtool autoconf automake ] ++ optionals stdenv.isLinux [ diff --git a/pkgs/development/python-modules/libvirt/5.4.0.nix b/pkgs/development/python-modules/libvirt/5.9.0.nix similarity index 85% rename from pkgs/development/python-modules/libvirt/5.4.0.nix rename to pkgs/development/python-modules/libvirt/5.9.0.nix index 46d8a990f53..ef5da737e08 100644 --- a/pkgs/development/python-modules/libvirt/5.4.0.nix +++ b/pkgs/development/python-modules/libvirt/5.9.0.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "libvirt"; - version = "5.4.0"; + version = "5.9.0"; src = fetchgit { url = git://libvirt.org/libvirt-python.git; rev = "v${version}"; - sha256 = "0ja35z90i3m7vsjfpzfm7awkmja3h0150376i5pzmf2q8vp61fi5"; + sha256 = "0qvr0s7yasswy1s5cvkm91iifk33pb8s7nbb38zznc46706b358r"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c74dee307d9..81985fb6b4e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13241,7 +13241,7 @@ in libversion = callPackage ../development/libraries/libversion { }; libvirt = callPackage ../development/libraries/libvirt { }; - libvirt_5_4_0 = callPackage ../development/libraries/libvirt/5.4.0.nix { }; + libvirt_5_9_0 = callPackage ../development/libraries/libvirt/5.9.0.nix { }; libvirt-glib = callPackage ../development/libraries/libvirt-glib { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c4ea9dc6ac1..1af1e4207fc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6414,9 +6414,9 @@ in { libvirt = if isPy3k then (callPackage ../development/python-modules/libvirt { inherit (pkgs) libvirt pkgconfig; - }) else (callPackage ../development/python-modules/libvirt/5.4.0.nix { + }) else (callPackage ../development/python-modules/libvirt/5.9.0.nix { inherit (pkgs) pkgconfig; - libvirt = pkgs.libvirt_5_4_0; + libvirt = pkgs.libvirt_5_9_0; }); rpdb = callPackage ../development/python-modules/rpdb { };