alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #18257 from oxij/update/xapian-1.4.0

Browse source 
xapian*: 1.2.* -> 1.4.0
This commit is contained in:
Joachim F 2016-09-03 17:25:23 +02:00 committed by GitHub
parent cc3aa1b750 6cd407de28
commit e29582271f
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/libraries/xapian/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "xapian-${version}";
version = "1.2.23";
version = "1.4.0";
src = fetchurl {
url = "http://oligarchy.co.uk/xapian/${version}/xapian-core-${version}.tar.xz";
sha256 = "0z9lhvfaazzmd611bnii9a0d19sqnjs0s9vbcgjhcv8s9spax0wp";
sha256 = "0xv4da5rmqqzkkkzx2v3jwh5hz5zxhd2b7m8x30fk99a25blyn0h";
};
outputs = [ "out" "doc" ];

8
pkgs/tools/misc/xapian-omega/default.nix
View file

@ -1,15 +1,15 @@
{ stdenv, fetchurl, pkgconfig, xapian, perl, pcre, zlib }:
{ stdenv, fetchurl, pkgconfig, xapian, perl, pcre, zlib, libmagic }:
stdenv.mkDerivation rec {
name = "xapian-omega-${version}";
version = "1.2.21";
version = "1.4.0";
src = fetchurl {
url = "http://oligarchy.co.uk/xapian/${version}/xapian-omega-${version}.tar.xz";
sha256 = "0zjjr4ypanwrjkcpgi37d72v2jjcfwnw8lgddv0i7z2jf1fklbc6";
sha256 = "07s341m1csk4v7mc44mqrzc1nxpnmdkji9k1cirbx6q0nlshdz0h";
};
buildInputs = [ pkgconfig xapian perl pcre zlib ];
buildInputs = [ pkgconfig xapian perl pcre zlib libmagic ];
meta = with stdenv.lib; {
description = "Indexer and CGI search front-end built on Xapian library";

4
pkgs/top-level/all-packages.nix
View file

@ -9802,7 +9802,9 @@ in
php = php56;
};
xapian-omega = callPackage ../tools/misc/xapian-omega {};
xapian-omega = callPackage ../tools/misc/xapian-omega {
libmagic = file;
};
xavs = callPackage ../development/libraries/xavs { };