From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marius Bakke Subject: [PATCH 4/4] gnu: xapian: Update to 1.4.0. Date: Mon, 17 Oct 2016 17:55:06 +0100 Message-ID: <20161017165506.17750-5-mbakke@fastmail.com> References: <20161017165506.17750-1-mbakke@fastmail.com> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:41143) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bwBC9-0006j9-Vy for guix-devel@gnu.org; Mon, 17 Oct 2016 12:55:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bwBC9-0003ob-0n for guix-devel@gnu.org; Mon, 17 Oct 2016 12:55:26 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:45989) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1bwBC8-0003oF-Uv for guix-devel@gnu.org; Mon, 17 Oct 2016 12:55:24 -0400 In-Reply-To: <20161017165506.17750-1-mbakke@fastmail.com> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org Cc: Marius Bakke * 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