From cbb5b5c4d5d7e027c85c0ed221f0291b83c567b8 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Wed, 10 Mar 2021 01:01:46 +0100 Subject: gnu: git: Update to 2.30.2 [fixes CVE-2021-21300]. * gnu/packages/version-control.scm (git): Update to 2.30.2. --- 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 8292a5df15..d85b5352fa 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -170,14 +170,14 @@ as well as the classic centralized workflow.") (define-public git (package (name "git") - (version "2.30.1") + (version "2.30.2") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/software/scm/git/git-" version ".tar.xz")) (sha256 (base32 - "0rwlbps9x8kgk2hsm0bvsrkpsk9bnbnz8alknbd7i688jnhai27r")))) + "1ajz6lng6yldqm66lhrjfgbbxk09rq8cngv7hz9nqizrf46dkxs1")))) (build-system gnu-build-system) (native-inputs `(("native-perl" ,perl) @@ -194,7 +194,7 @@ as well as the classic centralized workflow.") version ".tar.xz")) (sha256 (base32 - "015rqnz3ly1h6z6k9hfikgh401s3mzkmys8srai1kfv4v75pxz1h")))) + "1aiabqbc6mg23r19g2cwd4iajf55cpkxqylwn14hgpg64piaqr2y")))) ;; For subtree documentation. ("asciidoc" ,asciidoc-py3) ("docbook-xsl" ,docbook-xsl) -- cgit v1.2.3 From ab9629b7c91ff7d6392a03512cfe442823267777 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Tue, 16 Mar 2021 10:52:11 +0100 Subject: gnu: git: Update to 2.31.0. * gnu/packages/version-control.scm (git): Update to 2.31.0. --- 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 d85b5352fa..11e266cada 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -170,14 +170,14 @@ as well as the classic centralized workflow.") (define-public git (package (name "git") - (version "2.30.2") + (version "2.31.0") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/software/scm/git/git-" version ".tar.xz")) (sha256 (base32 - "1ajz6lng6yldqm66lhrjfgbbxk09rq8cngv7hz9nqizrf46dkxs1")))) + "0h4sg3xqa9pd2agrd7m18sqg319ls978d39qswyf30rjvg5n5wg8")))) (build-system gnu-build-system) (native-inputs `(("native-perl" ,perl) -- cgit v1.2.3 From 0ee5d4f7a8e25be437297f88ed7013c4f37abafb Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Tue, 16 Mar 2021 10:58:36 +0100 Subject: gnu: git: Fix git-manpages native input's hash. This is a follow-up to commit ab9629b7c91ff7d6392a03512cfe442823267777. * gnu/packages/version-control.scm (git)[native-inputs]: Fix git-manpages's hash. --- gnu/packages/version-control.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/version-control.scm') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 11e266cada..ecb2ec7c6a 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -194,7 +194,7 @@ as well as the classic centralized workflow.") version ".tar.xz")) (sha256 (base32 - "1aiabqbc6mg23r19g2cwd4iajf55cpkxqylwn14hgpg64piaqr2y")))) + "1v40wwj130k76xf2w6vwhvfpkk765q1gcy5bqcrqssxf66ydqp8q")))) ;; For subtree documentation. ("asciidoc" ,asciidoc-py3) ("docbook-xsl" ,docbook-xsl) -- cgit v1.2.3 From 451f23df5e7a1798f85d58d1720387677444761a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 9 Mar 2021 10:06:13 +0200 Subject: gnu: b4: Fix setup.py version incompatibility. * gnu/packages/version-control.scm (b4)[source]: Add snippet to not require too specific of a version. Reported-by: Kyle Meyer --- gnu/packages/version-control.scm | 12 ++++++++++-- 1 file changed, 10 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 ecb2ec7c6a..46dba5db61 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2014, 2015, 2016 Mark H Weaver ;;; Copyright © 2014, 2016, 2019 Eric Bavier ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner -;;; Copyright © 2015, 2018, 2020 Kyle Meyer +;;; Copyright © 2015, 2018, 2020, 2021 Kyle Meyer ;;; Copyright © 2015, 2017, 2018, 2020 Ricardo Wurmus ;;; Copyright © 2016, 2017 Leo Famulari ;;; Copyright © 2016, 2017, 2018 Nikita @@ -2347,7 +2347,15 @@ based on a manifest file published by servers.") (method url-fetch) (uri (pypi-uri "b4" version)) (sha256 - (base32 "1j904dy9cwxl85k2ngc498q5cdnqwsmw3jibjr1m55w8aqdck68z")))) + (base32 "1j904dy9cwxl85k2ngc498q5cdnqwsmw3jibjr1m55w8aqdck68z")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Fixes issue with dependency requirements being too strict. See upstream commit: + ;; https://git.kernel.org/pub/scm/utils/b4/b4.git/commit/?id=31348a14afdb1d39e7faf9576eaddea1ced76e19 + (substitute* "setup.py" + (("~=") ">=")) + #t)))) (build-system python-build-system) (arguments '(#:tests? #f)) ; No tests. (inputs -- cgit v1.2.3 From d45d779e2a14f757c4b560f61758a5774cc80a55 Mon Sep 17 00:00:00 2001 From: LibreMiami Date: Thu, 11 Mar 2021 23:49:11 -0500 Subject: gnu: tig: Update to 2.5.3. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/version-control.scm (tig): Update to 2.5.3. Co-authored-by: jgart Co-authored-by: donotshake Signed-off-by: Ludovic Courtès --- gnu/packages/version-control.scm | 5 +++-- 1 file changed, 3 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 46dba5db61..7c93337625 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -36,6 +36,7 @@ ;;; Copyright © 2021 Maxim Cournoyer ;;; Copyright © 2021 Chris Marusich ;;; Copyright © 2021 Léo Le Bouter +;;; Copyright © 2021 LibreMiami ;;; ;;; This file is part of GNU Guix. ;;; @@ -2196,7 +2197,7 @@ from Subversion to any supported Distributed Version Control System (DVCS).") (define-public tig (package (name "tig") - (version "2.5.1") + (version "2.5.3") (source (origin (method url-fetch) (uri (string-append @@ -2204,7 +2205,7 @@ from Subversion to any supported Distributed Version Control System (DVCS).") version "/tig-" version ".tar.gz")) (sha256 (base32 - "0r4y9hyvpkplaxrzslws3asz652d83qh3bjwvmp8assga8s5s3ah")))) + "1p1575yh4daxjifywxkd0hgyfwciylqcm2qakawvwn6mk620ca75")))) (build-system gnu-build-system) (native-inputs `(("asciidoc" ,asciidoc) -- cgit v1.2.3 From 369d0e7f5c7d5b81543bc053ea9a51fd921102ec Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Sat, 6 Mar 2021 10:28:02 +0100 Subject: gnu: Add git2cl. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/version-control.scm (git2cl): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/version-control.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages/version-control.scm') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 7c93337625..137c7c8336 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -37,6 +37,7 @@ ;;; Copyright © 2021 Chris Marusich ;;; Copyright © 2021 Léo Le Bouter ;;; Copyright © 2021 LibreMiami +;;; Copyright © 2021 Xinglu Chen ;;; ;;; This file is part of GNU Guix. ;;; @@ -600,6 +601,31 @@ everything from small to very large projects with speed and efficiency.") ("perl" ,perl) ("zlib" ,zlib))))) +(define-public git2cl + (let ((commit "1d74d4c0d933fc69ed5cec838c73502584dead05")) + (package + (name "git2cl") + (version (string-append "20120919." (string-take commit 7))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.savannah.nongnu.org/git/git2cl.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0wnnbm2sjvfj0qrksj89jlnl69miwl0vk3wrrvgvpclgys3na2g1")))) + (build-system copy-build-system) + (inputs + `(("perl" ,perl))) + (arguments + `(#:install-plan '(("git2cl" "bin/git2cl")))) + (home-page "https://savannah.nongnu.org/projects/git2cl") + (synopsis "Convert Git logs to GNU ChangeLog format") + (description "@code{git2cl} is a command line tool for converting Git +logs to GNU ChangeLog format.") + (license license:gpl2+)))) + (define-public gitless (package (name "gitless") -- cgit v1.2.3