Author: eelco
Date: Thu Apr 19 21:40:07 2012
New Revision: 33850
URL: https://nixos.org/websvn/nix/?rev=33850&sc=1
Log:
* libvirt updated to 0.9.11.
Modified:
nixpkgs/trunk/pkgs/development/libraries/libarchive/default.nix
nixpkgs/trunk/pkgs/development/libraries/libvirt/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/libarchive/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/libarchive/default.nix Thu Apr
19 18:56:35 2012 (r33849)
+++ nixpkgs/trunk/pkgs/development/libraries/libarchive/default.nix Thu Apr
19 21:40:07 2012 (r33850)
@@ -1,5 +1,5 @@
-{fetchurl, stdenv, acl, openssl, libxml2, attr, zlib, bzip2, e2fsprogs
-, sharutils}:
+{ fetchurl, stdenv, acl, openssl, libxml2, attr, zlib, bzip2, e2fsprogs
+, sharutils }:
stdenv.mkDerivation rec {
name = "libarchive-2.8.3";
@@ -9,10 +9,10 @@
sha256 =
"16095d15334b3c8dbb02db5af3d415f12c1c3bdd4eb43af7bbc36ab7572c0b7a";
};
- propagatedBuildInputs = [libxml2 zlib bzip2 openssl] ++
- (if stdenv.isLinux then [e2fsprogs attr acl] else []);
+ propagatedBuildInputs = [ libxml2 zlib bzip2 openssl ] ++
+ stdenv.lib.optionals stdenv.isLinux [ e2fsprogs attr acl ];
- buildInputs = [sharutils];
+ buildInputs = [ sharutils ];
meta = {
description = "A library for reading and writing streaming archives";
Modified: nixpkgs/trunk/pkgs/development/libraries/libvirt/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/libvirt/default.nix Thu Apr
19 18:56:35 2012 (r33849)
+++ nixpkgs/trunk/pkgs/development/libraries/libvirt/default.nix Thu Apr
19 21:40:07 2012 (r33850)
@@ -1,21 +1,21 @@
{ stdenv, fetchurl, pkgconfig, libxml2, gnutls, devicemapper, perl, python
, iproute, iptables, readline, lvm2, utillinux, udev, libpciaccess, gettext
-, libtasn1, ebtables, libgcrypt
+, libtasn1, ebtables, libgcrypt, yajl
}:
-let version = "0.9.7"; in
+let version = "0.9.11"; in
stdenv.mkDerivation {
name = "libvirt-${version}";
src = fetchurl {
url = "http://libvirt.org/sources/libvirt-${version}.tar.gz";;
- sha256 = "08xg0pfjqfia37xby9187ycsxkrxaz99w9rcq206cz8pwnzhbzr9";
+ sha256 = "0qk0fsc5rxwwjp7801vdanmw61p89xqiy6q279i0kqc3bx1zx66f";
};
buildInputs =
[ pkgconfig libxml2 gnutls devicemapper perl python readline lvm2
- utillinux udev libpciaccess gettext libtasn1 libgcrypt
+ utillinux udev libpciaccess gettext libtasn1 libgcrypt yajl
];
preConfigure =
@@ -34,6 +34,8 @@
--replace "$out/bin" "${gettext}/bin"
'';
+ enableParallelBuilding = true;
+
meta = {
homepage = http://libvirt.org/;
description = "A toolkit to interact with the virtualization capabilities
of recent versions of Linux (and other OSes)";
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
