diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2010-04-01 18:50:43 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2010-04-01 18:50:43 +0000 |
| commit | c3e38d11f0937e61dba673e369b333b7e08921af (patch) | |
| tree | 05df23e7584a0f022e07992c732188942aa0704e | |
| parent | 4a6cfd435e9ef9a0ac6871fcf9d4b02a7fdfaefa (diff) | |
| download | nixlib-c3e38d11f0937e61dba673e369b333b7e08921af.tar nixlib-c3e38d11f0937e61dba673e369b333b7e08921af.tar.gz nixlib-c3e38d11f0937e61dba673e369b333b7e08921af.tar.bz2 nixlib-c3e38d11f0937e61dba673e369b333b7e08921af.tar.lz nixlib-c3e38d11f0937e61dba673e369b333b7e08921af.tar.xz nixlib-c3e38d11f0937e61dba673e369b333b7e08921af.tar.zst nixlib-c3e38d11f0937e61dba673e369b333b7e08921af.zip | |
Bump libarchive to 2.8.3
Fixes kdeutils-4.4.2 compilation svn path=/nixpkgs/trunk/; revision=20922
| -rw-r--r-- | pkgs/development/libraries/libarchive/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
2 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index 744554c338f6..9782948ba53a 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -1,14 +1,15 @@ -{fetchurl, stdenv, zlib, bzip2, e2fsprogs, sharutils}: +{fetchurl, stdenv, acl, openssl, libxml2, attr, zlib, bzip2, xz, e2fsprogs +, sharutils}: stdenv.mkDerivation rec { - name = "libarchive-2.4.12"; + name = "libarchive-2.8.3"; src = fetchurl { - url = "${meta.homepage}/src/${name}.tar.gz"; - sha256 = "133kxx1wfangrhy6rcpqlqib7i45qxj8pcp3i9n574cwfx41swy4"; + url = "http://libarchive.googlecode.com/files/${name}.tar.gz"; + sha256 = "16095d15334b3c8dbb02db5af3d415f12c1c3bdd4eb43af7bbc36ab7572c0b7a"; }; - propagatedBuildInputs = [zlib bzip2 e2fsprogs]; + propagatedBuildInputs = [acl libxml2 zlib bzip2 e2fsprogs xz attr openssl]; buildInputs = [sharutils]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 993fba544315..275c5a9f7069 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4133,7 +4133,8 @@ let }; libarchive = import ../development/libraries/libarchive { - inherit fetchurl stdenv zlib bzip2 e2fsprogs sharutils; + inherit fetchurl stdenv acl zlib bzip2 e2fsprogs xz sharutils libxml2 + openssl attr; }; libassuan = import ../development/libraries/libassuan { |