From 50ec74308ebf2cb356e509ffb454edfd3ccd4725 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 6 Jan 2015 15:06:38 +0100 Subject: gnu: git: Update to 2.2.1. * gnu/packages/version-control.scm (git): Update to 2.2.1. --- gnu/packages/version-control.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/version-control.scm') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index f5e9a27736..ae48c4517b 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Nikita Karetnikov ;;; Copyright © 2013 Cyril Roelandt -;;; Copyright © 2013, 2014 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015 Ludovic Courtès ;;; Copyright © 2013, 2014 Andreas Enge ;;; Copyright © 2014 Mark H Weaver ;;; Copyright © 2014 Eric Bavier @@ -97,14 +97,14 @@ as well as the classic centralized workflow.") (define-public git (package (name "git") - (version "2.1.2") + (version "2.2.1") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/software/scm/git/git-" version ".tar.xz")) (sha256 (base32 - "12x1qycc0rii6fqpiizp9v9ysdmj6lpi9imqqbrkdx6cifbwh9vv")))) + "0l7l9rv1ww474rm4whj7dhjjacgdw5qlqqxqsnyzdpdxl34jshh9")))) (build-system gnu-build-system) (native-inputs `(("native-perl" ,perl) -- cgit 1.4.1 From 1c38551a36ef32609a9fd4eb13663f0311247655 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 6 Jan 2015 15:07:22 +0100 Subject: gnu: Add git-manpages. * gnu/packages/version-control.scm (git-manpages): New variable. --- gnu/packages/version-control.scm | 47 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) (limited to 'gnu/packages/version-control.scm') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index ae48c4517b..0589ac30a1 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -95,6 +95,7 @@ as well as the classic centralized workflow.") (license gpl2+))) (define-public git + ;; Keep in sync with 'git-manpages'! (package (name "git") (version "2.2.1") @@ -210,6 +211,52 @@ 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 + "0f75n5yfrzb55qbg5wq4bmv43lay806v51yhglwkp7mbv1zkby00")))) + (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")) + (share (string-append out "/share"))) + (setenv "PATH" (string-append tar "/bin:" xz "/bin")) + + (mkdir-p share) + (with-directory-excursion share + (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 shflags (package (name "shflags") -- cgit 1.4.1 From d97625890763b9ea18f6246a845421bcba031793 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 6 Jan 2015 15:20:12 +0100 Subject: gnu: git-manpages: Install under $out/share/man, not $out/share. * gnu/packages/version-control.scm (git-manpages)[argument]: Install under $out/share/man, not $out/share. --- gnu/packages/version-control.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages/version-control.scm') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 0589ac30a1..dd41794b39 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -236,14 +236,14 @@ everything from small to very large projects with speed and efficiency.") (begin (use-modules (guix build utils)) - (let* ((xz (assoc-ref %build-inputs "xz")) - (tar (assoc-ref %build-inputs "tar")) - (out (assoc-ref %outputs "out")) - (share (string-append out "/share"))) + (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 share) - (with-directory-excursion share + (mkdir-p man) + (with-directory-excursion man (zero? (system* "tar" "xvf" (assoc-ref %build-inputs "source")))))))) -- cgit 1.4.1