xapian: 1.4.0 -> 1.4.4

This commit is contained in:
Peter Hoeg 2017-05-07 10:39:50 +08:00
parent 21e95c04bd
commit 994299b7a9
3 changed files with 18 additions and 12 deletions

View File

@ -1,8 +1,10 @@
{ stdenv, fetchurl, libuuid, zlib }: { stdenv, fetchurl, autoreconfHook
, libuuid, zlib }:
let let
generic = version: sha256: stdenv.mkDerivation rec { generic = version: sha256: stdenv.mkDerivation rec {
name = "xapian-${version}"; name = "xapian-${version}";
passthru = { inherit version; };
src = fetchurl { src = fetchurl {
url = "http://oligarchy.co.uk/xapian/${version}/xapian-core-${version}.tar.xz"; url = "http://oligarchy.co.uk/xapian/${version}/xapian-core-${version}.tar.xz";
@ -12,17 +14,20 @@ let
outputs = [ "out" "doc" ]; outputs = [ "out" "doc" ];
buildInputs = [ libuuid zlib ]; buildInputs = [ libuuid zlib ];
nativeBuildInputs = [ autoreconfHook ];
meta = { doCheck = true;
meta = with stdenv.lib; {
description = "Search engine library"; description = "Search engine library";
homepage = http://xapian.org/; homepage = http://xapian.org/;
license = stdenv.lib.licenses.gpl2Plus; license = licenses.gpl2Plus;
maintainers = [ stdenv.lib.maintainers.chaoflow ]; maintainers = with maintainers; [ chaoflow ];
platforms = stdenv.lib.platforms.unix; platforms = platforms.unix;
}; };
}; };
in { 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_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";
} }

View File

@ -2,14 +2,15 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "xapian-omega-${version}"; name = "xapian-omega-${version}";
version = (builtins.parseDrvName xapian.name).version; inherit (xapian) version;
src = fetchurl { src = fetchurl {
url = "http://oligarchy.co.uk/xapian/${version}/xapian-omega-${version}.tar.xz"; 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; { meta = with stdenv.lib; {
description = "Indexer and CGI search front-end built on Xapian library"; description = "Indexer and CGI search front-end built on Xapian library";

View File

@ -10311,8 +10311,8 @@ with pkgs;
x265 = callPackage ../development/libraries/x265 { }; x265 = callPackage ../development/libraries/x265 { };
inherit (callPackages ../development/libraries/xapian { }) inherit (callPackages ../development/libraries/xapian { })
xapian_1_2_22 xapian_1_4_0; xapian_1_2_22 xapian_1_4_4;
xapian = xapian_1_4_0; xapian = xapian_1_4_4;
xapian-omega = callPackage ../development/libraries/xapian/tools/omega { xapian-omega = callPackage ../development/libraries/xapian/tools/omega {
libmagic = file; libmagic = file;