libvirt: 3.10.0 -> 4.1.0
This commit is contained in:
volth
parent
62bcd3b02e
commit
632e9e62c8
@ -119,18 +119,10 @@ in {
|
||||
after = [ "systemd-udev-settle.service" ]
|
||||
++ optional vswitch.enable "vswitchd.service";
|
||||
|
||||
environment = {
|
||||
LIBVIRTD_ARGS = ''--config "${configFile}" ${concatStringsSep " " cfg.extraOptions}'';
|
||||
};
|
||||
environment.LIBVIRTD_ARGS = ''--config "${configFile}" ${concatStringsSep " " cfg.extraOptions}'';
|
||||
|
||||
path = with pkgs; [
|
||||
bridge-utils
|
||||
dmidecode
|
||||
dnsmasq
|
||||
ebtables
|
||||
cfg.qemuPackage # libvirtd requires qemu-img to manage disk images
|
||||
]
|
||||
++ optional vswitch.enable vswitch.package;
|
||||
path = [ cfg.qemuPackage ] # libvirtd requires qemu-img to manage disk images
|
||||
++ optional vswitch.enable vswitch.package;
|
||||
|
||||
preStart = ''
|
||||
mkdir -p /var/log/libvirt/qemu -m 755
|
||||
|
||||
@ -1,14 +1,16 @@
|
||||
{ stdenv, fetchurl, ocamlPackages }:
|
||||
{ stdenv, fetchgit, ocamlPackages, autoreconfHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "virt-top-${version}";
|
||||
version = "1.0.8";
|
||||
version = "2017-11-18-unstable";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://people.redhat.com/~rjones/virt-top/files/virt-top-${version}.tar.gz";
|
||||
sha256 = "04i1sf2d3ghilmzvr2vh74qcy009iifyc2ymj9kxnbkp97lrz13w";
|
||||
src = fetchgit {
|
||||
url = git://git.annexia.org/git/virt-top.git;
|
||||
rev = "18a751d8c26548bb090ff05e30ccda3092e3373b";
|
||||
sha256 = "0c4whjvw7p3yvd476i4ppdhi8j821r5y6caqrj2v9dc181cnp01i";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
buildInputs = with ocamlPackages; [ ocaml findlib ocaml_extlib ocaml_libvirt ocaml_gettext curses csv xml-light ];
|
||||
|
||||
buildPhase = "make opt";
|
||||
|
||||
@ -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)
|
||||
{
|
||||
@ -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 = false;
|
||||
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 [ iproute iptables ebtables lvm2 systemd numad dnsmasq ]}:$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;
|
||||
|
||||
@ -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 ];
|
||||
|
||||
@ -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 ];
|
||||
|
||||
@ -17944,9 +17944,7 @@ with pkgs;
|
||||
|
||||
virt-viewer = callPackage ../applications/virtualization/virt-viewer { };
|
||||
|
||||
virt-top = callPackage ../applications/virtualization/virt-top {
|
||||
ocamlPackages = ocamlPackages_4_01_0;
|
||||
};
|
||||
virt-top = callPackage ../applications/virtualization/virt-top { };
|
||||
|
||||
virt-what = callPackage ../applications/virtualization/virt-what { };
|
||||
|
||||
|
||||
@ -13172,10 +13172,12 @@ let self = _self // overrides; _self = with self; {
|
||||
};
|
||||
|
||||
SysVirt = buildPerlPackage rec {
|
||||
name = "Sys-Virt-1.2.19";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/D/DA/DANBERR/${name}.tar.gz";
|
||||
sha256 = "18v8x0514in0zpvq1rv78hmvhpij1xjh5xn0wa6wmg2swky54sp4";
|
||||
version = "4.1.0";
|
||||
name = "Sys-Virt-${version}";
|
||||
src = assert version == pkgs.libvirt.version; pkgs.fetchgit {
|
||||
url = git://libvirt.org/libvirt-perl.git;
|
||||
rev = "v${version}";
|
||||
sha256 = "0m0snv6gqh97nh1c31qvbm4sdzp49vixn7w3r69h6a5r71sn78x4";
|
||||
};
|
||||
propagatedBuildInputs = [XMLXPath];
|
||||
nativeBuildInputs = [ pkgs.pkgconfig ];
|
||||
|
||||
Loading…
Reference in New Issue
Block a user