From 2107c064f9e441a9917c695377a92b681bf31d81 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Oct 2022 04:18:57 +0000 Subject: [PATCH 1/3] xapian: 1.4.20 -> 1.4.21 --- pkgs/development/libraries/xapian/default.nix | 2 +- pkgs/development/libraries/xapian/tools/omega/default.nix | 2 +- pkgs/development/python-modules/xapian/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index 6d617564b04e..1a424e728079 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -41,5 +41,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/pkgs/development/libraries/xapian/tools/omega/default.nix b/pkgs/development/libraries/xapian/tools/omega/default.nix index eb03defbf2a6..a42432b1aada 100644 --- a/pkgs/development/libraries/xapian/tools/omega/default.nix +++ b/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 ]; diff --git a/pkgs/development/python-modules/xapian/default.nix b/pkgs/development/python-modules/xapian/default.nix index 752204760d4e..c108020eef13 100644 --- a/pkgs/development/python-modules/xapian/default.nix +++ b/pkgs/development/python-modules/xapian/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchurl { url = "https://oligarchy.co.uk/xapian/${version}/xapian-bindings-${version}.tar.xz"; - hash = "sha256-eGzCjQVmCyJ5VEE68OL2bk6tKgbT322rrqSERUtgHvU="; + hash = "sha256-578eSYK5H4QSidGSFAIdiDccoqbHME31kEnX2ni4PO0="; }; configureFlags = [ From c7e0d2d4debb21c0cc28a87d186c99b6b59d427c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 1 Oct 2022 04:20:00 +0000 Subject: [PATCH 2/3] xapian: add changelog to meta --- pkgs/development/libraries/xapian/default.nix | 1 + pkgs/development/libraries/xapian/tools/omega/default.nix | 1 + pkgs/development/python-modules/xapian/default.nix | 1 + 3 files changed, 3 insertions(+) diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index 1a424e728079..d8e94514da68 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -32,6 +32,7 @@ let 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; diff --git a/pkgs/development/libraries/xapian/tools/omega/default.nix b/pkgs/development/libraries/xapian/tools/omega/default.nix index a42432b1aada..65d4c520fbae 100644 --- a/pkgs/development/libraries/xapian/tools/omega/default.nix +++ b/pkgs/development/libraries/xapian/tools/omega/default.nix @@ -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; }; diff --git a/pkgs/development/python-modules/xapian/default.nix b/pkgs/development/python-modules/xapian/default.nix index c108020eef13..75f931790347 100644 --- a/pkgs/development/python-modules/xapian/default.nix +++ b/pkgs/development/python-modules/xapian/default.nix @@ -36,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python Bindings for Xapian"; homepage = "https://xapian.org/"; + changelog = "https://xapian.org/docs/xapian-bindings-${version}/NEWS"; license = licenses.gpl2Plus; maintainers = with maintainers; [ jonringer ]; }; From bdbdb2c625a6c347f70f8cfc1ffa4a4677ae2d5d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 1 Oct 2022 04:20:00 +0000 Subject: [PATCH 3/3] xapian: add mu to passthru tests --- pkgs/development/libraries/xapian/default.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index d8e94514da68..700fa1d13dd1 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/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 { @@ -29,6 +37,10 @@ let --replace "#define HAVE___EXP10 1" "#undef HAVE___EXP10" ''; + passthru.tests = { + inherit mu; + }; + meta = with lib; { description = "Search engine library"; homepage = "https://xapian.org/";