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

libvirt: 3.0.0 -> 3.1.0

This commit is contained in:
Volth 2017-03-23 15:26:37 -05:00 committed by Franz Pletz
parent a9172891d9
commit 1cca97cf18
No known key found for this signature in database
GPG Key ID: 846FDED7792617B4
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,6 +6,9 @@
, dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages
, curl, libiconv, gmp, xen, zfs , curl, libiconv, gmp, xen, zfs
}: }:
with stdenv.lib;
# if you update, also bump pythonPackages.libvirt or it will break # if you update, also bump pythonPackages.libvirt or it will break
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libvirt-${version}"; name = "libvirt-${version}";
@ -23,14 +26,14 @@ stdenv.mkDerivation rec {
libxml2 gnutls perl python2 readline libxml2 gnutls perl python2 readline
gettext libtasn1 libgcrypt yajl gettext libtasn1 libgcrypt yajl
libxslt xhtml1 perlPackages.XMLXPath curl libpcap libxslt xhtml1 perlPackages.XMLXPath curl libpcap
] ++ stdenv.lib.optionals stdenv.isLinux [ ] ++ optionals stdenv.isLinux [
libpciaccess devicemapper lvm2 utillinux systemd libcap_ng libpciaccess devicemapper lvm2 utillinux systemd libcap_ng
libnl numad numactl xen zfs libnl numad numactl xen zfs
] ++ stdenv.lib.optionals stdenv.isDarwin [ ] ++ optionals stdenv.isDarwin [
libiconv gmp libiconv gmp
]; ];
preConfigure = stdenv.lib.optionalString stdenv.isLinux '' preConfigure = optionalString stdenv.isLinux ''
PATH=${stdenv.lib.makeBinPath [ iproute iptables ebtables lvm2 systemd ]}:$PATH PATH=${stdenv.lib.makeBinPath [ iproute iptables ebtables lvm2 systemd ]}:$PATH
substituteInPlace configure \ substituteInPlace configure \
--replace 'as_dummy="/bin:/usr/bin:/usr/sbin"' 'as_dummy="${numad}/bin"' --replace 'as_dummy="/bin:/usr/bin:/usr/sbin"' 'as_dummy="${numad}/bin"'
@ -48,13 +51,13 @@ stdenv.mkDerivation rec {
"--with-test" "--with-test"
"--with-esx" "--with-esx"
"--with-remote" "--with-remote"
] ++ stdenv.lib.optionals stdenv.isLinux [ ] ++ optionals stdenv.isLinux [
"--with-numad" "--with-numad"
"--with-macvtap" "--with-macvtap"
"--with-virtualport" "--with-virtualport"
"--with-init-script=redhat" "--with-init-script=redhat"
"--with-storage-zfs" "--with-storage-zfs"
] ++ stdenv.lib.optionals stdenv.isDarwin [ ] ++ optionals stdenv.isDarwin [
"--with-init-script=none" "--with-init-script=none"
]; ];
@ -67,16 +70,16 @@ stdenv.mkDerivation rec {
sed -i 's/ON_SHUTDOWN=suspend/ON_SHUTDOWN=''${ON_SHUTDOWN:-suspend}/' $out/libexec/libvirt-guests.sh sed -i 's/ON_SHUTDOWN=suspend/ON_SHUTDOWN=''${ON_SHUTDOWN:-suspend}/' $out/libexec/libvirt-guests.sh
substituteInPlace $out/libexec/libvirt-guests.sh \ substituteInPlace $out/libexec/libvirt-guests.sh \
--replace "$out/bin" "${gettext}/bin" --replace "$out/bin" "${gettext}/bin"
'' + stdenv.lib.optionalString stdenv.isLinux '' '' + optionalString stdenv.isLinux ''
wrapProgram $out/sbin/libvirtd \ wrapProgram $out/sbin/libvirtd \
--prefix PATH : ${stdenv.lib.makeBinPath [ iptables iproute pmutils numad numactl ]} --prefix PATH : ${makeBinPath [ iptables iproute pmutils numad numactl ]}
''; '';
enableParallelBuilding = true; enableParallelBuilding = true;
NIX_CFLAGS_COMPILE = "-fno-stack-protector"; NIX_CFLAGS_COMPILE = "-fno-stack-protector";
meta = with stdenv.lib; { meta = {
homepage = http://libvirt.org/; homepage = http://libvirt.org/;
repositories.git = git://libvirt.org/libvirt.git; repositories.git = git://libvirt.org/libvirt.git;
description = '' description = ''

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

@ -29067,13 +29067,13 @@ EOF
}; };
libvirt = let libvirt = let
version = "3.0.0"; version = "3.1.0";
in assert version == pkgs.libvirt.version; pkgs.stdenv.mkDerivation rec { in assert version == pkgs.libvirt.version; pkgs.stdenv.mkDerivation rec {
name = "libvirt-python-${version}"; name = "libvirt-python-${version}";
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "http://libvirt.org/sources/python/${name}.tar.gz"; url = "http://libvirt.org/sources/python/${name}.tar.gz";
sha256 = "1ha4bqf029si1lla1z7ca786w571fh3wfs4h7zaglfk4gb2w39wl"; sha256 = "06524dhm27fjfnmr5bqdxlmm1g9ixvzaaq572hgyy5dqwfn64spk";
}; };
buildInputs = with self; [ python pkgs.pkgconfig pkgs.libvirt lxml ]; buildInputs = with self; [ python pkgs.pkgconfig pkgs.libvirt lxml ];