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

* libvirt updated to 0.9.11.

Browse Source 
svn path=/nixpkgs/trunk/; revision=33850
This commit is contained in:
Eelco Dolstra 2012-04-19 21:40:07 +00:00
parent 9aa30ba705
commit e24547ab88
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/libraries/libarchive/default.nix
View File

@ -1,5 +1,5 @@
{fetchurl, stdenv, acl, openssl, libxml2, attr, zlib, bzip2, e2fsprogs { fetchurl, stdenv, acl, openssl, libxml2, attr, zlib, bzip2, e2fsprogs
, sharutils}: , sharutils }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libarchive-2.8.3"; name = "libarchive-2.8.3";
@ -9,10 +9,10 @@ stdenv.mkDerivation rec {
sha256 = "16095d15334b3c8dbb02db5af3d415f12c1c3bdd4eb43af7bbc36ab7572c0b7a"; sha256 = "16095d15334b3c8dbb02db5af3d415f12c1c3bdd4eb43af7bbc36ab7572c0b7a";
}; };
propagatedBuildInputs = [libxml2 zlib bzip2 openssl] ++ propagatedBuildInputs = [ libxml2 zlib bzip2 openssl ] ++
(if stdenv.isLinux then [e2fsprogs attr acl] else []); stdenv.lib.optionals stdenv.isLinux [ e2fsprogs attr acl ];
buildInputs = [sharutils]; buildInputs = [ sharutils ];
meta = { meta = {
description = "A library for reading and writing streaming archives"; description = "A library for reading and writing streaming archives";

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

@ -1,21 +1,21 @@
{ stdenv, fetchurl, pkgconfig, libxml2, gnutls, devicemapper, perl, python { stdenv, fetchurl, pkgconfig, libxml2, gnutls, devicemapper, perl, python
, iproute, iptables, readline, lvm2, utillinux, udev, libpciaccess, gettext , 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 { stdenv.mkDerivation {
name = "libvirt-${version}"; name = "libvirt-${version}";
src = fetchurl { src = fetchurl {
url = "http://libvirt.org/sources/libvirt-${version}.tar.gz"; url = "http://libvirt.org/sources/libvirt-${version}.tar.gz";
sha256 = "08xg0pfjqfia37xby9187ycsxkrxaz99w9rcq206cz8pwnzhbzr9"; sha256 = "0qk0fsc5rxwwjp7801vdanmw61p89xqiy6q279i0kqc3bx1zx66f";
}; };
buildInputs = buildInputs =
[ pkgconfig libxml2 gnutls devicemapper perl python readline lvm2 [ pkgconfig libxml2 gnutls devicemapper perl python readline lvm2
utillinux udev libpciaccess gettext libtasn1 libgcrypt utillinux udev libpciaccess gettext libtasn1 libgcrypt yajl
]; ];
preConfigure = preConfigure =
@ -34,6 +34,8 @@ stdenv.mkDerivation {
--replace "$out/bin" "${gettext}/bin" --replace "$out/bin" "${gettext}/bin"
''; '';
enableParallelBuilding = true;
meta = { meta = {
homepage = http://libvirt.org/; homepage = http://libvirt.org/;
description = "A toolkit to interact with the virtualization capabilities of recent versions of Linux (and other OSes)"; description = "A toolkit to interact with the virtualization capabilities of recent versions of Linux (and other OSes)";