From d7007c2ea0b0d02bd0029667600f4fbe7bd402cf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 3 Jul 2018 13:13:22 -0700 Subject: [PATCH 1/3] xapian: 1.4.5 -> 1.4.6 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/xapian/versions. These checks were done: - built on NixOS - /nix/store/aj2mvy243pd40qm07xain7psfz2ql9jp-xapian-1.4.6/bin/xapian-delve passed the binary check. - /nix/store/aj2mvy243pd40qm07xain7psfz2ql9jp-xapian-1.4.6/bin/xapian-check passed the binary check. - /nix/store/aj2mvy243pd40qm07xain7psfz2ql9jp-xapian-1.4.6/bin/xapian-compact passed the binary check. - /nix/store/aj2mvy243pd40qm07xain7psfz2ql9jp-xapian-1.4.6/bin/xapian-progsrv passed the binary check. - /nix/store/aj2mvy243pd40qm07xain7psfz2ql9jp-xapian-1.4.6/bin/xapian-replicate passed the binary check. - /nix/store/aj2mvy243pd40qm07xain7psfz2ql9jp-xapian-1.4.6/bin/xapian-replicate-server passed the binary check. - /nix/store/aj2mvy243pd40qm07xain7psfz2ql9jp-xapian-1.4.6/bin/xapian-tcpsrv passed the binary check. - /nix/store/aj2mvy243pd40qm07xain7psfz2ql9jp-xapian-1.4.6/bin/copydatabase passed the binary check. - /nix/store/aj2mvy243pd40qm07xain7psfz2ql9jp-xapian-1.4.6/bin/quest passed the binary check. - /nix/store/aj2mvy243pd40qm07xain7psfz2ql9jp-xapian-1.4.6/bin/simpleexpand passed the binary check. - /nix/store/aj2mvy243pd40qm07xain7psfz2ql9jp-xapian-1.4.6/bin/simpleindex passed the binary check. - /nix/store/aj2mvy243pd40qm07xain7psfz2ql9jp-xapian-1.4.6/bin/simplesearch passed the binary check. - /nix/store/aj2mvy243pd40qm07xain7psfz2ql9jp-xapian-1.4.6/bin/xapian-metadata passed the binary check. - /nix/store/aj2mvy243pd40qm07xain7psfz2ql9jp-xapian-1.4.6/bin/xapian-config passed the binary check. - 14 of 14 passed binary check by having a zero exit code. - 11 of 14 passed binary check by having the new version present in output. - found 1.4.6 with grep in /nix/store/aj2mvy243pd40qm07xain7psfz2ql9jp-xapian-1.4.6 - directory tree listing: https://gist.github.com/1a9a8d6ec7eaf0fcf99b2fd3ac78bdde - du listing: https://gist.github.com/a62b29d85790d5e9d07055163c257283 --- pkgs/development/libraries/xapian/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index 5dd81af2b1af..5bc347cbaddb 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -36,5 +36,5 @@ let in { # xapian-ruby needs 1.2.22 as of 2017-05-06 xapian_1_2_22 = generic "1.2.22" "0zsji22n0s7cdnbgj0kpil05a6bgm5cfv0mvx12d8ydg7z58g6r6"; - xapian_1_4 = generic "1.4.5" "0axhqrj202hbll9mcx1qdm8gsqj19216w3z02gyjbycxvr9gkdc5"; + xapian_1_4 = generic "1.4.6" "166qpfq7pvyrj2w2x07v31ypvqg6c2xyvds5sms9h4g2sg0z23hy"; } From 77eab67b76b995db6e1ca544af589c5449fc2377 Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Mon, 30 Jul 2018 20:36:56 +0200 Subject: [PATCH 2/3] xapian: 1.4.6 -> 1.4.7 --- pkgs/development/libraries/xapian/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index 5bc347cbaddb..e07e3b2e7046 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -36,5 +36,5 @@ let in { # xapian-ruby needs 1.2.22 as of 2017-05-06 xapian_1_2_22 = generic "1.2.22" "0zsji22n0s7cdnbgj0kpil05a6bgm5cfv0mvx12d8ydg7z58g6r6"; - xapian_1_4 = generic "1.4.6" "166qpfq7pvyrj2w2x07v31ypvqg6c2xyvds5sms9h4g2sg0z23hy"; + xapian_1_4 = generic "1.4.7" "1lxmlds3v5s1gng9nk1rvmln1zcksrw5ds509y0glylwch5qmw0k"; } From 6ea7b48c2b20ab88334cea9b368fe0d0354b4926 Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Mon, 30 Jul 2018 22:06:22 +0200 Subject: [PATCH 3/3] xapian: add patch to fix notmuch tagging Patch is from xapian master and can be removed on next update. --- pkgs/development/libraries/xapian/default.nix | 7 +++++ .../xapian/fix-notmuch-tagging.patch | 31 +++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/libraries/xapian/fix-notmuch-tagging.patch diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index e07e3b2e7046..8c0d065247b4 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -11,6 +11,13 @@ let inherit sha256; }; + patches = [ + # fix notmuch build, see https://notmuchmail.org/faq/#index12h2 + # cannot fetchpatch this because base directory differs + # TODO: remove on next xapian update + ./fix-notmuch-tagging.patch + ]; + outputs = [ "out" "man" "doc" ]; buildInputs = [ libuuid zlib ]; diff --git a/pkgs/development/libraries/xapian/fix-notmuch-tagging.patch b/pkgs/development/libraries/xapian/fix-notmuch-tagging.patch new file mode 100644 index 000000000000..6deae76d2aa7 --- /dev/null +++ b/pkgs/development/libraries/xapian/fix-notmuch-tagging.patch @@ -0,0 +1,31 @@ +From f9e6f45b1c8f66bca8a3387f371b20d434b23a7d Mon Sep 17 00:00:00 2001 +From: Olly Betts +Date: Thu, 26 Jul 2018 17:26:52 +1200 +Subject: [PATCH 1/1] Revert "Enable open_nearby_postlist for writable + databases" + +The amended check isn't conservative enough as there may be postlist +changes in the inverter while the table is unmodified. This breaks +testcase T150-tagging.sh in notmuch's testsuite, reported by David +Bremner. + +This reverts commit 5489fb2f838c0f0b0a593b4c17df282a93a1fe5a. +--- + xapian-core/backends/glass/glass_postlist.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/xapian-core/backends/glass/glass_postlist.cc b/xapian-core/backends/glass/glass_postlist.cc +index 80e578b85..a47f14a68 100644 +--- a/backends/glass/glass_postlist.cc ++++ b/backends/glass/glass_postlist.cc +@@ -759,7 +759,7 @@ GlassPostList::open_nearby_postlist(const std::string & term_, + (void)need_pos; + if (term_.empty()) + RETURN(NULL); +- if (!this_db.get() || this_db->postlist_table.is_modified()) ++ if (!this_db.get() || this_db->postlist_table.is_writable()) + RETURN(NULL); + RETURN(new GlassPostList(this_db, term_, cursor->clone())); + } +-- +2.11.0