Merge pull request #81195 from r-ryantm/auto-update/xapian

xapian: 1.4.14 -> 1.4.15
This commit is contained in:
Mario Rodas 2020-02-28 05:12:22 -05:00 committed by GitHub
commit e6f350ced3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

View file

@ -30,12 +30,12 @@ let
meta = with stdenv.lib; {
description = "Search engine library";
homepage = https://xapian.org/;
homepage = "https://xapian.org/";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ ];
platforms = platforms.unix;
};
};
in {
xapian_1_4 = generic "1.4.14" "0ja95vn0lkf6qkjhg2blkx306i10hg4fr8wlrhalmly93307lnlp";
xapian_1_4 = generic "1.4.15" "1sjhz6vgql801rdgl6vrsjj0vy1mwlkcxjx6nr7h27m031cyjs5i";
}

View file

@ -6,9 +6,9 @@ diff -Naur xapian-core.old/tests/api_db.cc xapian-core.new/tests/api_db.cc
// test for keepalives
DEFINE_TESTCASE(keepalive1, remote) {
+ SKIP_TEST("Fails in darwin nix build environment");
XFAIL_FOR_BACKEND("multi_glass_remoteprog_glass",
"Multi remote databases are currently buggy");
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