diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-03-19 11:42:06 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-19 11:42:06 +0000 |
commit | 86dd3f854b45ea07710b2ea729de35c2041a533e (patch) | |
tree | 5e2e4792f640ea3a4384087b383b4319ccdb8996 /pkgs/development | |
parent | 6e22dd9ee8a890d346e02a6a220df7bc9a0b2759 (diff) | |
parent | bf5e8ce96b059b49c63a135066417aedbab25377 (diff) | |
download | nixlib-86dd3f854b45ea07710b2ea729de35c2041a533e.tar nixlib-86dd3f854b45ea07710b2ea729de35c2041a533e.tar.gz nixlib-86dd3f854b45ea07710b2ea729de35c2041a533e.tar.bz2 nixlib-86dd3f854b45ea07710b2ea729de35c2041a533e.tar.lz nixlib-86dd3f854b45ea07710b2ea729de35c2041a533e.tar.xz nixlib-86dd3f854b45ea07710b2ea729de35c2041a533e.tar.zst nixlib-86dd3f854b45ea07710b2ea729de35c2041a533e.zip |
Merge pull request #35687 from volth/libvirt-4.1.0
libvirt: 3.10.0 -> 4.1.0
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/libraries/libvirt/build-on-bsd.patch | 58 | ||||
-rw-r--r-- | pkgs/development/libraries/libvirt/default.nix | 61 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/ocaml-libvirt/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/python-modules/libvirt/default.nix | 11 | ||||
-rw-r--r-- | pkgs/development/tools/gnulib/default.nix | 9 |
5 files changed, 49 insertions, 96 deletions
diff --git a/pkgs/development/libraries/libvirt/build-on-bsd.patch b/pkgs/development/libraries/libvirt/build-on-bsd.patch deleted file mode 100644 index 830f0f30ff9b..000000000000 --- a/pkgs/development/libraries/libvirt/build-on-bsd.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff -Naur libvirt-1.3.0.orig/src/admin/admin_protocol.c libvirt-1.3.0/src/admin/admin_protocol.c ---- libvirt-1.3.0.orig/src/admin/admin_protocol.c 2015-12-02 16:17:07.000000000 +0100 -+++ libvirt-1.3.0/src/admin/admin_protocol.c 2016-01-04 17:57:10.043412857 +0100 -@@ -6,6 +6,25 @@ - - #include "admin_protocol.h" - -+/* cygwin's xdr implementation defines xdr_u_int64_t instead of xdr_uint64_t -+ * and lacks IXDR_PUT_INT32 and IXDR_GET_INT32 -+ */ -+#ifdef HAVE_XDR_U_INT64_T -+# define xdr_uint64_t xdr_u_int64_t -+#endif -+#ifndef IXDR_PUT_INT32 -+# define IXDR_PUT_INT32 IXDR_PUT_LONG -+#endif -+#ifndef IXDR_GET_INT32 -+# define IXDR_GET_INT32 IXDR_GET_LONG -+#endif -+#ifndef IXDR_PUT_U_INT32 -+# define IXDR_PUT_U_INT32 IXDR_PUT_U_LONG -+#endif -+#ifndef IXDR_GET_U_INT32 -+# define IXDR_GET_U_INT32 IXDR_GET_U_LONG -+#endif -+ - bool_t - xdr_admin_nonnull_string (XDR *xdrs, admin_nonnull_string *objp) - { -diff -Naur libvirt-1.3.0.orig/src/logging/log_protocol.c libvirt-1.3.0/src/logging/log_protocol.c ---- libvirt-1.3.0.orig/src/logging/log_protocol.c 2015-12-08 13:07:35.000000000 +0100 -+++ libvirt-1.3.0/src/logging/log_protocol.c 2016-01-04 17:56:50.673463563 +0100 -@@ -7,6 +7,25 @@ - #include "log_protocol.h" - #include "internal.h" - -+/* cygwin's xdr implementation defines xdr_u_int64_t instead of xdr_uint64_t -+ * and lacks IXDR_PUT_INT32 and IXDR_GET_INT32 -+ */ -+#ifdef HAVE_XDR_U_INT64_T -+# define xdr_uint64_t xdr_u_int64_t -+#endif -+#ifndef IXDR_PUT_INT32 -+# define IXDR_PUT_INT32 IXDR_PUT_LONG -+#endif -+#ifndef IXDR_GET_INT32 -+# define IXDR_GET_INT32 IXDR_GET_LONG -+#endif -+#ifndef IXDR_PUT_U_INT32 -+# define IXDR_PUT_U_INT32 IXDR_PUT_U_LONG -+#endif -+#ifndef IXDR_GET_U_INT32 -+# define IXDR_GET_U_INT32 IXDR_GET_U_LONG -+#endif -+ - bool_t - xdr_virLogManagerProtocolUUID (XDR *xdrs, virLogManagerProtocolUUID objp) - { diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 2dbf80e71f77..7262ca541f01 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -1,30 +1,41 @@ -{ stdenv, fetchurl, fetchpatch -, pkgconfig, makeWrapper +{ stdenv, fetchurl, fetchgit +, pkgconfig, makeWrapper, libtool, autoconf, automake , coreutils, libxml2, gnutls, devicemapper, perl, python2, attr , 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, xen, zfs, parted +, curl, libiconv, gmp, xen, zfs, parted, bridge-utils, dmidecode }: with stdenv.lib; -# if you update, also bump <nixpkgs/pkgs/development/python-modules/libvirt/default.nix> or it will break -stdenv.mkDerivation rec { +# if you update, also bump <nixpkgs/pkgs/development/python-modules/libvirt/default.nix> and SysVirt in <nixpkgs/pkgs/top-level/perl-packages.nix> +let + buildFromTarball = stdenv.isDarwin; +in stdenv.mkDerivation rec { name = "libvirt-${version}"; - version = "3.10.0"; + version = "4.1.0"; - src = fetchurl { - url = "http://libvirt.org/sources/${name}.tar.xz"; - sha256 = "03kb37iv3dvvdlslznlc0njvjpmq082lczmsslz5p4fcwb50kwfz"; - }; - - patches = [ ./build-on-bsd.patch ]; + src = + if buildFromTarball then + fetchurl { + url = "http://libvirt.org/sources/${name}.tar.xz"; + sha256 = "0fb466mcma21hsxx3cckllbr9hhncpbwim5px1mr66iidy1a8bwa"; + } + else + fetchgit { + url = git://libvirt.org/libvirt.git; + rev = "v${version}"; + sha256 = "01021r7i71dw9w7ffp6ia8h70ns6bc0ps5np0hq9nipxs68finm6"; + fetchSubmodules = true; + }; nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = [ libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl libxslt xhtml1 perlPackages.XMLXPath curl libpcap + ] ++ optionals (!buildFromTarball) [ + libtool autoconf automake ] ++ optionals stdenv.isLinux [ libpciaccess devicemapper lvm2 utillinux systemd libnl numad zfs libapparmor libcap_ng numactl attr parted @@ -34,17 +45,16 @@ stdenv.mkDerivation rec { libiconv gmp ]; - preConfigure = optionalString stdenv.isLinux '' - PATH=${stdenv.lib.makeBinPath [ iproute iptables ebtables lvm2 systemd ]}:$PATH - substituteInPlace configure \ - --replace 'as_dummy="/bin:/usr/bin:/usr/sbin"' 'as_dummy="${numad}/bin"' + preConfigure = '' + ${ optionalString (!buildFromTarball) "./bootstrap --no-git --gnulib-srcdir=$(pwd)/.gnulib" } + + PATH=${stdenv.lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute iptables ebtables lvm2 systemd numad ])}:$PATH # the path to qemu-kvm will be stored in VM's .xml and .save files # do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations substituteInPlace src/lxc/lxc_conf.c \ --replace 'lxc_path,' '"/run/libvirt/nix-emulators/libvirt_lxc",' - '' + '' - PATH=${dnsmasq}/bin:$PATH + patchShebangs . # fixes /usr/bin/python references ''; @@ -78,18 +88,19 @@ stdenv.mkDerivation rec { ]; postInstall = '' - sed -i 's/ON_SHUTDOWN=suspend/ON_SHUTDOWN=''${ON_SHUTDOWN:-suspend}/' $out/libexec/libvirt-guests.sh substituteInPlace $out/libexec/libvirt-guests.sh \ - --replace "$out/bin" "${gettext}/bin" \ - --replace "lock/subsys" "lock" - sed -e "/gettext\.sh/a \\\n# Added in nixpkgs:\ngettext() { \"${gettext}/bin/gettext\" \"\$@\"; }" \ - -i "$out/libexec/libvirt-guests.sh" - + --replace 'ON_SHUTDOWN=suspend' 'ON_SHUTDOWN=''${ON_SHUTDOWN:-suspend}' \ + --replace "$out/bin" '${gettext}/bin' \ + --replace 'lock/subsys' 'lock' \ + --replace 'gettext.sh' 'gettext.sh + # Added in nixpkgs: + gettext() { "${gettext}/bin/gettext" "$@"; } + ' '' + optionalString stdenv.isLinux '' substituteInPlace $out/lib/systemd/system/libvirtd.service --replace /bin/kill ${coreutils}/bin/kill rm $out/lib/systemd/system/{virtlockd,virtlogd}.* wrapProgram $out/sbin/libvirtd \ - --prefix PATH : /run/libvirt/nix-emulators:${makeBinPath [ iptables iproute pmutils numad numactl ]} + --prefix PATH : /run/libvirt/nix-emulators:${makeBinPath [ iptables iproute pmutils numad numactl bridge-utils dmidecode dnsmasq ebtables ]} ''; enableParallelBuilding = true; diff --git a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix index 0ad5d09d687c..b789b133aaf3 100644 --- a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "ocaml-libvirt-${version}"; - rev = "3169af3"; - version = "0.6.1.4-rev.${rev}"; # libguestfs-1.34 needs ocaml-libvirt newer than the latest release 0.6.1.4 + rev = "bab7f84ade84ceaddb08b6948792d49b3d04b897"; + version = "0.6.1.4.2017-11-08-unstable"; # libguestfs-1.34+ needs ocaml-libvirt newer than the latest release 0.6.1.4 src = fetchgit { url = "git://git.annexia.org/git/ocaml-libvirt.git"; rev = rev; - sha256 = "0z8p6q6k42rdrvy248siq922m1yszny1hfklf6djynvk2viyqdbg"; + sha256 = "0vxgx1n58fp4qmly6i5zxiacr7303127d6j78a295xin1p3a8xcw"; }; propagatedBuildInputs = [ libvirt ]; diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix index 5dc33d2d93e1..d120c38b02cb 100644 --- a/pkgs/development/python-modules/libvirt/default.nix +++ b/pkgs/development/python-modules/libvirt/default.nix @@ -1,12 +1,13 @@ -{ stdenv, buildPythonPackage, fetchurl, python, pkgconfig, lxml, libvirt, nose }: +{ stdenv, buildPythonPackage, fetchgit, python, pkgconfig, lxml, libvirt, nose }: buildPythonPackage rec { pname = "libvirt"; - version = "3.10.0"; + version = "4.1.0"; - src = assert version == libvirt.version; fetchurl { - url = "http://libvirt.org/sources/python/${pname}-python-${version}.tar.gz"; - sha256 = "1l0fgqjnx76pzkhq540x9sf5fgzlrn0dpay90j2m4iq8nkclcbpw"; + src = assert version == libvirt.version; fetchgit { + url = git://libvirt.org/libvirt-python.git; + rev = "v${version}"; + sha256 = "0z87y6qr0ypdxfanphxl7yanisd7a0b0bwhg97kii68mig5dlw9r"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/gnulib/default.nix b/pkgs/development/tools/gnulib/default.nix index f11bb83a74ab..4ca3bf5e0741 100644 --- a/pkgs/development/tools/gnulib/default.nix +++ b/pkgs/development/tools/gnulib/default.nix @@ -1,17 +1,16 @@ { stdenv, fetchgit }: stdenv.mkDerivation { - name = "gnulib-0.1-357-gffe6467"; - - phases = ["unpackPhase" "installPhase"]; + name = "gnulib-20180226"; src = fetchgit { url = "http://git.savannah.gnu.org/r/gnulib.git"; - rev = "92b60e61666f008385d9b7f7443da17c7a44d1b1"; - sha256 = "0sa1dndvaxhw0zyc19al5cmpgzlwnnznjz89lw1b4vj3xn7avjnr"; + rev = "0bec5d56c6938c2f28417bb5fd1c4b05ea2e7d28"; + sha256 = "0sifr3bkmhyr5s6ljgfyr0fw6w49ajf11rlp1r797f3r3r6j9w4k"; }; installPhase = "mkdir -p $out; mv * $out/"; + dontFixup = true; meta = { homepage = http://www.gnu.org/software/gnulib/; |