From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo Famulari Subject: bug#24105: git package misses man pages Date: Tue, 9 Aug 2016 15:03:02 -0400 Message-ID: <20160809190302.GA13796@jasmine> References: <20160729124623.GA31006@solar> <20160729171059.GA14354@jasmine> <87vaznb5my.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="T4sUOijqQbZv57TR" Content-Transfer-Encoding: 8bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:36609) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bXCJr-0000z0-Ex for bug-guix@gnu.org; Tue, 09 Aug 2016 15:04:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bXCJn-0002t6-5Z for bug-guix@gnu.org; Tue, 09 Aug 2016 15:04:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:36081) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bXCJl-0002sw-VC for bug-guix@gnu.org; Tue, 09 Aug 2016 15:04:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1bXCJl-0006Wj-P1 for bug-guix@gnu.org; Tue, 09 Aug 2016 15:04:01 -0400 Sender: "Debbugs-submit" Resent-Message-ID: Content-Disposition: inline In-Reply-To: <87vaznb5my.fsf@gnu.org> List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org Sender: "bug-Guix" To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 24105@debbugs.gnu.org --T4sUOijqQbZv57TR Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit On Sat, Jul 30, 2016 at 03:46:29PM +0200, Ludovic Courtès wrote: > Leo Famulari skribis: > > > On Fri, Jul 29, 2016 at 02:46:23PM +0200, Andreas Enge wrote: > > [...] > > >> I suggest to include the man pages into the git package itself. If building > >> them is a real issue, adding a source and the build phase of git-manpages > >> to the git package itself could also be an option. > > > > I agree. If we continue to not build them from source, it won't make the > > Git package any more "expensive". We could add the pre-built source > > tarball as a native-input to the Git package, and re-use the unpack > > phase from git-manpages. > > I agree too, this sounds like a good idea. I've attached a patch. Your thoughts? --T4sUOijqQbZv57TR Content-Type: text/x-diff; charset=iso-8859-1 Content-Disposition: attachment; filename="0001-gnu-git-Provide-man-pages-in-main-Git-package.patch" Content-Transfer-Encoding: 8bit >From 2407216eac19e5a7a3376efc497f7047dc0c8299 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 9 Aug 2016 14:55:37 -0400 Subject: [PATCH] gnu: git: Provide man-pages in main Git package. * gnu/packages/version-control.scm (git-manpages): Remove variable. (git)[native-inputs]: Add GIT-MANPAGES. [arguments]: Add 'install-man-pages' phase. --- gnu/packages/version-control.scm | 69 ++++++++++++---------------------------- 1 file changed, 20 insertions(+), 49 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 767715d..dd0195d 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2015, 2016 Efraim Flashner ;;; Copyright © 2015 Kyle Meyer ;;; Copyright © 2015 Ricardo Wurmus +;;; Copyright © 2016 Leo Famulari ;;; ;;; This file is part of GNU Guix. ;;; @@ -110,7 +111,6 @@ as well as the classic centralized workflow.") (license gpl2+))) (define-public git - ;; Keep in sync with 'git-manpages'! (package (name "git") (version "2.9.2") @@ -124,7 +124,16 @@ as well as the classic centralized workflow.") (build-system gnu-build-system) (native-inputs `(("native-perl" ,perl) - ("gettext" ,gnu-gettext))) + ("gettext" ,gnu-gettext) + ("git-manpages" + ,(origin + (method url-fetch) + (uri (string-append + "mirror://kernel.org/software/scm/git/git-manpages-" + version ".tar.xz")) + (sha256 + (base32 + "08y38w6yfvrpgj10dl3vghp05xjpl8jj37kkfna2nhf0wip52p2c")))))) (inputs `(("curl" ,curl) ("expat" ,expat) @@ -260,7 +269,15 @@ as well as the classic centralized workflow.") ;; specify a single directory, not a search path. (wrap-program (string-append out "/bin/git") `("PATH" ":" prefix - ("$HOME/.guix-profile/libexec/git-core"))))))))) + ("$HOME/.guix-profile/libexec/git-core")))))) + (add-after 'split 'install-man-pages + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (man (string-append out "/share/man")) + (manpages (assoc-ref inputs "git-manpages"))) + (mkdir-p man) + (with-directory-excursion man + (zero? (system* "tar" "xvf" manpages))))))))) (native-search-paths ;; For HTTPS access, Git needs a single-file certificate bundle, specified @@ -278,52 +295,6 @@ everything from small to very large projects with speed and efficiency.") (license gpl2) (home-page "http://git-scm.com/"))) -(define-public git-manpages - ;; Keep in sync with 'git'! - - ;; Granted, we could build the man pages from the 'git' package itself, - ;; which contains the real source. However, it would add a dependency on a - ;; full XML tool chain, and building it actually takes ages. So we use this - ;; lazy approach. - (package - (name "git-manpages") - (version (package-version git)) - (source (origin - (method url-fetch) - (uri (string-append - "mirror://kernel.org/software/scm/git/git-manpages-" - version ".tar.xz")) - (sha256 - (base32 - "08y38w6yfvrpgj10dl3vghp05xjpl8jj37kkfna2nhf0wip52p2c")))) - (build-system trivial-build-system) - (arguments - '(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - - (let* ((xz (assoc-ref %build-inputs "xz")) - (tar (assoc-ref %build-inputs "tar")) - (out (assoc-ref %outputs "out")) - (man (string-append out "/share/man"))) - (setenv "PATH" (string-append tar "/bin:" xz "/bin")) - - (mkdir-p man) - (with-directory-excursion man - (zero? (system* "tar" "xvf" - (assoc-ref %build-inputs "source")))))))) - - (native-inputs `(("tar" ,tar) - ("xz" ,xz))) - (home-page (package-home-page git)) - (license (package-license git)) - (synopsis "Man pages of the Git version control system") - (description - "This package provides the man pages of the Git version control system. -This is the documentation displayed when using the '--help' option of a 'git' -command."))) - (define-public libgit2 (package (name "libgit2") -- 2.9.2 --T4sUOijqQbZv57TR--