diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2008-02-18 20:52:40 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2008-02-18 20:52:40 +0000 |
commit | 0b2d4935215bae41df407516f5d48bfa448207a1 (patch) | |
tree | 0d34e553b98871b039ee808949c9f5df6b14b47b | |
parent | 8ea549b319c2d96ac26276bce2927400ee4e9fa0 (diff) | |
download | nixpkgs-0b2d4935215bae41df407516f5d48bfa448207a1.tar nixpkgs-0b2d4935215bae41df407516f5d48bfa448207a1.tar.gz nixpkgs-0b2d4935215bae41df407516f5d48bfa448207a1.tar.bz2 nixpkgs-0b2d4935215bae41df407516f5d48bfa448207a1.tar.lz nixpkgs-0b2d4935215bae41df407516f5d48bfa448207a1.tar.xz nixpkgs-0b2d4935215bae41df407516f5d48bfa448207a1.tar.zst nixpkgs-0b2d4935215bae41df407516f5d48bfa448207a1.zip |
libarchive: 2.4.12 added
svn path=/nixpkgs/branches/stdenv-updates/; revision=10745
-rw-r--r-- | pkgs/development/libraries/libarchive/2.4.11.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/libarchive/2.4.12.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/libarchive/common.nix | 18 | ||||
-rw-r--r-- | pkgs/development/libraries/libarchive/default.nix | 15 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
5 files changed, 24 insertions, 17 deletions
diff --git a/pkgs/development/libraries/libarchive/2.4.11.nix b/pkgs/development/libraries/libarchive/2.4.11.nix new file mode 100644 index 00000000000..e75d59ec18a --- /dev/null +++ b/pkgs/development/libraries/libarchive/2.4.11.nix @@ -0,0 +1,2 @@ +args: +import ./common.nix "1iq5hs4hbqyl6sqiqlaj3j89vpfqx6zv974c965nxjvmwy816dbz" args diff --git a/pkgs/development/libraries/libarchive/2.4.12.nix b/pkgs/development/libraries/libarchive/2.4.12.nix new file mode 100644 index 00000000000..9765ec61cd7 --- /dev/null +++ b/pkgs/development/libraries/libarchive/2.4.12.nix @@ -0,0 +1,2 @@ +args: +import ./common.nix "133kxx1wfangrhy6rcpqlqib7i45qxj8pcp3i9n574cwfx41swy4" args diff --git a/pkgs/development/libraries/libarchive/common.nix b/pkgs/development/libraries/libarchive/common.nix new file mode 100644 index 00000000000..9f031e4f2c2 --- /dev/null +++ b/pkgs/development/libraries/libarchive/common.nix @@ -0,0 +1,18 @@ +sha256: args: with args; +stdenv.mkDerivation rec { + name = "libarchive-" + version; + + src = fetchurl { + url = "${meta.homepage}/src/${name}.tar.gz"; + inherit sha256; + }; + + propagatedBuildInputs = [zlib bzip2 e2fsprogs]; + buildInputs = [sharutils]; + configureFlags = "--enable-shared --disable-static"; + + meta = { + description = "A library for reading and writing streaming archives"; + homepage = http://people.freebsd.org/~kientzle/libarchive; + }; +} diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix deleted file mode 100644 index c7dc2b39389..00000000000 --- a/pkgs/development/libraries/libarchive/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -args: with args; -stdenv.mkDerivation rec { - name = "libarchive-2.4.11"; - - src = fetchurl { - url = "http://FIXME_dont_remember/${name}.tar.gz"; - sha256 = "1iq5hs4hbqyl6sqiqlaj3j89vpfqx6zv974c965nxjvmwy816dbz"; - }; - - buildInputs = [zlib]; - - meta = { - description = "A library for reading and writing streaming archives"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0942ae4c0bd..de817774068 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2164,8 +2164,8 @@ rec { inherit fetchurl stdenv; }; - libarchive = import ../development/libraries/libarchive { - inherit fetchurl stdenv zlib; + libarchive = selectVersion ../development/libraries/libarchive "2.4.12" { + inherit fetchurl stdenv zlib bzip2 e2fsprogs sharutils; }; libassuan = import ../development/libraries/libassuan { |