git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #72118 from risicle/ris-xapian-1.4.13

xapian: 1.4.12 -> 1.4.13

commit17b02efd1bdf911914f4799bf3530c8ed3e9b878 authorMario Rodas <marsam@users.noreply.github.com> dateSun 27 Oct 2019, 20:14 (7 years ago) parent4641f9584ab228
2 files changed+4−4
pkgs/development/libraries/xapian/default.nix+1−1 pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch+3−3
pkgs/development/libraries/xapian/default.nix+1−1
@@ -37,5 +37,5 @@ let
3737 };
3838 };
3939in {
40− xapian_1_4 = generic "1.4.12" "0z5c1y9vp519h2x2igjq39v6j615nppry0wasd0xn4hphgd3d2jg";
40+ xapian_1_4 = generic "1.4.13" "0z0k8902bz2ckdggikj5yz11ik2n8krmdwzvpqv60phcm3zzzy4k";
4141}
pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch+3−3
@@ -1,14 +1,14 @@
11diff -Naur xapian-core.old/tests/api_db.cc xapian-core.new/tests/api_db.cc
22--- xapian-core.old/tests/api_db.cc
33+++ xapian-core.new/tests/api_db.cc
4−@@ -998,6 +998,7 @@
4+@@ -1020,6 +1020,7 @@
55
66 // test for keepalives
77 DEFINE_TESTCASE(keepalive1, remote) {
88+ SKIP_TEST("Fails in darwin nix build environment");
9− Xapian::Database db(get_remote_database("apitest_simpledata", 5000));
9+ XFAIL_FOR_BACKEND("multi_glass_remoteprog_glass",
10+ "Multi remote databases are currently buggy");
1011
11− /* Test that keep-alives work */
1212diff -Naur xapian-core.old/tests/api_scalability.cc xapian-core.new/tests/api_scalability.cc
1313--- xapian-core.old/tests/api_scalability.cc
1414+++ xapian-core.new/tests/api_scalability.cc