From 4ad233e518d25e60d06bb3cb41307f8270f3f18e Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Tue, 21 Aug 2018 22:03:58 +0200 Subject: [PATCH 1/4] Revert "libvirt: fix dlopen("libjansson.so.4")" This reverts commit 929a53f2814982247f34fa296f6c1dd0435caf20. Upstream has reverted their move from yajl to jansson after 4.6.0 because of major issues. No point in trying to fix it. Let's revert to libvirt 4.5.0 and wait for the next upstream release. --- pkgs/development/libraries/libvirt/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 4b104a04c15d..63f11daad288 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -60,9 +60,7 @@ in stdenv.mkDerivation rec { --replace 'lxc_path,' '"/run/libvirt/nix-emulators/libvirt_lxc",' patchShebangs . # fixes /usr/bin/python references - substituteInPlace src/util/virjsoncompat.c --replace \ - '"libjansson.so.4"' '"${jansson}/lib/libjansson${stdenv.targetPlatform.extensions.sharedLibrary}"' - ''; + ''; configureFlags = [ "--localstatedir=/var" From 528f4a2d1f7e040ff4cb03733a1b604196e61a6c Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Tue, 21 Aug 2018 22:07:05 +0200 Subject: [PATCH 2/4] Revert "libvirt: jansson required for qemu suppport" This reverts commit df05344d960895d8b076341ca0d8a0c7333f24b4. Upstream has reverted their move from yajl to jansson after 4.6.0 because of major issues. Let's revert to libvirt 4.5.0 and wait for the next upstream release. --- pkgs/development/libraries/libvirt/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 63f11daad288..e584af775d2b 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.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, jansson +, curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode , enableXen ? false, xen ? null , enableIscsi ? false, openiscsi }: @@ -35,11 +35,11 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = [ libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl - libxslt xhtml1 perlPackages.XMLXPath curl libpcap jansson + libxslt xhtml1 perlPackages.XMLXPath curl libpcap ] ++ optionals (!buildFromTarball) [ libtool autoconf automake ] ++ optionals stdenv.isLinux [ - libpciaccess lvm2 utillinux systemd libnl numad zfs + libpciaccess lvm2 lvm2 utillinux systemd libnl numad zfs libapparmor libcap_ng numactl attr parted ] ++ optionals (enableXen && stdenv.isLinux && stdenv.isx86_64) [ xen @@ -66,7 +66,6 @@ in stdenv.mkDerivation rec { "--localstatedir=/var" "--sysconfdir=/var/lib" "--with-libpcap" - "--with-qemu" "--with-vmware" "--with-vbox" "--with-test" From 6b5b7d96fb0bb292b43362077b6eb03a905f1cbf Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Tue, 21 Aug 2018 22:08:21 +0200 Subject: [PATCH 3/4] Revert "libvirt: 4.5.0 -> 4.6.0 (#44566)" This reverts commit 88352408958d905c77ad0461036196282c39cf69. 4.6.0 is quite broken. Let's wait for the next release. --- pkgs/development/libraries/libvirt/default.nix | 6 +++--- pkgs/development/python-modules/libvirt/default.nix | 4 ++-- pkgs/top-level/perl-packages.nix | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index e584af775d2b..02c13e413e33 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -16,19 +16,19 @@ let buildFromTarball = stdenv.isDarwin; in stdenv.mkDerivation rec { name = "libvirt-${version}"; - version = "4.6.0"; + version = "4.5.0"; src = if buildFromTarball then fetchurl { url = "http://libvirt.org/sources/${name}.tar.xz"; - sha256 = "0rj0azi766g0xdxydvkq9nj95hhsiwqgclzzmyxvk2axhb8nrb5l"; + sha256 = "02dbfyi80im37gdsxglb4fja78q63b8ahmgdc5kh8lx51kf5xsg7"; } else fetchgit { url = git://libvirt.org/libvirt.git; rev = "v${version}"; - sha256 = "1lv1s93k056wylrlc7j4q45zir9z4qshzcl454spy2wb8cdn3h4s"; + sha256 = "0ija9a02znajsa2pbxamrmz87zwpmba9s29vdzzqqqw5c1rdpcr6"; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix index 71e9adf11d2d..26b42020fc34 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.6.0"; + version = "4.5.0"; src = assert version == libvirt.version; fetchgit { url = git://libvirt.org/libvirt-python.git; rev = "v${version}"; - sha256 = "0yrgibd5c9wy82ak8g9ykar6fma1wf7xzmmc47657lzm70m5av68"; + sha256 = "0w2rzkxv7jsq4670m0j5c6p4hpyi0r0ja6wd3wdvixcwc6hhx407"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7f09630debfc..5add53c0dc24 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14400,12 +14400,12 @@ let }; SysVirt = buildPerlModule rec { - version = "4.6.0"; + version = "4.5.0"; name = "Sys-Virt-${version}"; src = assert version == pkgs.libvirt.version; pkgs.fetchgit { url = git://libvirt.org/libvirt-perl.git; rev = "v${version}"; - sha256 = "0qs84sdrq85i3xc0drbk71jjm9vq1n8izdwy5zsd5r7dqays5slf"; + sha256 = "18ns94i29c9x0j50pz9r1vcif6baayz769sa7b51v8kcvam9j52s"; }; nativeBuildInputs = [ pkgs.pkgconfig ]; buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ]; From ebac61b0d086d75cbf450d091c21ae1040081cbd Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Tue, 21 Aug 2018 22:54:54 +0200 Subject: [PATCH 4/4] libvirt: explicitly configure qemu support it is enabled by default in 4.5.0 but conditional in 4.6.0 so let's already put it in here to avoid issues on the next bump. --- pkgs/development/libraries/libvirt/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 02c13e413e33..fd35864fe343 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { ] ++ optionals (!buildFromTarball) [ libtool autoconf automake ] ++ optionals stdenv.isLinux [ - libpciaccess lvm2 lvm2 utillinux systemd libnl numad zfs + libpciaccess lvm2 utillinux systemd libnl numad zfs libapparmor libcap_ng numactl attr parted ] ++ optionals (enableXen && stdenv.isLinux && stdenv.isx86_64) [ xen @@ -66,6 +66,7 @@ in stdenv.mkDerivation rec { "--localstatedir=/var" "--sysconfdir=/var/lib" "--with-libpcap" + "--with-qemu" "--with-vmware" "--with-vbox" "--with-test"