public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #45440 from xeji/libvirt-revert 

Revert "libvirt: 4.5.0 -> 4.6.0" and attempted fixes
This commit is contained in:
xeji 2018-08-22 00:00:06 +02:00 committed by GitHub
parent 27f6600419 ebac61b0d0
commit ab6186be58
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/libraries/libvirt/default.nix
View File

@ -4,7 +4,7 @@
, iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext , iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext
, libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor , libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor
, dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages
, curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode, jansson , curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode
, enableXen ? false, xen ? null , enableXen ? false, xen ? null
, enableIscsi ? false, openiscsi , enableIscsi ? false, openiscsi
}: }:
@ -16,26 +16,26 @@ let
buildFromTarball = stdenv.isDarwin; buildFromTarball = stdenv.isDarwin;
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "libvirt-${version}"; name = "libvirt-${version}";
version = "4.6.0"; version = "4.5.0";
src = src =
if buildFromTarball then if buildFromTarball then
fetchurl { fetchurl {
url = "http://libvirt.org/sources/${name}.tar.xz"; url = "http://libvirt.org/sources/${name}.tar.xz";
sha256 = "0rj0azi766g0xdxydvkq9nj95hhsiwqgclzzmyxvk2axhb8nrb5l"; sha256 = "02dbfyi80im37gdsxglb4fja78q63b8ahmgdc5kh8lx51kf5xsg7";
} }
else else
fetchgit { fetchgit {
url = git://libvirt.org/libvirt.git; url = git://libvirt.org/libvirt.git;
rev = "v${version}"; rev = "v${version}";
sha256 = "1lv1s93k056wylrlc7j4q45zir9z4qshzcl454spy2wb8cdn3h4s"; sha256 = "0ija9a02znajsa2pbxamrmz87zwpmba9s29vdzzqqqw5c1rdpcr6";
fetchSubmodules = true; fetchSubmodules = true;
}; };
nativeBuildInputs = [ makeWrapper pkgconfig ]; nativeBuildInputs = [ makeWrapper pkgconfig ];
buildInputs = [ buildInputs = [
libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl
libxslt xhtml1 perlPackages.XMLXPath curl libpcap jansson libxslt xhtml1 perlPackages.XMLXPath curl libpcap
] ++ optionals (!buildFromTarball) [ ] ++ optionals (!buildFromTarball) [
libtool autoconf automake libtool autoconf automake
] ++ optionals stdenv.isLinux [ ] ++ optionals stdenv.isLinux [
@ -60,9 +60,7 @@ in stdenv.mkDerivation rec {
--replace 'lxc_path,' '"/run/libvirt/nix-emulators/libvirt_lxc",' --replace 'lxc_path,' '"/run/libvirt/nix-emulators/libvirt_lxc",'
patchShebangs . # fixes /usr/bin/python references patchShebangs . # fixes /usr/bin/python references
substituteInPlace src/util/virjsoncompat.c --replace \ '';
'"libjansson.so.4"' '"${jansson}/lib/libjansson${stdenv.targetPlatform.extensions.sharedLibrary}"'
'';
configureFlags = [ configureFlags = [
"--localstatedir=/var" "--localstatedir=/var"

4
pkgs/development/python-modules/libvirt/default.nix
View File

@ -2,12 +2,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "libvirt"; pname = "libvirt";
version = "4.6.0"; version = "4.5.0";
src = assert version == libvirt.version; fetchgit { src = assert version == libvirt.version; fetchgit {
url = git://libvirt.org/libvirt-python.git; url = git://libvirt.org/libvirt-python.git;
rev = "v${version}"; rev = "v${version}";
sha256 = "0yrgibd5c9wy82ak8g9ykar6fma1wf7xzmmc47657lzm70m5av68"; sha256 = "0w2rzkxv7jsq4670m0j5c6p4hpyi0r0ja6wd3wdvixcwc6hhx407";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];

4
pkgs/top-level/perl-packages.nix
View File

@ -14400,12 +14400,12 @@ let
}; };
SysVirt = buildPerlModule rec { SysVirt = buildPerlModule rec {
version = "4.6.0"; version = "4.5.0";
name = "Sys-Virt-${version}"; name = "Sys-Virt-${version}";
src = assert version == pkgs.libvirt.version; pkgs.fetchgit { src = assert version == pkgs.libvirt.version; pkgs.fetchgit {
url = git://libvirt.org/libvirt-perl.git; url = git://libvirt.org/libvirt-perl.git;
rev = "v${version}"; rev = "v${version}";
sha256 = "0qs84sdrq85i3xc0drbk71jjm9vq1n8izdwy5zsd5r7dqays5slf"; sha256 = "18ns94i29c9x0j50pz9r1vcif6baayz769sa7b51v8kcvam9j52s";
}; };
nativeBuildInputs = [ pkgs.pkgconfig ]; nativeBuildInputs = [ pkgs.pkgconfig ];
buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ]; buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ];