Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4641f957913f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 17b02efd1bdf
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Oct 27, 2019

  1. xapian: 1.4.12 -> 1.4.13 

    update darwin patch
    @risicle
    risicle committed Oct 27, 2019
    Copy the full SHA
    84ab228 View commit details

Commits on Oct 28, 2019

  1. Merge pull request #72118 from risicle/ris-xapian-1.4.13 

    xapian: 1.4.12 -> 1.4.13
    @marsam
    marsam authored Oct 28, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    17b02ef View commit details
Showing with 4 additions and 4 deletions.
  1. +1 −1 pkgs/development/libraries/xapian/default.nix
  2. +3 −3 pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch
2 changes: 1 addition & 1 deletion pkgs/development/libraries/xapian/default.nix
View file
Original file line number Diff line number Diff line change
@@ -37,5 +37,5 @@ let
};
};
in {
xapian_1_4 = generic "1.4.12" "0z5c1y9vp519h2x2igjq39v6j615nppry0wasd0xn4hphgd3d2jg";
xapian_1_4 = generic "1.4.13" "0z0k8902bz2ckdggikj5yz11ik2n8krmdwzvpqv60phcm3zzzy4k";
}
6 changes: 3 additions & 3 deletions pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch
View file
Original file line number Diff line number Diff line change
@@ -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