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

libvirt and pythonPackages.libvirt: 1.3.5 -> 2.0.0

Browse Source
This commit is contained in:
Rickard Nilsson 2016-07-02 00:24:05 +02:00
parent 0c0f068f35
commit 5356154366
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,11 +9,11 @@
# 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}";
version = "1.3.5"; version = "2.0.0";
src = fetchurl { src = fetchurl {
url = "http://libvirt.org/sources/${name}.tar.gz"; url = "http://libvirt.org/sources/${name}.tar.xz";
sha256 = "1j2ar5gb6xcyw1mlpm0mfpiri6www9k5myaqjina87a3xd23r8lk"; sha256 = "1jwszhpjn09zkqji8w1x97rw0wqcl71ll2y6vp056fb1bvshms8h";
}; };
patches = [ ./build-on-bsd.patch ]; patches = [ ./build-on-bsd.patch ];
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
libxslt xhtml1 perlPackages.XMLXPath curl libpcap libxslt xhtml1 perlPackages.XMLXPath curl libpcap
] ++ stdenv.lib.optionals stdenv.isLinux [ ] ++ stdenv.lib.optionals stdenv.isLinux [
libpciaccess devicemapper lvm2 utillinux systemd.udev.lib libcap_ng libpciaccess devicemapper lvm2 utillinux systemd.udev.lib libcap_ng
libnl numad numactl xen zfs systemd libnl numad numactl xen zfs
] ++ stdenv.lib.optionals stdenv.isDarwin [ ] ++ stdenv.lib.optionals stdenv.isDarwin [
libiconv gmp libiconv gmp
]; ];
@ -33,8 +33,7 @@ stdenv.mkDerivation rec {
preConfigure = stdenv.lib.optionalString stdenv.isLinux '' preConfigure = stdenv.lib.optionalString stdenv.isLinux ''
PATH=${iproute}/sbin:${iptables}/sbin:${ebtables}/sbin:${lvm2}/sbin:${systemd.udev.bin}/bin:$PATH PATH=${iproute}/sbin:${iptables}/sbin:${ebtables}/sbin:${lvm2}/sbin:${systemd.udev.bin}/bin:$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"'
--replace libsystemd-daemon libsystemd
'' + '' '' + ''
PATH=${dnsmasq}/bin:$PATH PATH=${dnsmasq}/bin:$PATH
patchShebangs . # fixes /usr/bin/python references patchShebangs . # fixes /usr/bin/python references
@ -55,7 +54,6 @@ stdenv.mkDerivation rec {
"--with-virtualport" "--with-virtualport"
"--with-init-script=redhat" "--with-init-script=redhat"
"--with-storage-zfs" "--with-storage-zfs"
"--with-systemd-daemon"
] ++ stdenv.lib.optionals stdenv.isDarwin [ ] ++ stdenv.lib.optionals stdenv.isDarwin [
"--with-init-script=none" "--with-init-script=none"
]; ];

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

@ -25600,13 +25600,13 @@ in modules // {
}; };
libvirt = let libvirt = let
version = "1.3.5"; version = "2.0.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 = "1hm5dzrv03m77026xccxiiq6abqpzci277gvhhsqmlbzcdbqll50"; sha256 = "0h0x5lpsx97bvw20pzfcsdmmivximddq4qmn8fk0n55dqv0wn5kq";
}; };
buildInputs = with self; [ python pkgs.pkgconfig pkgs.libvirt lxml ]; buildInputs = with self; [ python pkgs.pkgconfig pkgs.libvirt lxml ];