[PATCH staging] gnu: git: Update to 2.35.1.

  • Done
  • quality assurance status badge
Details
3 participants
  • Greg Hogan
  • Christopher Baines
  • Maxim Cournoyer
Owner
unassigned
Submitted by
Greg Hogan
Severity
normal
G
G
Greg Hogan wrote on 3 Feb 2022 16:31
(address . guix-patches@gnu.org)
CA+3U0Znv=MRHvmfWVRUWm-86zC6tz2rk+dCmzHP5-tC1BpCrXQ@mail.gmail.com
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(-)

Toggle diff (78 lines)
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: file
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(-)

Toggle diff (41 lines)
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(-)

Toggle diff (24 lines)
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
M
M
Maxim Cournoyer wrote on 4 Apr 2022 06:25
(name . Greg Hogan)(address . code@greghogan.com)(address . 53751-done@debbugs.gnu.org)
874k391nmh.fsf@gmail.com
Hello,

Greg Hogan <code@greghogan.com> writes:

Toggle quote (6 lines)
> 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
Closed
C
C
Christopher Baines wrote on 5 Apr 2022 11:23
Re: 06/07: gnu: git: Update to 2.35.1.
(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
87zgkzop06.fsf@cbaines.net
guix-commits@gnu.org writes:

Toggle quote (15 lines)
> apteryx pushed a commit to branch master
> in repository guix.
>
> commit 223a3d7f7fdb6af9c4c090785cab15d38680e887
> Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
> AuthorDate: Mon Apr 4 00:06:48 2022 -0400
>
> gnu: git: Update to 2.35.1.
>
> * gnu/packages/version-control.scm (git): Update to 2.35.1.
> [phases]: Delete trailing #t.
>
> Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
> Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>

I've been looking in to this commit, since I noticed a large number of
rebuilds.

It looks connected to Greg's patch submitted in Issue #53751, but rather
than being authored by Greg, it's authored by Maxim.

Additionally, I'm guessing that the changes in Greg's patch are much
less impactful in terms of rebuilds compared to this commit, which also
removes the trailing #t from the phases, which will have affected every
variant of the git package, including variants like git-minimal/fixed,
which as the commit in the code says, is intended to rarely change.

I'm all for making changes fast, but I'm not sure the removal of #t from
the phases in thisq package definition is worth the cost of the
thousands of package rebuilds on the master branch.
-----BEGIN PGP SIGNATURE-----

iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmJMDGlfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF
ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh
aW5lcy5uZXQACgkQXiijOwuE9Xcg5g/+NA6lYc9yqDcskZ7ycVwZtK9lUVe4tfVN
vN9HsViP5roSS3NC/8W6VWiwSQzFF7KbcaPmawq34LnmGvNpLQWp4CdR+mjhPIOl
U9h3vKbP1yVhsBUsbkYD3QYiyjzeEJg/c8S/ij1BQihFoDyoj6Bzk6cb8+zAf0rg
E90W0cvfpbVmgQnMVAfe5bbLUbvZSRScTdWlDvcZQ9Pjdp+g6RctCQKBMcWQ4d3o
Ny/wjA7hbuz+F6+PZtancXwtX88uuRjaoM7BZF1KFT79f727UEQVBjutBfhEAz9n
h78lijI3nNWnIip8JNfqu6SmRz8ykMI4wl1DBP7kq+CkyMhOve4A7I6IEsMLI5xL
t0gE0MrOIJKMr0yNhah86ArUY4F1+P2l3EHzl7DsB9in3nNp5hWggIEcoHCLLtmn
WoJZ7cKN/HWUP6Re20NZ0FEAKNkDNr+BJZbqN7V3cLxQ2/lW1I/S6BunPhphny0v
nCW/FgrWeYIpcPKLynD+RkV2dzBZ8z+2OfFOBieIRyk9aKZNCPyOhT5xePE1tb0w
PiWRTTHpVrn/sqh8MpVM2spyolHos0OAEyYR/lyCA+1I96JJvOflWn6BboIFLxbR
ARgstpd5nBHphMwipMHVLShDc1XlDGAxgCD960Kc+K4QzM1JZK9/ffEju8Pv2HOc
dJkTCQGpzPg=
=Iwiv
-----END PGP SIGNATURE-----

M
M
Maxim Cournoyer wrote on 5 Apr 2022 15:00
(name . Christopher Baines)(address . mail@cbaines.net)
874k37znvu.fsf@gmail.com
Hi Christopher,

Christopher Baines <mail@cbaines.net> writes:

Toggle quote (23 lines)
> guix-commits@gnu.org writes:
>
>> apteryx pushed a commit to branch master
>> in repository guix.
>>
>> commit 223a3d7f7fdb6af9c4c090785cab15d38680e887
>> Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
>> AuthorDate: Mon Apr 4 00:06:48 2022 -0400
>>
>> gnu: git: Update to 2.35.1.
>>
>> * gnu/packages/version-control.scm (git): Update to 2.35.1.
>> [phases]: Delete trailing #t.
>>
>> Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
>> Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
>
> I've been looking in to this commit, since I noticed a large number of
> rebuilds.
>
> It looks connected to Greg's patch submitted in Issue #53751, but rather
> than being authored by Greg, it's authored by Maxim.

Hm, indeed, the author field should have been Greg Hogan; not sure what
happened there (I applied it with 'git am -3' as usual); hence my
sign-off in the commit message metadata. I'll pay more attention to
these in the future.

Toggle quote (6 lines)
> Additionally, I'm guessing that the changes in Greg's patch are much
> less impactful in terms of rebuilds compared to this commit, which also
> removes the trailing #t from the phases, which will have affected every
> variant of the git package, including variants like git-minimal/fixed,
> which as the commit in the code says, is intended to rarely change.

Greg had marked it for the staging branch, but my summary verification
led me to believe only 347 packages would be impacted for (which I remember
finding a bit surprising):

Toggle snippet (5 lines)
$ guix refresh --list-dependent git
Building the following 186 packages would ensure 347 dependent packages
are rebuilt: debops@1.1.0 git-repo@2.4.1 simavr@1.7 libjcat@0.1.9 [...]

and

Toggle snippet (5 lines)
$ guix refresh --list-dependent git-minimal Building the following 69
packages would ensure 213 dependent packages are rebuilt:
pplacer@1.1.alpha19 bap@2.0.0 [...]

But I missed the git-minimal/fixed variant. I should have tried the
'guix build libreoffice' test!

Toggle quote (4 lines)
> I'm all for making changes fast, but I'm not sure the removal of #t from
> the phases in thisq package definition is worth the cost of the
> thousands of package rebuilds on the master branch.

Yeah, I don't think it's worth it. Reverted it for now, and applied the
original version that didn't touch the trailing #t:

Toggle snippet (4 lines)
78e8c20179 origin/master gnu: git: Update to 2.35.1.
8a9bf794e1 Revert "gnu: git: Update to 2.35.1."

Thanks for the report, and sorry for the mess :-)

Maxim
?