From patchwork Wed Oct 26 02:18:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marius Bakke X-Patchwork-Id: 16823 Received: (qmail 54629 invoked by uid 89); 26 Oct 2016 02:21:00 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Checked: by ClamAV 0.99.2 on sourceware.org X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.2 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 spammy=dtd, Hx-languages-length:2468, isaac, Isaac X-Spam-Status: No, score=-3.2 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on sourceware.org X-Spam-Level: X-HELO: lists.gnu.org Received: from lists.gnu.org (HELO lists.gnu.org) (208.118.235.17) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 26 Oct 2016 02:20:50 +0000 Received: from localhost ([::1]:59193 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bzDpg-0008Vk-F5 for patchwork@sourceware.org; Tue, 25 Oct 2016 22:20:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36555) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bzDo6-0007gG-Bv for guix-devel@gnu.org; Tue, 25 Oct 2016 22:19:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bzDo2-00081c-CG for guix-devel@gnu.org; Tue, 25 Oct 2016 22:19:10 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:45636) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1bzDo2-00081W-7p for guix-devel@gnu.org; Tue, 25 Oct 2016 22:19:06 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 395742028B; Tue, 25 Oct 2016 22:19:04 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute4.internal (MEProxy); Tue, 25 Oct 2016 22:19:04 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=fastmail.com; h=cc :content-transfer-encoding:content-type:date:from:message-id :mime-version:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=mesmtp; bh=ZacxJWus2NJP1S+XbH9mzUhKDIM=; b=FiK2GB leHKpm+PP92k0ny0TW4UFFudjc04xKKSz/92CbLNAlFXGpdRoNAkpCgxH7LFccPY wmF37hHYjRV1dw15aDD6UW5iaoEqevzgJwWBOieChm96zsB1y98hU2CF4dsa5wsn wS4qn3Ov8eMk+OmNF2qRSJCpvAfQRkBindXcM= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=smtpout; bh=ZacxJWus2NJP1S +XbH9mzUhKDIM=; b=n0zUhtz2+XPP0vk2yIC/W2DzbKpuhzSifDbAoEXdXTGz7W xSDHqAbGzxssC0rC9+2QZFWia/VL5RvE2VphuJFqnlRxWwDfCbdLp7aco5mmpBPs nTS1IJq4UaF4ye8tNBgZcEBwGWTZlI11WJTB9sRik1ArIIK2Ahq1jzvJg0SkY= X-ME-Sender: X-Sasl-enc: ++XrruMNfMifELaKsNI/tYWljQNTVrSCJ3tzuQomxYVW 1477448343 Received: from localhost (169.243.187.81.in-addr.arpa [81.187.243.169]) by mail.messagingengine.com (Postfix) with ESMTPA id C76F9CC0C2; Tue, 25 Oct 2016 22:19:00 -0400 (EDT) From: Marius Bakke To: guix-devel@gnu.org Subject: [PATCH 1/1] gnu: offlineimap: Install documentation. Date: Wed, 26 Oct 2016 03:18:20 +0100 Message-Id: <20161026021820.22270-1-mbakke@fastmail.com> X-Mailer: git-send-email 2.10.1 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 66.111.4.25 X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marius Bakke Errors-To: guix-devel-bounces+patchwork=sourceware.org@gnu.org Sender: "Guix-devel" * gnu/packages/mail.scm (offlineimap)[native-inputs]: Add asciidoc and libxslt. [arguments]: Add phases 'build-documentation' and 'install-documentation' to build and install manpages. Also remove unneeded key 'inputs' from 'wrap-binary' phase. --- gnu/packages/mail.scm | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index eee7d18..c89b436 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -19,6 +19,7 @@ ;;; Copyright © 2016 Clément Lassieur ;;; Copyright © 2016 Arun Isaac ;;; Copyright © 2016 John Darrington +;;; Copyright © 2016 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -47,6 +48,7 @@ #:use-module (gnu packages databases) #:use-module (gnu packages dejagnu) #:use-module (gnu packages dns) + #:use-module (gnu packages documentation) #:use-module (gnu packages emacs) #:use-module (gnu packages enchant) #:use-module (gnu packages ghostscript) @@ -319,6 +321,9 @@ and corrections. It is based on a Bayesian filter.") (base32 "0smxh5ag3cbn92kp49jq950j5m2pivs9kr04prpd1lw62hy7gnhr")))) (build-system python-build-system) + (native-inputs + `(("asciidoc" ,asciidoc) + ("libxslt" ,libxslt))) ; for xsltproc (inputs `(("python2-pysqlite" ,python2-pysqlite) ("python2-six" ,python2-six))) (arguments @@ -328,8 +333,21 @@ and corrections. It is based on a Bayesian filter.") #:tests? #f #:phases (modify-phases %standard-phases - (add-after 'install 'wrap-binary - (lambda* (#:key inputs outputs #:allow-other-keys) + (add-after 'build 'build-documentation + (lambda _ + (substitute* "docs/Makefile" + ;; Prevent xmllint and xsltproc from downloading a DTD file. + (("a2x -v") "a2x --no-xmllint --xsltproc-opts=--nonet -v")) + (zero? (system* "make" "-C" "docs" "man")))) + (add-after 'install 'install-documentation + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (man (string-append out "/share/man"))) + (install-file "docs/offlineimap.1" (string-append man "/man1")) + (install-file "docs/offlineimapui.7" (string-append man "/man7")) + #t))) + (add-after 'install-documentation 'wrap-binary + (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin/offlineimap"))) (wrap-program bin