diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2014-11-03 16:04:28 +0300 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2014-11-03 16:54:39 +0300 |
| commit | 063ee531906043967e611d35d28dc454270df8b7 (patch) | |
| tree | 9cbab5fa3ad4695fa973ff02c5d1d0c88aa478c2 /pkgs | |
| parent | 6707d9e8c36ab832238bb965cc66e6cf0aedc0a9 (diff) | |
| download | nixpkgs-063ee531906043967e611d35d28dc454270df8b7.tar nixpkgs-063ee531906043967e611d35d28dc454270df8b7.tar.gz nixpkgs-063ee531906043967e611d35d28dc454270df8b7.tar.bz2 nixpkgs-063ee531906043967e611d35d28dc454270df8b7.tar.lz nixpkgs-063ee531906043967e611d35d28dc454270df8b7.tar.xz nixpkgs-063ee531906043967e611d35d28dc454270df8b7.tar.zst nixpkgs-063ee531906043967e611d35d28dc454270df8b7.zip | |
Update afflib
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/afflib/default.nix | 26 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 23 insertions, 7 deletions
diff --git a/pkgs/development/libraries/afflib/default.nix b/pkgs/development/libraries/afflib/default.nix index ed88b89b14e..d29349abe0c 100644 --- a/pkgs/development/libraries/afflib/default.nix +++ b/pkgs/development/libraries/afflib/default.nix @@ -1,15 +1,29 @@ -{ stdenv, fetchurl, zlib, curl, expat, fuse, openssl }: +{ stdenv, fetchgit, zlib, curl, expat, fuse, openssl +, autoconf, automake, libtool, python +}: stdenv.mkDerivation rec { - version = "3.7.4"; + version = "3.7.5"; name = "afflib-${version}"; - src = fetchurl { - url = "http://digitalcorpora.org/downloads/afflib/${name}.tar.gz"; - sha256 = "18j1gjb31qjcmz6lry4m2d933w2a80iagg9g5vrpw5ig80lv10f8"; + src = fetchgit { + url = "https://github.com/sshock/AFFLIBv3/"; + rev = "refs/tags/v${version}"; + sha256 = "06dr3y6bd7vfjf0p9v85yp1xzg43x515zsa9587jcx7yy5h5ams5"; + name = "afflib-${version}-checkout"; }; - buildInputs = [ zlib curl expat fuse openssl ]; + buildInputs = [ zlib curl expat fuse openssl + libtool autoconf automake python + ]; + + preConfigure = '' + libtoolize -f + autoheader -f + aclocal + automake --add-missing -c + autoconf -f + ''; meta = { homepage = http://afflib.sourceforge.net/; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f9483a5662f..7657927a45d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4768,7 +4768,9 @@ let adns = callPackage ../development/libraries/adns { }; - afflib = callPackage ../development/libraries/afflib {}; + afflib = callPackage ../development/libraries/afflib { + automake = automake114x; + }; agg = callPackage ../development/libraries/agg { }; |