all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Marius Bakke <mbakke@fastmail.com>
To: guix-devel@gnu.org
Cc: Marius Bakke <mbakke@fastmail.com>
Subject: [PATCH 4/4] gnu: xapian: Update to 1.4.0.
Date: Mon, 17 Oct 2016 17:55:06 +0100	[thread overview]
Message-ID: <20161017165506.17750-5-mbakke@fastmail.com> (raw)
In-Reply-To: <20161017165506.17750-1-mbakke@fastmail.com>

* gnu/packages/search.scm (xapian): Update to 1.4.0.
[source]: Use https URL.
[home-page]: Use https URL.
[arguments]: Remove 'patch-remotetcp-harness' phase. Replace 'check'
phase with a list of custom test targets.
---
 gnu/packages/search.scm | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm
index a43abde..5d7def5 100644
--- a/gnu/packages/search.scm
+++ b/gnu/packages/search.scm
@@ -35,30 +35,38 @@
 (define-public xapian
   (package
     (name "xapian")
-    (version "1.2.21")
+    (version "1.4.0")
     (source (origin
               (method url-fetch)
-              (uri (string-append "http://oligarchy.co.uk/xapian/" version
+              (uri (string-append "https://oligarchy.co.uk/xapian/" version
                                   "/xapian-core-" version ".tar.xz"))
               (sha256
-               (base32 "0grd2s6gf8yzqwdaa50g57j9d81mxkrrpkyldm2shgyizdc8gx33"))))
+               (base32 "0xv4da5rmqqzkkkzx2v3jwh5hz5zxhd2b7m8x30fk99a25blyn0h"))))
     (build-system gnu-build-system)
     (inputs `(("zlib" ,zlib)
               ("util-linux" ,util-linux)))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'patch-remotetcp-harness
+         (replace 'check
+           ;; As of Xapian 1.3.3, the TCP server implementation uses
+           ;; getaddrinfo(). This does not work in the build environment,
+           ;; so exclude those tests. See HACKING for the list of targets.
            (lambda _
-             (substitute* "tests/harness/backendmanager_remotetcp.cc"
-               (("/bin/sh") (which "bash"))))))))
+             (zero? (system* "make"
+                             "check-inmemory"
+                             "check-remoteprog"
+                             ;"check-remotetcp"
+                             "check-multi"
+                             "check-glass"
+                             "check-chert")))))))
     (synopsis "Search Engine Library")
     (description
      "Xapian is a highly adaptable toolkit which allows developers to easily
 add advanced indexing and search facilities to their own applications.  It
 supports the Probabilistic Information Retrieval model and also supports a
 rich set of boolean query operators.")
-    (home-page "http://xapian.org/")
+    (home-page "https://xapian.org/")
     (license (list gpl2+ bsd-3 x11))))
 
 (define-public libtocc
-- 
2.10.1

  parent reply	other threads:[~2016-10-17 16:55 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-10-17 16:55 [PATCH 0/4] Notmuch and Xapian update Marius Bakke
2016-10-17 16:55 ` [PATCH 1/4] gnu: notmuch: Update to 0.23 Marius Bakke
2016-10-17 17:58   ` Leo Famulari
2016-10-17 18:43     ` Marius Bakke
2016-10-17 16:55 ` [PATCH 2/4] gnu: notmuch: Enable tests Marius Bakke
2016-10-17 18:29   ` Leo Famulari
2016-10-17 18:56     ` Marius Bakke
2016-10-17 16:55 ` [PATCH 3/4] gnu: xapian: Use 'modify-phases' Marius Bakke
2016-10-17 18:00   ` Leo Famulari
2016-10-17 18:50     ` Marius Bakke
2016-10-17 16:55 ` Marius Bakke [this message]
2016-10-17 19:49   ` [PATCH 4/4] gnu: xapian: Update to 1.4.0 Leo Famulari
2016-10-18 21:55     ` Marius Bakke

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20161017165506.17750-5-mbakke@fastmail.com \
    --to=mbakke@fastmail.com \
    --cc=guix-devel@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.