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

Merge pull request #181467 from chvp/bump-xapian

Browse source 
xapian: 1.4.19 -> 1.4.20
This commit is contained in:
Sandro 2022-07-15 21:46:20 +02:00 committed by GitHub
parent 75baa28736 e1c0a925e0
commit 6db6e0ca3f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,14 +2,14 @@
, libuuid, zlib }:
let
generic = version: sha256: stdenv.mkDerivation {
generic = version: hash: stdenv.mkDerivation {
pname = "xapian";
inherit version;
passthru = { inherit version; };
src = fetchurl {
url = "https://oligarchy.co.uk/xapian/${version}/xapian-core-${version}.tar.xz";
inherit sha256;
inherit hash;
};
outputs = [ "out" "man" "doc" ];
@ -38,5 +38,8 @@ let
};
};
in {
xapian_1_4 = generic "1.4.19" "sha256-H8pI/KbMNSbMS6k90ZT+nBMmhXt47c+zfmjQhtcUqcM=";
# Don't forget to change the hashes in xapian-omega and
# python3Packages.xapian. They inherit the version from this package, and
# should always be built with the equivalent xapian version.
xapian_1_4 = generic "1.4.20" "sha256-zivl7/cgdcgQbANA5wsQk9vOviq0LcHBvgjdOtQZRC0=";
}

6
pkgs/development/libraries/xapian/tools/omega/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkg-config, xapian, perl, pcre, zlib, libmagic }:
{ lib, stdenv, fetchurl, pkg-config, xapian, perl, pcre2, zlib, libmagic }:
stdenv.mkDerivation rec {
pname = "xapian-omega";
@ -6,10 +6,10 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://oligarchy.co.uk/xapian/${version}/xapian-omega-${version}.tar.xz";
sha256 = "0zji8ckp4h5xdy2wbir3lvk680w1g1l4h5swmaxsx7ah12lkrjcr";
hash = "sha256-Cf19bGCzlP0A2EcAZJlpofzDqiuIuyxsoiD9+o0liB8=";
};
buildInputs = [ xapian perl pcre zlib libmagic ];
buildInputs = [ xapian perl pcre2 zlib libmagic ];
nativeBuildInputs = [ pkg-config ];
meta = with lib; {

2
pkgs/development/python-modules/xapian/default.nix
View file

@ -13,7 +13,7 @@ buildPythonPackage rec {
src = fetchurl {
url = "https://oligarchy.co.uk/xapian/${version}/xapian-bindings-${version}.tar.xz";
sha256 = "0j9awiiw9zf97r60m848absq43k37gghpyw7acxqjazfzd71fxvm";
hash = "sha256-eGzCjQVmCyJ5VEE68OL2bk6tKgbT322rrqSERUtgHvU=";
};
configureFlags = [