diff options
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/perl-packages.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 7 |
3 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e2bc8a135ebb..c74dee307d91 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13241,6 +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-glib = callPackage ../development/libraries/libvirt-glib { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1a4fd0da81ab..edb6da9dd152 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -17282,11 +17282,11 @@ let SysVirt = buildPerlModule rec { pname = "Sys-Virt"; - version = "5.4.0"; + version = "6.0.0"; src = assert version == pkgs.libvirt.version; pkgs.fetchgit { url = git://libvirt.org/libvirt-perl.git; rev = "v${version}"; - sha256 = "0csg10mydcif2l0qf16nlphq6ih5378nk6dk1vznf5bspws2ch7a"; + sha256 = "06r333bc52x0g511lw3nwp5w5q9d7mwxrbx5ihiv7shwyxn7dh93"; }; nativeBuildInputs = [ pkgs.pkgconfig ]; buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0773a1984ab5..c4ea9dc6ac13 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6412,9 +6412,12 @@ in { inherit (pkgs) libversion pkgconfig; }; - libvirt = callPackage ../development/python-modules/libvirt { + libvirt = if isPy3k then (callPackage ../development/python-modules/libvirt { inherit (pkgs) libvirt pkgconfig; - }; + }) else (callPackage ../development/python-modules/libvirt/5.4.0.nix { + inherit (pkgs) pkgconfig; + libvirt = pkgs.libvirt_5_4_0; + }); rpdb = callPackage ../development/python-modules/rpdb { }; |