xapian: 1.4.22 -> 1.4.24

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>

4 files changed, 3 insertions, 38 deletions

diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix
index 2c1dceb79d1..73c3b1b5717 100644
--- a/pkgs/development/libraries/xapian/default.nix
+++ b/pkgs/development/libraries/xapian/default.nix
@@ -28,8 +28,6 @@ let
     doCheck = true;
     env.AUTOMATED_TESTING = true; # https://trac.xapian.org/changeset/8be35f5e1/git
 
-    patches = lib.optionals stdenv.isDarwin [ ./skip-flaky-darwin-test.patch ];
-
     # the configure script thinks that Darwin has ___exp10
     # but it’s not available on my systems (or hydra apparently)
     postConfigure = lib.optionalString stdenv.isDarwin ''
@@ -54,5 +52,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.22" "sha256-BYhK8AsGcCzkhgV9YqO/vmYGz5Za2g9epXCzKKL6Hqg=";
+  xapian_1_4 = generic "1.4.24" "sha256-7aWubc9rBVOoZ2r2Sx/TBOmYzSD3eQMcyq96uaNzUxo=";
 }
diff --git a/pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch b/pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch
deleted file mode 100644
index d763a2a2b43..00000000000
--- a/pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Naur xapian-core.old/tests/api_db.cc xapian-core.new/tests/api_db.cc
---- xapian-core.old/tests/api_db.cc
-+++ xapian-core.new/tests/api_db.cc
-@@ -1020,6 +1020,7 @@
- 
- // test for keepalives
- DEFINE_TESTCASE(keepalive1, remote) {
-+    SKIP_TEST("Fails in darwin nix build environment");
-     Xapian::Database db(get_remote_database("apitest_simpledata", 5000));
- 
-     /* Test that keep-alives work */
-diff -Naur xapian-core.old/tests/api_scalability.cc xapian-core.new/tests/api_scalability.cc
---- xapian-core.old/tests/api_scalability.cc
-+++ xapian-core.new/tests/api_scalability.cc
-@@ -53,6 +53,7 @@
- }
- 
- DEFINE_TESTCASE(bigoaddvalue1, writable) {
-+    SKIP_TEST("Fails in darwin nix build environment");
-     // O(n*n) is bad, but O(n*log(n)) is acceptable.
-     test_scalability(bigoaddvalue1_helper, 5000, O_N_LOG_N);
-     return true;
-diff -Naur xapian-core.old/tests/api_serialise.cc xapian-core.new/tests/api_serialise.cc
---- xapian-core.old/tests/api_serialise.cc
-+++ xapian-core.new/tests/api_serialise.cc
-@@ -110,6 +110,7 @@
- 
- // Test for serialising a document obtained from a database.
- DEFINE_TESTCASE(serialise_document2, writable) {
-+    SKIP_TEST("Fails in darwin nix build environment");
-     Xapian::Document origdoc;
-     origdoc.add_term("foo", 2);
-     origdoc.add_posting("foo", 10);
diff --git a/pkgs/development/libraries/xapian/tools/omega/default.nix b/pkgs/development/libraries/xapian/tools/omega/default.nix
index f5ae2ecfaa5..cba74b977de 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-Z0yXn7kPH0mQ64qQntq4jKSgCUF9/Vqwy6GeAsepVSg=";
+    hash = "sha256-0IdW5PM7GJFsyKJJPTEfHL647UNXvUD6XBdErcCA6/8=";
   };
 
   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 cafc66dab9e..2daf4045497 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-a1RUgzrFKj4ywLs6cpClorUEiNiRjypFJpVX5N6aMeU=";
+    hash = "sha256-UT1XhIgnkZis4TrUl1ENKyIgTV15S2QUPQW3vpdOts8=";
   };
 
   configureFlags = [