diff options
author | Alyssa Ross <hi@alyssa.is> | 2020-04-01 15:50:50 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-04-01 15:50:50 +0000 |
commit | 75eafe97f7df0d653bec67f3962214d7c357831f (patch) | |
tree | 09f2cc901e0e637876cbb78d192dfe2fcfef8156 /nixpkgs/pkgs/development/libraries/xapian | |
parent | a53b121bf4331497da63df3b1b7f1a7897dad146 (diff) | |
parent | a2e06fc3423c4be53181b15c28dfbe0bcf67dd73 (diff) | |
download | nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.gz nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.bz2 nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.lz nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.xz nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.zst nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.zip |
Merge commit 'a2e06fc3423c4be53181b15c28dfbe0bcf67dd73'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/xapian')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/xapian/default.nix | 4 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/libraries/xapian/default.nix b/nixpkgs/pkgs/development/libraries/xapian/default.nix index 971ab485221d..ef50bf31a367 100644 --- a/nixpkgs/pkgs/development/libraries/xapian/default.nix +++ b/nixpkgs/pkgs/development/libraries/xapian/default.nix @@ -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"; } diff --git a/nixpkgs/pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch b/nixpkgs/pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch index cce96a2762bf..d763a2a2b434 100644 --- a/nixpkgs/pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch +++ b/nixpkgs/pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch @@ -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 |