* [bug#53751] [PATCH staging] gnu: git: Update to 2.35.1.
@ 2022-02-03 15:31 Greg Hogan
2022-04-04 4:25 ` bug#53751: " Maxim Cournoyer
0 siblings, 1 reply; 2+ messages in thread
From: Greg Hogan @ 2022-02-03 15:31 UTC (permalink / raw)
To: 53751
[-- Attachment #1.1: Type: text/plain, Size: 3508 bytes --]
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 <code@greghogan.com>
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 <monego@posteo.net>
;;; Copyright © 2020 Tanguy Le Carrour <tanguy@bioneland.org>
;;; Copyright © 2020, 2021 Michael Rohleder <mike@rohleder.de>
-;;; Copyright © 2021 Greg Hogan <code@greghogan.com>
+;;; Copyright © 2021, 2022 Greg Hogan <code@greghogan.com>
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Chris Marusich <cmmarusich@gmail.com>
;;; Copyright © 2021 Léo Le Bouter <lle-bout@zaclys.net>
@@ -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 <code@greghogan.com>
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
[-- Attachment #1.2: Type: text/html, Size: 4692 bytes --]
[-- Attachment #2: 0001-gnu-git-Update-to-2.35.1.patch --]
[-- Type: text/x-patch, Size: 2050 bytes --]
From 5ed6fcda2fa6aff6e6c2a3a0b771153fad2f3633 Mon Sep 17 00:00:00 2001
From: Greg Hogan <code@greghogan.com>
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 <monego@posteo.net>
;;; Copyright © 2020 Tanguy Le Carrour <tanguy@bioneland.org>
;;; Copyright © 2020, 2021 Michael Rohleder <mike@rohleder.de>
-;;; Copyright © 2021 Greg Hogan <code@greghogan.com>
+;;; Copyright © 2021, 2022 Greg Hogan <code@greghogan.com>
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Chris Marusich <cmmarusich@gmail.com>
;;; Copyright © 2021 Léo Le Bouter <lle-bout@zaclys.net>
@@ -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
[-- Attachment #3: 0002-gnu-stgit-Update-to-1.5.patch --]
[-- Type: text/x-patch, Size: 1146 bytes --]
From 6fbb70ce36a290a1a475eaa88bc86a0024917ba6 Mon Sep 17 00:00:00 2001
From: Greg Hogan <code@greghogan.com>
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* bug#53751: [PATCH staging] gnu: git: Update to 2.35.1.
2022-02-03 15:31 [bug#53751] [PATCH staging] gnu: git: Update to 2.35.1 Greg Hogan
@ 2022-04-04 4:25 ` Maxim Cournoyer
0 siblings, 0 replies; 2+ messages in thread
From: Maxim Cournoyer @ 2022-04-04 4:25 UTC (permalink / raw)
To: Greg Hogan; +Cc: 53751-done
Hello,
Greg Hogan <code@greghogan.com> writes:
> 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.
Thanks! Applied as 223a3d7f7fdb6af9c4c090785cab15d38680e887 and
367048036d8337a8dd8cfbbd277086286d8b0b40 to the master branch (it was
just 37 packages shy over our packages count guideline).
Closing.
Maxim
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-04-04 4:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-03 15:31 [bug#53751] [PATCH staging] gnu: git: Update to 2.35.1 Greg Hogan
2022-04-04 4:25 ` bug#53751: " Maxim Cournoyer
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).