Tested build with dependent packages with 'git' in the name: ./pre-inst-env guix refresh -l git | cut -d: -f2- | tr ' ' '\n' | grep git | xargs ./pre-inst-env guix build Patches are both attached and inlined below. From 5ed6fcda2fa6aff6e6c2a3a0b771153fad2f3633 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Thu, 3 Feb 2022 13:25:51 +0000 Subject: [PATCH 1/2] gnu: git: Update to 2.35.1. * gnu/packages/version-control.scm (git): Update to 2.35.1. --- gnu/packages/version-control.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 95287c7c69..797c9437f9 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -32,7 +32,7 @@ ;;; Copyright © 2020, 2021 Vinicius Monego ;;; Copyright © 2020 Tanguy Le Carrour ;;; Copyright © 2020, 2021 Michael Rohleder -;;; Copyright © 2021 Greg Hogan +;;; Copyright © 2021, 2022 Greg Hogan ;;; Copyright © 2021 Maxim Cournoyer ;;; Copyright © 2021 Chris Marusich ;;; Copyright © 2021 Léo Le Bouter @@ -219,14 +219,14 @@ (define git-cross-configure-flags (define-public git (package (name "git") - (version "2.34.1") + (version "2.35.1") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/software/scm/git/git-" version ".tar.xz")) (sha256 (base32 - "0b40vf315s1kz65x1wq47g8srl4wqac39pwnvlj1mdzs3kfma1rs")))) + "100h37cpw49pmlpf6lcpm1xi578gllf6y9in60h5mxj3cj754s6p")))) (build-system gnu-build-system) (native-inputs `(("native-perl" ,perl) @@ -246,7 +246,7 @@ (define-public git version ".tar.xz")) (sha256 (base32 - "1f3y7hxvs9p00wwwi8zdn0sgn6nh1pgg1fdsnz2bq8gzfbbmsqww")))) + "00rqdj2bc3i7pfc16pciiz50ww41jkqg18iy5hi5jnf0y98sgqz4")))) ;; For subtree documentation. ("asciidoc" ,asciidoc) ("docbook-xsl" ,docbook-xsl) -- 2.34.0 From 6fbb70ce36a290a1a475eaa88bc86a0024917ba6 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Thu, 3 Feb 2022 15:24:22 +0000 Subject: [PATCH 2/2] gnu: stgit: Update to 1.5. * gnu/packages/version-control.scm (stgit): Update to 1.5. --- gnu/packages/version-control.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 797c9437f9..e28349299b 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1320,7 +1320,7 @@ (define-public git-flow (define-public stgit (package (name "stgit") - (version "1.1") + (version "1.5") (source (origin (method git-fetch) @@ -1329,7 +1329,7 @@ (define-public stgit (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1jp74qsgw3f9c8xgaaqvmhfh4ar3n1ns5ncm8glvqyywlxldxi0n")))) + (base32 "1igljjpdgl4na1a5hi0nmg36ph0hw6hw8hhq5436fgcl8yjimyz3")))) (build-system python-build-system) (native-inputs (list perl)) -- 2.34.0