From f87d377a9ecebda6ab25d1e981497bbacf389ae2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 20 Apr 2021 00:13:04 +0200 Subject: gnu: cvs-fast-export: Update to 1.56. * gnu/packages/version-control.scm (cvs-fast-export): Update to 1.56. --- gnu/packages/version-control.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/version-control.scm') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index ebddd9522a3..3992f746445 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1919,14 +1919,14 @@ RCS, PRCS, and Aegis packages.") (define-public cvs-fast-export (package (name "cvs-fast-export") - (version "1.55") + (version "1.56") (source (origin (method url-fetch) (uri (string-append "http://www.catb.org/~esr/cvs-fast-export/" "cvs-fast-export-" version ".tar.gz")) (sha256 (base32 - "06y2myhhv2ap08bq7d7shq0b7lq6wgznwrpz6622xq66cxkf2n5g")))) + "058bzp3npng48ascls943m16kgvrl0h197a10brf7mvx8zpfc7sc")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.3 From f0eb053dac8273416ab24541b85617d79dbae134 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 3 May 2021 01:25:47 +0200 Subject: gnu: stgit: Update to 1.1. * gnu/packages/version-control.scm (stgit): Update to 1.1. --- gnu/packages/version-control.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/version-control.scm') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 3992f746445..8df7cc8d14f 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1264,7 +1264,7 @@ lot easier.") (define-public stgit (package (name "stgit") - (version "1.0") + (version "1.1") (source (origin (method git-fetch) @@ -1273,7 +1273,7 @@ lot easier.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0dixgvjlsk3xisj8blzdhh0nphm5zqkjbj081wgsba52z4zq1y0q")))) + (base32 "1jp74qsgw3f9c8xgaaqvmhfh4ar3n1ns5ncm8glvqyywlxldxi0n")))) (build-system python-build-system) (native-inputs `(("perl" ,perl))) -- cgit v1.3 From 2c09755a7a07a971d7c2ad6dbe991689837fd29c Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Mon, 3 May 2021 17:54:17 +0200 Subject: gnu: vcsh: Update to 1.20190621. * gnu/packages/version-control.scm (vcsh): Update to 1.20190621. [arguments]: Add an 'install-bash-completion phase. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/version-control.scm | 21 +++++++++++++++------ 1 file changed, 15 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 8df7cc8d14f..17afc5f41c6 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -31,7 +31,7 @@ ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2020 Vinicius Monego ;;; Copyright © 2020 Tanguy Le Carrour -;;; Copyright © 2020 Michael Rohleder +;;; Copyright © 2020, 2021 Michael Rohleder ;;; Copyright © 2021 Greg Hogan ;;; Copyright © 2021 Maxim Cournoyer ;;; Copyright © 2021 Chris Marusich @@ -1316,7 +1316,7 @@ manipulate them in various ways.") (define-public vcsh (package (name "vcsh") - (version "1.20151229") + (version "1.20190621") (source (origin (method git-fetch) @@ -1325,7 +1325,7 @@ manipulate them in various ways.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1grpj45nbpv4j60vd2kg4rj53zrm0bc0h9l4pfd3c2mwbvywm6ab")))) + (base32 "1s9l47wm9r7sndcgc778mq60wkzkhvfv7rkrwci5kjvw8vsddvcc")))) (build-system gnu-build-system) (native-inputs `(("which" ,which))) @@ -1336,9 +1336,18 @@ manipulate them in various ways.") ("perl-shell-command" ,perl-shell-command) ("perl-test-most" ,perl-test-most))) (arguments - '(#:phases (modify-phases %standard-phases - (delete 'configure) - (delete 'build)) + '(#:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (add-after 'install 'install-bash-completion + ;; As of 1.20190621, zsh completion is installed by default but bash + ;; completion is not. Do so manually. + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (completions (string-append out "/etc/bash_completion.d"))) + (mkdir-p completions) + (copy-file "_vcsh_bash" (string-append completions "/vcsh")))))) #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) #:test-target "test")) -- cgit v1.3 From 817f40d0ac766a36795d40d31f9999889aa7de4d Mon Sep 17 00:00:00 2001 From: François J Date: Fri, 23 Apr 2021 09:05:46 +0200 Subject: gnu: git: add a comment on why we don't build manpages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/version-control.scm (git)[native-inputs]: add back comment skipped by commit d1cada0450fca54260fd20ab49d0586d147cbeb3 Signed-off-by: François J. Signed-off-by: Ludovic Courtès --- gnu/packages/version-control.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu/packages/version-control.scm') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 17afc5f41c6..1ab97d4dade 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -188,6 +188,9 @@ as well as the classic centralized workflow.") ("bash" ,bash-minimal) ("bash-for-tests" ,bash) ("gettext" ,gettext-minimal) + ;; To build the man pages from the git sources, we would need a dependency + ;; on a full XML tool chain, and building it actually takes ages. So we + ;; use this lazy approach and use released tarball. ("git-manpages" ,(origin (method url-fetch) -- cgit v1.3 From cd95cb287e48fa4589fe813e150e2a31afa253b6 Mon Sep 17 00:00:00 2001 From: François J Date: Fri, 23 Apr 2021 09:17:17 +0200 Subject: gnu: Add git-filter-repo. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/version-control.scm (git-filter-repo): New variable. Co-authored-by: Ludovic Courtès --- gnu/packages/version-control.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu/packages/version-control.scm') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 1ab97d4dade..0cad83c4b07 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -38,6 +38,7 @@ ;;; Copyright © 2021 Léo Le Bouter ;;; Copyright © 2021 LibreMiami ;;; Copyright © 2021 Xinglu Chen +;;; Copyright © 2021 François J. ;;; ;;; This file is part of GNU Guix. ;;; @@ -3083,3 +3084,36 @@ If several repos are related, it helps to see their status together.") makes a directory under a specific root directory (by default @file{~/ghq}) using the remote repository URL's host and path.") (license license:expat))) + +(define-public git-filter-repo + (package + (name "git-filter-repo") + (version "2.29.0") + (source + (origin + ;; Use a release tarball instead of 'git-fetch' because it contains + ;; pre-compiled man-pages which are too hard to build in this context + ;; as it depends on Git's Makefile. + (method url-fetch) + (uri (string-append "https://github.com/newren/git-filter-repo/releases/" + "download/v" version + "/git-filter-repo-" version ".tar.xz")) + (sha256 + (base32 + "00nn7k9jqrybb762486fmigsnbcn9lbvimgpfvvarz4ikdp9y9pb")))) + (build-system copy-build-system) + (arguments + `(#:install-plan + '(("git-filter-repo" "libexec/git-core/") + ("Documentation/man1/" "share/man/man1") + ("/" "" #:include ())))) + (inputs `(("python" ,python))) ;for the shebang + (home-page "https://github.com/newren/git-filter-repo") + (synopsis "Quickly rewrite Git repository history") + (description + "@command{git filter-repo} is a versatile tool for rewriting history, +which roughly falls into the same space of tool like git filter-branch but +with more capabilities. @command{git filter-repo} is now recommended by the +Git project instead of @command{git filter-branch}.") + (license (list license:expat ;; Main license. + license:gpl2)))) ;; For test harness. -- cgit v1.3