diff options
author | Peter Hoeg <peter@hoeg.com> | 2017-05-07 10:39:50 +0800 |
---|---|---|
committer | Peter Hoeg <peter@hoeg.com> | 2017-05-07 10:41:30 +0800 |
commit | 994299b7a9f8ad0a03d19ab0cf74047c481b9fde (patch) | |
tree | 3d24a55071b280dc8dda9adb322253c15c08ec1c /pkgs/development/libraries/xapian | |
parent | 21e95c04bdbc45e204f385b8d8e4f0ab63cdc449 (diff) |
xapian: 1.4.0 -> 1.4.4
Diffstat (limited to 'pkgs/development/libraries/xapian')
-rw-r--r-- | pkgs/development/libraries/xapian/default.nix | 19 | ||||
-rw-r--r-- | pkgs/development/libraries/xapian/tools/omega/default.nix | 7 |
2 files changed, 16 insertions, 10 deletions
diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index e461ce858cfd4..145ebdec8e5d8 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -1,8 +1,10 @@ -{ stdenv, fetchurl, libuuid, zlib }: +{ stdenv, fetchurl, autoreconfHook +, libuuid, zlib }: let generic = version: sha256: stdenv.mkDerivation rec { name = "xapian-${version}"; + passthru = { inherit version; }; src = fetchurl { url = "http://oligarchy.co.uk/xapian/${version}/xapian-core-${version}.tar.xz"; @@ -12,17 +14,20 @@ let outputs = [ "out" "doc" ]; buildInputs = [ libuuid zlib ]; + nativeBuildInputs = [ autoreconfHook ]; - meta = { + doCheck = true; + + meta = with stdenv.lib; { description = "Search engine library"; homepage = http://xapian.org/; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.chaoflow ]; - platforms = stdenv.lib.platforms.unix; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ chaoflow ]; + platforms = platforms.unix; }; }; in { - # used by xapian-ruby + # xapian-ruby needs 1.2.22 as of 2017-05-06 xapian_1_2_22 = generic "1.2.22" "0zsji22n0s7cdnbgj0kpil05a6bgm5cfv0mvx12d8ydg7z58g6r6"; - xapian_1_4_0 = generic "1.4.0" "0xv4da5rmqqzkkkzx2v3jwh5hz5zxhd2b7m8x30fk99a25blyn0h"; + xapian_1_4_4 = generic "1.4.4" "1n9j2w2as0flih3hgim7gprfxsx6gimijs91rxsjsi8shjlqbad6"; } diff --git a/pkgs/development/libraries/xapian/tools/omega/default.nix b/pkgs/development/libraries/xapian/tools/omega/default.nix index 7c64c2e90d4e7..2923bfc1fc680 100644 --- a/pkgs/development/libraries/xapian/tools/omega/default.nix +++ b/pkgs/development/libraries/xapian/tools/omega/default.nix @@ -2,14 +2,15 @@ stdenv.mkDerivation rec { name = "xapian-omega-${version}"; - version = (builtins.parseDrvName xapian.name).version; + inherit (xapian) version; src = fetchurl { url = "http://oligarchy.co.uk/xapian/${version}/xapian-omega-${version}.tar.xz"; - sha256 = "07s341m1csk4v7mc44mqrzc1nxpnmdkji9k1cirbx6q0nlshdz0h"; + sha256 = "0pl9gs0sbavxykfgrkm8syswqnfynmmqhf8429bv8a5qjh5pkp8l"; }; - buildInputs = [ pkgconfig xapian perl pcre zlib libmagic ]; + buildInputs = [ xapian perl pcre zlib libmagic ]; + nativeBuildInputs = [ pkgconfig ]; meta = with stdenv.lib; { description = "Indexer and CGI search front-end built on Xapian library"; |