From debbugs-submit-bounces@debbugs.gnu.org Thu Feb 03 10:31:33 2022 Received: (at submit) by debbugs.gnu.org; 3 Feb 2022 15:31:33 +0000 Received: from localhost ([127.0.0.1]:57416 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nFe53-0005E4-Dv for submit@debbugs.gnu.org; Thu, 03 Feb 2022 10:31:33 -0500 Received: from lists.gnu.org ([209.51.188.17]:53374) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nFe51-0005Dt-13 for submit@debbugs.gnu.org; Thu, 03 Feb 2022 10:31:28 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51188) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nFe50-0004zz-KZ for guix-patches@gnu.org; Thu, 03 Feb 2022 10:31:26 -0500 Received: from [2607:f8b0:4864:20::441] (port=40814 helo=mail-pf1-x441.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nFe4w-0000ml-0b for guix-patches@gnu.org; Thu, 03 Feb 2022 10:31:26 -0500 Received: by mail-pf1-x441.google.com with SMTP id e6so2510814pfc.7 for ; Thu, 03 Feb 2022 07:31:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20210112.gappssmtp.com; s=20210112; h=mime-version:from:date:message-id:subject:to; bh=p/Yiwa+hHeYzKWiNALOQLJt061MGbue/UK9lnQyYfw0=; b=zptW6OnTTqRXpI9gWM7jaogh8fpYCWFNw6c4dueY9FcjGruemjq1CZetyeqR4LmB9U DHRoE1FptmgpHhpWH5UqHyBKkHk5WbAaAgb2Q3zwHBDE15cUQvwx9/Y9Gjl67CPZtY+z QTl3SkLBkttWCKe/lYn9q/XTXTyDE8TSwUMQ4w/JkWg9a3QGFwRyM6+/q0GFeIWUvOhD VOcXrVPNy2mpDJ2sdjmSZTYzi2m40NPZ56zMhiARWRuQcJngq/QxFzgcOIQqtuYTMYXu fxv21ZRTBbiicx5cp1TfHc8ZEtxAe+sdaFtmtsN3QdbeEE+V7QqyhXJLpgntuRVWL+Qe L0aQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=p/Yiwa+hHeYzKWiNALOQLJt061MGbue/UK9lnQyYfw0=; b=NhArdXg4z3mEUKDYJzB3lXJZyeCmdTawZkf+s0u4p24bggWQLq8CmFGRPhlhHVXP4H LytFhhgWC6tg6kH5y2TFvwvqBESPkO1hjtFs8moztQ60NXqFljIIleqPHb6igbmIu+Ww Kk8bG4QEK2Ddj23/5Wm0JC04X0dS72R0l3bsHplPLwXLR1nP+U0Br5SfZEn2diX7xFp3 jpiGK7pe84Og4TGbgosZ7B2nxI6hUJqaBTFMtRDtsSQAznROQKvh1SFjGCTnZcFr00xL aOqrLA6PBry6Pwy/InQH0o4j5G0GpxtJ0soxs+0tfQfhx9PC6Jt9AzSl9Zg0k2LjwO2A wu3w== X-Gm-Message-State: AOAM5314eCbI3pyR6dGsh7xj2Jke1JVanaMwo1OurzO09NA9ySLhynj0 P1DCJ3n7Ho6CXnhVfviKLPN4sB5vH1tmIwF84MI1WO+2HARoM6hOZM3rVQ== X-Google-Smtp-Source: ABdhPJzuG//BWHnKZksFMagBiFuEsfMY39oI2yD2GXAgLWRqYdXKoVAJJaHX1N51XsABahXu/OC/Qp+KK0DM73k3LsE= X-Received: by 2002:a63:d907:: with SMTP id r7mr28280559pgg.416.1643902274799; Thu, 03 Feb 2022 07:31:14 -0800 (PST) MIME-Version: 1.0 From: Greg Hogan Date: Thu, 3 Feb 2022 10:31:03 -0500 Message-ID: Subject: [PATCH staging] gnu: git: Update to 2.35.1. To: guix-patches@gnu.org Content-Type: multipart/mixed; boundary="00000000000022bbfc05d71ed32e" X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::441 (failed) Received-SPF: none client-ip=2607:f8b0:4864:20::441; envelope-from=code@greghogan.com; helo=mail-pf1-x441.google.com X-Spam_score_int: -10 X-Spam_score: -1.1 X-Spam_bar: - X-Spam_report: (-1.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, HTML_MESSAGE=0.001, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) --00000000000022bbfc05d71ed32e Content-Type: multipart/alternative; boundary="00000000000022bbfb05d71ed32c" --00000000000022bbfb05d71ed32c Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 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 =C2=A9 2020, 2021 Vinicius Monego ;;; Copyright =C2=A9 2020 Tanguy Le Carrour ;;; Copyright =C2=A9 2020, 2021 Michael Rohleder -;;; Copyright =C2=A9 2021 Greg Hogan +;;; Copyright =C2=A9 2021, 2022 Greg Hogan ;;; Copyright =C2=A9 2021 Maxim Cournoyer ;;; Copyright =C2=A9 2021 Chris Marusich ;;; Copyright =C2=A9 2021 L=C3=A9o 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) --=20 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)) --=20 2.34.0 --00000000000022bbfb05d71ed32c Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Tested build with dependent packages with 'git= 9; 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 5ed6fcda2fa6aff6e6c2a3a0b771153fad= 2f3633 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.

* g= nu/packages/version-control.scm (git): Update to 2.35.1.
---
=C2=A0gn= u/packages/version-control.scm | 8 ++++----
=C2=A01 file changed, 4 inse= rtions(+), 4 deletions(-)

diff --git a/gnu/packages/version-control.= scm b/gnu/packages/version-control.scm
index 95287c7c69..797c9437f9 1006= 44
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-= control.scm
@@ -32,7 +32,7 @@
=C2=A0;;; Copyright =C2=A9 2020, 2021 V= inicius Monego <monego@posteo.net>
=C2=A0;;; Copyright =C2=A9 2020 Tanguy Le Carrour <tanguy@bioneland.org>
=C2=A0;;; Copy= right =C2=A9 2020, 2021 Michael Rohleder <mike@rohleder.de>
-;;; Copyright =C2=A9 2021 Greg Hogan <= ;code@greghogan.com>
+;;; C= opyright =C2=A9 2021, 2022 Greg Hogan <code@greghogan.com>
=C2=A0;;; Copyright =C2=A9 2021 Maxim Co= urnoyer <maxim.cournoyer@gm= ail.com>
=C2=A0;;; Copyright =C2=A9 2021 Chris Marusich <cmmarusich@gmail.com>
=C2=A0;;= ; Copyright =C2=A9 2021 L=C3=A9o Le Bouter <lle-bout@zaclys.net>
@@ -219,14 +219,14 @@ (define git= -cross-configure-flags
=C2=A0(define-public git
=C2=A0 =C2=A0(package=
=C2=A0 =C2=A0 (name "git")
- =C2=A0 (version "2.34.1&= quot;)
+ =C2=A0 (version "2.35.1")
=C2=A0 =C2=A0 (source (o= rigin
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(method url-fetch)=
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(uri (string-append &qu= ot;mirror://kernel.org/= software/scm/git/git-"
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0version ".tar.xz"))
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0(sha256
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (b= ase32
- =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"0b40vf315s= 1kz65x1wq47g8srl4wqac39pwnvlj1mdzs3kfma1rs"))))
+ =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"100h37cpw49pmlpf6lcpm1xi578gllf6y9in60= h5mxj3cj754s6p"))))
=C2=A0 =C2=A0 (build-system gnu-build-system)=C2=A0 =C2=A0 (native-inputs
=C2=A0 =C2=A0 =C2=A0`(("native-perl&= quot; ,perl)
@@ -246,7 +246,7 @@ (define-public git
=C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0version ".tar.xz"))<= br>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(sha256
=C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 (base32
- =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0"1f3y7hxvs9p00wwwi8zdn0sgn6nh1pgg1fdsnz2bq8gzfbbmsqww"))))
= + =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"00rqdj2bc3i7pfc16pciiz50ww= 41jkqg18iy5hi5jnf0y98sgqz4"))))
=C2=A0 =C2=A0 =C2=A0 =C2=A0;; For s= ubtree documentation.
=C2=A0 =C2=A0 =C2=A0 =C2=A0("asciidoc" ,= asciidoc)
=C2=A0 =C2=A0 =C2=A0 =C2=A0("docbook-xsl" ,docbook-x= sl)
--
2.34.0

From 6fbb70ce36a290a1a475eaa88bc86a0024917ba6 M= on Sep 17 00:00:00 2001
From: Greg Hogan <code@greghogan.com>
Date: Thu, 3 Feb 2022 15:24:22 +00= 00
Subject: [PATCH 2/2] gnu: stgit: Update to 1.5.

* gnu/packages= /version-control.scm (stgit): Update to 1.5.
---
=C2=A0gnu/packages/v= ersion-control.scm | 4 ++--
=C2=A01 file changed, 2 insertions(+), 2 del= etions(-)

diff --git a/gnu/packages/version-control.scm b/gnu/packag= es/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
=C2=A0(define-public stgit<= br>=C2=A0 =C2=A0(package
=C2=A0 =C2=A0 =C2=A0(name "stgit")- =C2=A0 =C2=A0(version "1.1")
+ =C2=A0 =C2=A0(version "= 1.5")
=C2=A0 =C2=A0 =C2=A0(source
=C2=A0 =C2=A0 =C2=A0 (origin=C2=A0 =C2=A0 =C2=A0 =C2=A0 (method git-fetch)
@@ -1329,7 +1329,7 @@ (= define-public stgit
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (co= mmit (string-append "v" version))))
=C2=A0 =C2=A0 =C2=A0 =C2= =A0 (file-name (git-file-name name version))
=C2=A0 =C2=A0 =C2=A0 =C2=A0= (sha256
- =C2=A0 =C2=A0 =C2=A0 =C2=A0(base32 "1jp74qsgw3f9c8xgaaqv= mhfh4ar3n1ns5ncm8glvqyywlxldxi0n"))))
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0= (base32 "1igljjpdgl4na1a5hi0nmg36ph0hw6hw8hhq5436fgcl8yjimyz3")))= )
=C2=A0 =C2=A0 =C2=A0(build-system python-build-system)
=C2=A0 =C2= =A0 =C2=A0(native-inputs
=C2=A0 =C2=A0 =C2=A0 (list perl))
--
2.3= 4.0
--00000000000022bbfb05d71ed32c-- --00000000000022bbfc05d71ed32e Content-Type: text/x-patch; charset="UTF-8"; name="0001-gnu-git-Update-to-2.35.1.patch" Content-Disposition: attachment; filename="0001-gnu-git-Update-to-2.35.1.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_kz74u16y0 RnJvbSA1ZWQ2ZmNkYTJmYTZhZmY2ZTZjMmEzYTBiNzcxMTUzZmFkMmYzNjMzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBHcmVnIEhvZ2FuIDxjb2RlQGdyZWdob2dhbi5jb20+CkRhdGU6 IFRodSwgMyBGZWIgMjAyMiAxMzoyNTo1MSArMDAwMApTdWJqZWN0OiBbUEFUQ0ggMS8yXSBnbnU6 IGdpdDogVXBkYXRlIHRvIDIuMzUuMS4KCiogZ251L3BhY2thZ2VzL3ZlcnNpb24tY29udHJvbC5z Y20gKGdpdCk6IFVwZGF0ZSB0byAyLjM1LjEuCi0tLQogZ251L3BhY2thZ2VzL3ZlcnNpb24tY29u dHJvbC5zY20gfCA4ICsrKystLS0tCiAxIGZpbGUgY2hhbmdlZCwgNCBpbnNlcnRpb25zKCspLCA0 IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdlcy92ZXJzaW9uLWNvbnRyb2wu c2NtIGIvZ251L3BhY2thZ2VzL3ZlcnNpb24tY29udHJvbC5zY20KaW5kZXggOTUyODdjN2M2OS4u Nzk3Yzk0MzdmOSAxMDA2NDQKLS0tIGEvZ251L3BhY2thZ2VzL3ZlcnNpb24tY29udHJvbC5zY20K KysrIGIvZ251L3BhY2thZ2VzL3ZlcnNpb24tY29udHJvbC5zY20KQEAgLTMyLDcgKzMyLDcgQEAK IDs7OyBDb3B5cmlnaHQgwqkgMjAyMCwgMjAyMSBWaW5pY2l1cyBNb25lZ28gPG1vbmVnb0Bwb3N0 ZW8ubmV0PgogOzs7IENvcHlyaWdodCDCqSAyMDIwIFRhbmd1eSBMZSBDYXJyb3VyIDx0YW5ndXlA YmlvbmVsYW5kLm9yZz4KIDs7OyBDb3B5cmlnaHQgwqkgMjAyMCwgMjAyMSBNaWNoYWVsIFJvaGxl ZGVyIDxtaWtlQHJvaGxlZGVyLmRlPgotOzs7IENvcHlyaWdodCDCqSAyMDIxIEdyZWcgSG9nYW4g PGNvZGVAZ3JlZ2hvZ2FuLmNvbT4KKzs7OyBDb3B5cmlnaHQgwqkgMjAyMSwgMjAyMiBHcmVnIEhv Z2FuIDxjb2RlQGdyZWdob2dhbi5jb20+CiA7OzsgQ29weXJpZ2h0IMKpIDIwMjEgTWF4aW0gQ291 cm5veWVyIDxtYXhpbS5jb3Vybm95ZXJAZ21haWwuY29tPgogOzs7IENvcHlyaWdodCDCqSAyMDIx IENocmlzIE1hcnVzaWNoIDxjbW1hcnVzaWNoQGdtYWlsLmNvbT4KIDs7OyBDb3B5cmlnaHQgwqkg MjAyMSBMw6lvIExlIEJvdXRlciA8bGxlLWJvdXRAemFjbHlzLm5ldD4KQEAgLTIxOSwxNCArMjE5 LDE0IEBAIChkZWZpbmUgZ2l0LWNyb3NzLWNvbmZpZ3VyZS1mbGFncwogKGRlZmluZS1wdWJsaWMg Z2l0CiAgIChwYWNrYWdlCiAgICAobmFtZSAiZ2l0IikKLSAgICh2ZXJzaW9uICIyLjM0LjEiKQor ICAgKHZlcnNpb24gIjIuMzUuMSIpCiAgICAoc291cmNlIChvcmlnaW4KICAgICAgICAgICAgICht ZXRob2QgdXJsLWZldGNoKQogICAgICAgICAgICAgKHVyaSAoc3RyaW5nLWFwcGVuZCAibWlycm9y Oi8va2VybmVsLm9yZy9zb2Z0d2FyZS9zY20vZ2l0L2dpdC0iCiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHZlcnNpb24gIi50YXIueHoiKSkKICAgICAgICAgICAgIChzaGEyNTYKICAg ICAgICAgICAgICAoYmFzZTMyCi0gICAgICAgICAgICAgICIwYjQwdmYzMTVzMWt6NjV4MXdxNDdn OHNybDR3cWFjMzlwd252bGoxbWR6czNrZm1hMXJzIikpKSkKKyAgICAgICAgICAgICAgIjEwMGgz N2NwdzQ5cG1scGY2bGNwbTF4aTU3OGdsbGY2eTlpbjYwaDVteGozY2o3NTRzNnAiKSkpKQogICAg KGJ1aWxkLXN5c3RlbSBnbnUtYnVpbGQtc3lzdGVtKQogICAgKG5hdGl2ZS1pbnB1dHMKICAgICBg KCgibmF0aXZlLXBlcmwiICxwZXJsKQpAQCAtMjQ2LDcgKzI0Niw3IEBAIChkZWZpbmUtcHVibGlj IGdpdAogICAgICAgICAgICAgICAgIHZlcnNpb24gIi50YXIueHoiKSkKICAgICAgICAgICAoc2hh MjU2CiAgICAgICAgICAgIChiYXNlMzIKLSAgICAgICAgICAgICIxZjN5N2h4dnM5cDAwd3d3aTh6 ZG4wc2duNm5oMXBnZzFmZHNuejJicThnemZiYm1zcXd3IikpKSkKKyAgICAgICAgICAgICIwMHJx ZGoyYmMzaTdwZmMxNnBjaWl6NTB3dzQxamtxZzE4aXk1aGk1am5mMHk5OHNncXo0IikpKSkKICAg ICAgIDs7IEZvciBzdWJ0cmVlIGRvY3VtZW50YXRpb24uCiAgICAgICAoImFzY2lpZG9jIiAsYXNj aWlkb2MpCiAgICAgICAoImRvY2Jvb2steHNsIiAsZG9jYm9vay14c2wpCi0tIAoyLjM0LjAKCg== --00000000000022bbfc05d71ed32e Content-Type: text/x-patch; charset="US-ASCII"; name="0002-gnu-stgit-Update-to-1.5.patch" Content-Disposition: attachment; filename="0002-gnu-stgit-Update-to-1.5.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_kz74u17s1 RnJvbSA2ZmJiNzBjZTM2YTI5MGExYTQ3NWVhYTg4YmM4NmEwMDI0OTE3YmE2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBHcmVnIEhvZ2FuIDxjb2RlQGdyZWdob2dhbi5jb20+CkRhdGU6 IFRodSwgMyBGZWIgMjAyMiAxNToyNDoyMiArMDAwMApTdWJqZWN0OiBbUEFUQ0ggMi8yXSBnbnU6 IHN0Z2l0OiBVcGRhdGUgdG8gMS41LgoKKiBnbnUvcGFja2FnZXMvdmVyc2lvbi1jb250cm9sLnNj bSAoc3RnaXQpOiBVcGRhdGUgdG8gMS41LgotLS0KIGdudS9wYWNrYWdlcy92ZXJzaW9uLWNvbnRy b2wuc2NtIHwgNCArKy0tCiAxIGZpbGUgY2hhbmdlZCwgMiBpbnNlcnRpb25zKCspLCAyIGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdlcy92ZXJzaW9uLWNvbnRyb2wuc2NtIGIv Z251L3BhY2thZ2VzL3ZlcnNpb24tY29udHJvbC5zY20KaW5kZXggNzk3Yzk0MzdmOS4uZTI4MzQ5 Mjk5YiAxMDA2NDQKLS0tIGEvZ251L3BhY2thZ2VzL3ZlcnNpb24tY29udHJvbC5zY20KKysrIGIv Z251L3BhY2thZ2VzL3ZlcnNpb24tY29udHJvbC5zY20KQEAgLTEzMjAsNyArMTMyMCw3IEBAIChk ZWZpbmUtcHVibGljIGdpdC1mbG93CiAoZGVmaW5lLXB1YmxpYyBzdGdpdAogICAocGFja2FnZQog ICAgIChuYW1lICJzdGdpdCIpCi0gICAgKHZlcnNpb24gIjEuMSIpCisgICAgKHZlcnNpb24gIjEu NSIpCiAgICAgKHNvdXJjZQogICAgICAob3JpZ2luCiAgICAgICAgKG1ldGhvZCBnaXQtZmV0Y2gp CkBAIC0xMzI5LDcgKzEzMjksNyBAQCAoZGVmaW5lLXB1YmxpYyBzdGdpdAogICAgICAgICAgICAg IChjb21taXQgKHN0cmluZy1hcHBlbmQgInYiIHZlcnNpb24pKSkpCiAgICAgICAgKGZpbGUtbmFt ZSAoZ2l0LWZpbGUtbmFtZSBuYW1lIHZlcnNpb24pKQogICAgICAgIChzaGEyNTYKLSAgICAgICAg KGJhc2UzMiAiMWpwNzRxc2d3M2Y5Yzh4Z2FhcXZtaGZoNGFyM24xbnM1bmNtOGdsdnF5eXdseGxk eGkwbiIpKSkpCisgICAgICAgIChiYXNlMzIgIjFpZ2xqanBkZ2w0bmExYTVoaTBubWczNnBoMGh3 Nmh3OGhocTU0MzZmZ2NsOHlqaW15ejMiKSkpKQogICAgIChidWlsZC1zeXN0ZW0gcHl0aG9uLWJ1 aWxkLXN5c3RlbSkKICAgICAobmF0aXZlLWlucHV0cwogICAgICAobGlzdCBwZXJsKSkKLS0gCjIu MzQuMAoK --00000000000022bbfc05d71ed32e-- From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 04 00:25:19 2022 Received: (at 53751-done) by debbugs.gnu.org; 4 Apr 2022 04:25:19 +0000 Received: from localhost ([127.0.0.1]:50147 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nbEHG-0008I2-TT for submit@debbugs.gnu.org; Mon, 04 Apr 2022 00:25:19 -0400 Received: from mail-qv1-f44.google.com ([209.85.219.44]:43759) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nbEHF-0008Hp-M5 for 53751-done@debbugs.gnu.org; Mon, 04 Apr 2022 00:25:18 -0400 Received: by mail-qv1-f44.google.com with SMTP id f3so6589251qvz.10 for <53751-done@debbugs.gnu.org>; Sun, 03 Apr 2022 21:25:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=niX+UaUE5gEnXkkoFP4bNdiLywshGalXR2UsgBVN1/o=; b=I2aGJgd+3NxkBp19aKF9ZXfJK1dHCf7/5gfan6XyH2FYxVDAJfaW+dX3spCn3S3Oaz YUifVFyX1Lk2iB0eMw3snXutAEjtqNROjTvz2e8+U/nFbc1a8UBRryPi/oFsqdz5OHkW kAuVmrKvLAb04egft99yJ7zBpjQNVmwR9F9anGtxXcsD2PDzGMLaS3jcfK3xz2wyLJF7 ctd+hYyUQXyNR+vXMlY+sK0cUHNC//fVs4UV6Ae07/FCWrEyto4oXw4xbJfl5YOyK/x6 wOpMQofzsgttRS6cKdrTLly5ZGcjKnuRBSpdk0TSF7XoKOTVTmK/3cWsdOaEJMqV4O6A c+og== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=niX+UaUE5gEnXkkoFP4bNdiLywshGalXR2UsgBVN1/o=; b=RzfjZuKCVYBKFMDLAmsxBsSHqMD/wDH0q+dw/FmZC6HTXC2wpyQm3odhvh2Aesttv8 o6d5FPt9p1/YQP2MRi+BnxqpsP0Hc7MOUrxT78zFiKO8+uAlNSWRyW/GvECevr/1KoU/ /0I1xLKKxqBk80Q2DcTmqHJEDzUWlHQdYUDoYjlK3s49DWpHxPhklRL6IVs935kTCYgC iO/872CpF7WEDylKeINPry/9duXLH9P1FVeVv+CgPPU542d+cQsLj4SVYDIG2fVur3YM 0NvE3sftRnKAlXYORCfdao9vK1CdR4D2wWDCYpMfRUjzoNZ6Zia9wD69BVYrjcz23q8l KOdA== X-Gm-Message-State: AOAM531mj7+LCViixBCnNGflxxACLT2RYXWPnenrcNb5guw2+G0q2grQ fFpNinH83ehaRTniZvmNZba1KrwSnO97UQ== X-Google-Smtp-Source: ABdhPJzgWkBUL8PWTVlxnjhndC3824fNpxie7dKk2zJMgIoAewzmwDfQ39x/6cwoIU5EZB/dwALiAg== X-Received: by 2002:ad4:5d48:0:b0:440:ef43:3667 with SMTP id jk8-20020ad45d48000000b00440ef433667mr15870277qvb.110.1649046312078; Sun, 03 Apr 2022 21:25:12 -0700 (PDT) Received: from hurd (dsl-154-119.b2b2c.ca. [66.158.154.119]) by smtp.gmail.com with ESMTPSA id u129-20020a376087000000b0067e401d7177sm5928043qkb.3.2022.04.03.21.25.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Apr 2022 21:25:11 -0700 (PDT) From: Maxim Cournoyer To: Greg Hogan Subject: Re: bug#53751: [PATCH staging] gnu: git: Update to 2.35.1. References: Date: Mon, 04 Apr 2022 00:25:10 -0400 In-Reply-To: (Greg Hogan's message of "Thu, 3 Feb 2022 10:31:03 -0500") Message-ID: <874k391nmh.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53751-done Cc: 53751-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello, Greg Hogan 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 From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 05 05:31:27 2022 Received: (at 53751) by debbugs.gnu.org; 5 Apr 2022 09:31:27 +0000 Received: from localhost ([127.0.0.1]:53761 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nbfX5-0003qI-47 for submit@debbugs.gnu.org; Tue, 05 Apr 2022 05:31:27 -0400 Received: from mira.cbaines.net ([212.71.252.8]:41290) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nbfX3-0003qB-6R for 53751@debbugs.gnu.org; Tue, 05 Apr 2022 05:31:25 -0400 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:54d1:d5d4:280e:f699]) by mira.cbaines.net (Postfix) with ESMTPSA id 075E027BBE9; Tue, 5 Apr 2022 10:31:23 +0100 (BST) Received: from felis (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 6619ea78; Tue, 5 Apr 2022 09:31:23 +0000 (UTC) References: <164904612874.946.17349166055621457713@vcs2.savannah.gnu.org> <20220404042210.082F1C01684@vcs2.savannah.gnu.org> User-agent: mu4e 1.6.10; emacs 27.2 From: Christopher Baines To: Maxim Cournoyer Subject: Re: 06/07: gnu: git: Update to 2.35.1. Date: Tue, 05 Apr 2022 10:23:38 +0100 In-reply-to: <20220404042210.082F1C01684@vcs2.savannah.gnu.org> Message-ID: <87zgkzop06.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53751 Cc: guix-devel@gnu.org, 53751@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain guix-commits@gnu.org writes: > apteryx pushed a commit to branch master > in repository guix. > > commit 223a3d7f7fdb6af9c4c090785cab15d38680e887 > Author: Maxim Cournoyer > 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 > Modified-by: Maxim Cournoyer 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. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----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----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 05 09:00:21 2022 Received: (at 53751) by debbugs.gnu.org; 5 Apr 2022 13:00:21 +0000 Received: from localhost ([127.0.0.1]:54075 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nbinE-0003y4-RS for submit@debbugs.gnu.org; Tue, 05 Apr 2022 09:00:21 -0400 Received: from mail-qt1-f169.google.com ([209.85.160.169]:44735) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nbinB-0003xh-GQ for 53751@debbugs.gnu.org; Tue, 05 Apr 2022 09:00:19 -0400 Received: by mail-qt1-f169.google.com with SMTP id 10so10780864qtz.11 for <53751@debbugs.gnu.org>; Tue, 05 Apr 2022 06:00:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=UgSg0bwVrQZxF7H6tq0OvHhZdZWm7R3Szh3r4ZBepfw=; b=qkCVvDR5bEX8hpjFFWnA9FsQOpvCjJZsGe2bv6asCTcVMQPUzLQiGi/IXbGnOZ6xX0 nokvvqGX4ndfM22XKcBcAY8aJwb4e6h0bLpmYn21P+IZ/YZNYZQICrfYfFT4+4DRhoGp FJBQy1MZaoaYfoAVECckwrSCFP+7WEOXCu7qUcetsn0SODH28fTxnEFckqPfB80RpRzu q5Thw+CNt7a1MNSztfyNfE6hNbNNA5zyD6wIBi7NPR9TPcvvFD18UFuIo5yILwTmfwYd s188+pGUNXEXBzQJPsXSUweOuhKDEjMGSLGd5yfkwLLe1tzXde2+d6aWunNaZKDLcccx ROVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=UgSg0bwVrQZxF7H6tq0OvHhZdZWm7R3Szh3r4ZBepfw=; b=mb1U7WQ2N4h//yrs26TUK7QvItHp5kX+HgqFz8t8Z6wo+MJHrSB2byKKUV/gegs0Bq ifumaY0Zz/Uvo1pOT25Pif690iJXSOyplRaQAUr57RjvVgOroEcroCF2QpwWATedsoyn /Oazh/dgaQTFwrfjUyiDShhOk3Xj2/m2jCqX6v82IJxTHbheeFLQtcV8MPQCRIh7QJX8 +ttecF1cQmVotWUhCmwi+qtj843kc//V+hJjcl0/mWbRTpNai6clDkClP8Sy2Ba+rkz1 9gImN+N9OBoM6EkjhwwrnZLQCRGNaNsikjdwhatWF6UQFLzvu+sFl4MJWvgCi5VmhZls QnMA== X-Gm-Message-State: AOAM531c9XTOKONox0rOYyeQH5f2GUrZ4ME7Nsi9Nozax62KAw0Aqojs LHewOcddPBnoIw3ucx8ZBflAe4w38RI= X-Google-Smtp-Source: ABdhPJw3xG99jK7hOVLMMLMK00wFYZD+MTCZxhZeMUdRGqGVba01UU0FVj3AtYHYMlt+qN5LI1kKrQ== X-Received: by 2002:ac8:7c45:0:b0:2e2:293a:7966 with SMTP id o5-20020ac87c45000000b002e2293a7966mr2773582qtv.478.1649163608444; Tue, 05 Apr 2022 06:00:08 -0700 (PDT) Received: from hurd (dsl-10-136-94.b2b2c.ca. [72.10.136.94]) by smtp.gmail.com with ESMTPSA id e7-20020ac85987000000b002e1b7fa2201sm10741576qte.56.2022.04.05.06.00.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Apr 2022 06:00:07 -0700 (PDT) From: Maxim Cournoyer To: Christopher Baines Subject: Re: 06/07: gnu: git: Update to 2.35.1. References: <164904612874.946.17349166055621457713@vcs2.savannah.gnu.org> <20220404042210.082F1C01684@vcs2.savannah.gnu.org> <87zgkzop06.fsf@cbaines.net> Date: Tue, 05 Apr 2022 09:00:05 -0400 In-Reply-To: <87zgkzop06.fsf@cbaines.net> (Christopher Baines's message of "Tue, 05 Apr 2022 10:23:38 +0100") Message-ID: <874k37znvu.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53751 Cc: guix-devel@gnu.org, 53751@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Christopher, Christopher Baines writes: > guix-commits@gnu.org writes: > >> apteryx pushed a commit to branch master >> in repository guix. >> >> commit 223a3d7f7fdb6af9c4c090785cab15d38680e887 >> Author: Maxim Cournoyer >> 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 >> Modified-by: Maxim Cournoyer > > 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. > 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): --8<---------------cut here---------------start------------->8--- $ 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 [...] --8<---------------cut here---------------end--------------->8--- and --8<---------------cut here---------------start------------->8--- $ 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 [...] --8<---------------cut here---------------end--------------->8--- But I missed the git-minimal/fixed variant. I should have tried the 'guix build libreoffice' test! > 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: --8<---------------cut here---------------start------------->8--- 78e8c20179 origin/master gnu: git: Update to 2.35.1. 8a9bf794e1 Revert "gnu: git: Update to 2.35.1." --8<---------------cut here---------------end--------------->8--- Thanks for the report, and sorry for the mess :-) Maxim From unknown Sat Aug 09 13:00:14 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 04 May 2022 11:24:09 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator