From 84ab228a85537be8869d842ef9b33ea027b71871 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sun, 27 Oct 2019 19:25:35 +0000
Subject: [PATCH] xapian: 1.4.12 -> 1.4.13
update darwin patch
---
pkgs/development/libraries/xapian/default.nix | 2 +-
.../libraries/xapian/skip-flaky-darwin-test.patch | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix
index bb14f3437ba5..dfec2197385c 100644
--- a/pkgs/development/libraries/xapian/default.nix
+++ b/pkgs/development/libraries/xapian/default.nix
@@ -37,5 +37,5 @@ let
};
};
in {
- xapian_1_4 = generic "1.4.12" "0z5c1y9vp519h2x2igjq39v6j615nppry0wasd0xn4hphgd3d2jg";
+ xapian_1_4 = generic "1.4.13" "0z0k8902bz2ckdggikj5yz11ik2n8krmdwzvpqv60phcm3zzzy4k";
}
diff --git a/pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch b/pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch
index 72a7c3e721f4..cce96a2762bf 100644
--- a/pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch
+++ b/pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch
@@ -1,14 +1,14 @@
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
-@@ -998,6 +998,7 @@
+@@ -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));
+ XFAIL_FOR_BACKEND("multi_glass_remoteprog_glass",
+ "Multi remote databases are currently buggy");
- /* 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