diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/xapian')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/xapian/default.nix | 21 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/libraries/xapian/tools/omega/default.nix | 3 |
2 files changed, 19 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/development/libraries/xapian/default.nix b/nixpkgs/pkgs/development/libraries/xapian/default.nix index 6d617564b04e..3c0a555dd978 100644 --- a/nixpkgs/pkgs/development/libraries/xapian/default.nix +++ b/nixpkgs/pkgs/development/libraries/xapian/default.nix @@ -1,5 +1,13 @@ -{ lib, stdenv, fetchurl, autoreconfHook -, libuuid, zlib }: +{ lib +, stdenv +, fetchurl +, autoreconfHook +, libuuid +, zlib + +# tests +, mu +}: let generic = version: hash: stdenv.mkDerivation { @@ -18,7 +26,7 @@ let nativeBuildInputs = [ autoreconfHook ]; doCheck = true; - AUTOMATED_TESTING = true; # https://trac.xapian.org/changeset/8be35f5e1/git + env.AUTOMATED_TESTING = true; # https://trac.xapian.org/changeset/8be35f5e1/git patches = lib.optionals stdenv.isDarwin [ ./skip-flaky-darwin-test.patch ]; @@ -29,9 +37,14 @@ let --replace "#define HAVE___EXP10 1" "#undef HAVE___EXP10" ''; + passthru.tests = { + inherit mu; + }; + meta = with lib; { description = "Search engine library"; homepage = "https://xapian.org/"; + changelog = "https://xapian.org/docs/xapian-core-${version}/NEWS"; license = licenses.gpl2Plus; maintainers = with maintainers; [ ]; platforms = platforms.unix; @@ -41,5 +54,5 @@ in { # 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="; + xapian_1_4 = generic "1.4.21" "sha256-gPhgNNL7VZAHlUgd+uaBv6oQ776BirrTYizcDFXgb4g="; } diff --git a/nixpkgs/pkgs/development/libraries/xapian/tools/omega/default.nix b/nixpkgs/pkgs/development/libraries/xapian/tools/omega/default.nix index eb03defbf2a6..65d4c520fbae 100644 --- a/nixpkgs/pkgs/development/libraries/xapian/tools/omega/default.nix +++ b/nixpkgs/pkgs/development/libraries/xapian/tools/omega/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://oligarchy.co.uk/xapian/${version}/xapian-omega-${version}.tar.xz"; - hash = "sha256-Cf19bGCzlP0A2EcAZJlpofzDqiuIuyxsoiD9+o0liB8="; + hash = "sha256-iKETxVmPyVgz4SEscL5GOrudVgFWTSG4YWNvc3lVqtU="; }; buildInputs = [ xapian perl pcre2 zlib libmagic ]; @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Indexer and CGI search front-end built on Xapian library"; homepage = "https://xapian.org/"; + changelog = "https://xapian.org/docs/xapian-omega-${version}/NEWS"; license = licenses.gpl2Plus; platforms = platforms.unix; }; |