Commit 1a25244b authored by Josh Hoffer's avatar Josh Hoffer Committed by github-actions[bot]
Browse files

libvirt, perlPackages.SysVirt: 8.8.0 -> 8.9.0 

(cherry picked from commit 065af611)
parent 525d803f

pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch

+3 −3
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ diff --git a/src/network/meson.build b/src/network/meson.build 
index b5eff0c3ab..a0f26d624e 100644

--- a/src/network/meson.build

+++ b/src/network/meson.build

@@ -73,11 +73,11 @@ if conf.has('WITH_NETWORK')

@@ -73,11 +73,11 @@ 'in_file': files('virtnetworkd.init.in'),

   }

 

   virt_install_dirs += [
@@ -247,7 +247,7 @@ index b5eff0c3ab..a0f26d624e 100644 
   ]

 

   configure_file(

@@ -85,12 +85,12 @@ if conf.has('WITH_NETWORK')

@@ -85,12 +85,12 @@ input: 'default.xml.in',

     output: '@BASENAME@',

     copy: true,

     install: true,
@@ -256,7 +256,7 @@ index b5eff0c3ab..a0f26d624e 100644 
   )

 

   meson.add_install_script(

     meson_python_prog.path(), python3_prog.path(), meson_install_symlink_prog.path(),

     meson_python_prog.full_path(), python3_prog.full_path(), meson_install_symlink_prog.full_path(),

-    confdir / 'qemu' / 'networks' / 'autostart',

+    install_prefix + confdir / 'qemu' / 'networks' / 'autostart',

     '../default.xml', 'default.xml',

pkgs/development/libraries/libvirt/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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.8.0";

  version = "8.9.0";



  src = fetchFromGitLab {

    owner = pname;

    repo = pname;

    rev = "v${version}";

    sha256 = "sha256-p7z+paiSeIm2cWnc6n9Hrd++BDmccGj+EOhqHNsJiXw=";

    sha256 = "sha256-79frEYItbf1weOkrcyI/Z/TjTg6kLMQbteaTi9LAt0g=";

    fetchSubmodules = true;

  };

pkgs/development/python-modules/libvirt/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -2,13 +2,13 @@ 


buildPythonPackage rec {

  pname = "libvirt";

  version = "8.8.0";

  version = "8.9.0";



  src = fetchFromGitLab {

    owner = "libvirt";

    repo = "libvirt-python";

    rev = "v${version}";

    sha256 = "sha256-UguqUsIfrql1UZeBoHLKXvLYuWicbJWamglkvqS++FI=";

    sha256 = "sha256-vquchyGJlpg0R0R6Wh2MWB5RUZ3jzOQYzUoLwiLxIy8=";

  };



  nativeBuildInputs = [ pkg-config ];

pkgs/top-level/perl-packages.nix

+2 −2
Original line number Diff line number Diff line
@@ -22634,12 +22634,12 @@ let 














  SysVirt = buildPerlModule rec {















    pname = "Sys-Virt";













    version = "8.8.0";













    version = "8.9.0";















    src = fetchFromGitLab {















      owner = "libvirt";















      repo = "libvirt-perl";















      rev = "v${version}";













      hash = "sha256-8maLIW4hBbMbq+rnwEfaHsUgpppaU5K4aQTwTgUjdcI=";













      hash = "sha256-s3N4KU0JnIXHKOme+2Vxapd6o8QeT6lUAb+r5i9Ogv0=";















    };















    nativeBuildInputs = [ pkgs.pkg-config ];















    buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ];