GNU bug report logs - #77651
[PATCH c++-team 0/1] Update abseil-cpp.

Previous Next

To reply to this bug, email your comments to 77651 AT debbugs.gnu.org.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Greg Hogan <code <at> greghogan.com>
To: guix-patches <at> gnu.org
Cc: Greg Hogan <code <at> greghogan.com>
Subject: [PATCH c++-team 0/1] Update abseil-cpp.
Date: Tue,  8 Apr 2025 17:41:11 +0000

Tested with the following command:

./pre-inst-env guix build -P1 abseil-cpp abseil-cpp <at> 20220623 \
  -e '(@@ (gnu packages cpp) abseil-cpp-cxxstd11)'

The only failing build is sfizz, which currently fails and is outdated.

Greg Hogan (1):
  gnu: Update abseil-cpp and abseil-cpp-20220623.

 gnu/packages/cpp.scm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)


base-commit: 1dab24555a494beb3db5a335c675f07043e77f1c
-- 
2.49.0

Message #8 received at 77651 <at> debbugs.gnu.org (full text, mbox):

From: Greg Hogan <code <at> greghogan.com>
To: 77651 <at> debbugs.gnu.org
Cc: Greg Hogan <code <at> greghogan.com>
Subject: [PATCH c++-team 1/1] gnu: Update abseil-cpp and abseil-cpp-20220623.
Date: Tue,  8 Apr 2025 17:42:11 +0000

* gnu/packages/cpp.scm (abseil-cpp): Update to 20250127.1.
(abseil-cpp-20220623): Rename from abseil-cpp-20220623.1 and update to
20220623.2.

Change-Id: Ib695da324a70b0c55ec455b19861b7406ed44c9a
---
 gnu/packages/cpp.scm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 980d2a35b5..7deada2c68 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -1910,12 +1910,12 @@ (define-public abseil-cpp-20211102.0
          ((#:configure-flags flags)
           #~(cons* "-DCMAKE_CXX_STANDARD=11" #$flags)))))))
 
-(define-public abseil-cpp-20220623.1
+(define-public abseil-cpp-20220623
   (let ((base abseil-cpp-20200923.3))
     (package
       (inherit base)
       (name "abseil-cpp")
-      (version "20220623.1")
+      (version "20220623.2")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -1924,7 +1924,7 @@ (define-public abseil-cpp-20220623.1
                 (file-name (git-file-name name version))
                 (sha256
                  (base32
-                  "0vxh2a74g4s45yr8kdjqnzl64k10qdlc0hbnn987a4cnwdj4bp9r"))
+                  "1cmchfcqp85yp5hc3i47xv3i14v0f2wd5h2jblvcjjmjyhji1bwr"))
                 (patches
                  (search-patches "abseil-cpp-20220623.1-no-kepsilon-i686.patch"))))
       (arguments
@@ -1934,11 +1934,11 @@ (define-public abseil-cpp-20220623.1
                   (delete "-DABSL_RUN_TESTS=ON" ,flags))))))))
 
 (define-public abseil-cpp
-  (let ((base abseil-cpp-20220623.1))
+  (let ((base abseil-cpp-20220623))
     (package
       (inherit base)
       (name "abseil-cpp")
-      (version "20240722.0")
+      (version "20250127.1")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -1947,7 +1947,7 @@ (define-public abseil-cpp
                 (file-name (git-file-name name version))
                 (sha256
                  (base32
-                  "1pmrigimzic2k3ix3l81j2jpfgjgbajz0qbc5s57zljr2w7fjn77"))
+                  "0r2j360csym12jlgmcy92rgwdmng63shchxvfmln3j5402lv0g21"))
                 (patches
                  (search-patches "abseil-cpp-20220623.1-no-kepsilon-i686.patch"))))
       (arguments
@@ -2057,7 +2057,7 @@ (define-public abseil-cpp-cxxstd17
   (abseil-cpp-for-c++-standard abseil-cpp 17))  ;XXX: the default with GCC 11?
 
 (define-public abseil-cpp-cxxstd11
-  (abseil-cpp-for-c++-standard abseil-cpp-20220623.1 11)) ;last version on C++11
+  (abseil-cpp-for-c++-standard abseil-cpp-20220623 11)) ;last version on C++11
 
 (define-public static-abseil-cpp
   (make-static-abseil-cpp abseil-cpp))
-- 
2.49.0

Message #11 received at 77651 <at> debbugs.gnu.org (full text, mbox):

From: Andreas Enge <andreas <at> enge.fr>
To: Greg Hogan <code <at> greghogan.com>
Cc: 77651 <at> debbugs.gnu.org
Subject: Re: [PATCH c++-team 1/1] gnu: Update abseil-cpp and
 abseil-cpp-20220623.
Date: Tue, 8 Apr 2025 21:13:50 +0200

Hello Greg,

as usual, I would suggest a patch series of two commits, one per package;
these would be pushed together, so it does not really matter that both
need to be updated in lockstep. (This is not really different from what
is done on the python-team branch, for instance, where often updating
python-abc also requires to update python-xyz and python-123, but still
we use one commit per package.)

Andreas

Message #14 received at 77651 <at> debbugs.gnu.org (full text, mbox):

From: Greg Hogan <code <at> greghogan.com>
To: 77651 <at> debbugs.gnu.org
Cc: Greg Hogan <code <at> greghogan.com>
Subject: [PATCH v2 c++-team 2/3] gnu: abseil-cpp-20220623: Update to
 20220623.2.
Date: Tue,  8 Apr 2025 20:37:00 +0000

* gnu/packages/cpp.scm (abseil-cpp-20220623): Update to 20220623.2.

Change-Id: I85df8a18b4a2d46f9eaada60c7b1acade6a7d272
---
 gnu/packages/cpp.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index af52676e6d..336342e098 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -1915,7 +1915,7 @@ (define-public abseil-cpp-20220623
     (package
       (inherit base)
       (name "abseil-cpp")
-      (version "20220623.1")
+      (version "20220623.2")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -1924,7 +1924,7 @@ (define-public abseil-cpp-20220623
                 (file-name (git-file-name name version))
                 (sha256
                  (base32
-                  "0vxh2a74g4s45yr8kdjqnzl64k10qdlc0hbnn987a4cnwdj4bp9r"))
+                  "1cmchfcqp85yp5hc3i47xv3i14v0f2wd5h2jblvcjjmjyhji1bwr"))
                 (patches
                  (search-patches "abseil-cpp-20220623.1-no-kepsilon-i686.patch"))))
       (arguments
-- 
2.49.0

Message #17 received at 77651 <at> debbugs.gnu.org (full text, mbox):

From: Greg Hogan <code <at> greghogan.com>
To: 77651 <at> debbugs.gnu.org
Cc: Greg Hogan <code <at> greghogan.com>
Subject: [PATCH v2 c++-team 1/3] gnu: Rename abseil-cpp-20220623.1 to
 abseil-cpp-20220623.
Date: Tue,  8 Apr 2025 20:36:59 +0000

* gnu/packages/cpp.scm (abseil-cpp-20220623.1): Rename this ...
(abseil-cpp-20220623): ... to this.

Change-Id: I6448a9e43413154bd79072216908ca371a179aff
---
 gnu/packages/cpp.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 980d2a35b5..af52676e6d 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -1910,7 +1910,7 @@ (define-public abseil-cpp-20211102.0
          ((#:configure-flags flags)
           #~(cons* "-DCMAKE_CXX_STANDARD=11" #$flags)))))))
 
-(define-public abseil-cpp-20220623.1
+(define-public abseil-cpp-20220623
   (let ((base abseil-cpp-20200923.3))
     (package
       (inherit base)
@@ -1934,7 +1934,7 @@ (define-public abseil-cpp-20220623.1
                   (delete "-DABSL_RUN_TESTS=ON" ,flags))))))))
 
 (define-public abseil-cpp
-  (let ((base abseil-cpp-20220623.1))
+  (let ((base abseil-cpp-20220623))
     (package
       (inherit base)
       (name "abseil-cpp")
@@ -2057,7 +2057,7 @@ (define-public abseil-cpp-cxxstd17
   (abseil-cpp-for-c++-standard abseil-cpp 17))  ;XXX: the default with GCC 11?
 
 (define-public abseil-cpp-cxxstd11
-  (abseil-cpp-for-c++-standard abseil-cpp-20220623.1 11)) ;last version on C++11
+  (abseil-cpp-for-c++-standard abseil-cpp-20220623 11)) ;last version on C++11
 
 (define-public static-abseil-cpp
   (make-static-abseil-cpp abseil-cpp))

base-commit: 1dab24555a494beb3db5a335c675f07043e77f1c
-- 
2.49.0

Message #20 received at 77651 <at> debbugs.gnu.org (full text, mbox):

From: Greg Hogan <code <at> greghogan.com>
To: 77651 <at> debbugs.gnu.org
Cc: Greg Hogan <code <at> greghogan.com>
Subject: [PATCH v2 c++-team 3/3] gnu: abseil-cpp: Update to 20250127.1.
Date: Tue,  8 Apr 2025 20:37:01 +0000

* gnu/packages/cpp.scm (abseil-cpp): Update to 20250127.1.

Change-Id: I42fe68e1ae04825f8db1d1ec91b8d4e97f9c5c4c
---
 gnu/packages/cpp.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 336342e098..7deada2c68 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -1938,7 +1938,7 @@ (define-public abseil-cpp
     (package
       (inherit base)
       (name "abseil-cpp")
-      (version "20240722.0")
+      (version "20250127.1")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -1947,7 +1947,7 @@ (define-public abseil-cpp
                 (file-name (git-file-name name version))
                 (sha256
                  (base32
-                  "1pmrigimzic2k3ix3l81j2jpfgjgbajz0qbc5s57zljr2w7fjn77"))
+                  "0r2j360csym12jlgmcy92rgwdmng63shchxvfmln3j5402lv0g21"))
                 (patches
                  (search-patches "abseil-cpp-20220623.1-no-kepsilon-i686.patch"))))
       (arguments
-- 
2.49.0

Message #23 received at 77651 <at> debbugs.gnu.org (full text, mbox):

From: Greg Hogan <code <at> greghogan.com>
To: Andreas Enge <andreas <at> enge.fr>
Cc: 77651 <at> debbugs.gnu.org
Subject: Re: [PATCH c++-team 1/1] gnu: Update abseil-cpp and
 abseil-cpp-20220623.
Date: Tue, 8 Apr 2025 16:37:33 -0400

On Tue, Apr 8, 2025 at 3:14 PM Andreas Enge <andreas <at> enge.fr> wrote:
>
> Hello Greg,
>
> as usual, I would suggest a patch series of two commits, one per package;
> these would be pushed together, so it does not really matter that both
> need to be updated in lockstep.

This patch does break cleanly into three patches, one for the rename
and two for the simple updates.

> (This is not really different from what
> is done on the python-team branch, for instance, where often updating
> python-abc also requires to update python-xyz and python-123, but still
> we use one commit per package.)

You and Maxim should discuss this, whether in general it is preferred
to make one commit per package or to combine commits to prevent
breakage in between. The latter does better allow users to
time-machine anywhere in the history but can require very large
commits and that contributors track down and apply fixes on branches
at the point of the breaking change.

> Andreas

Greg

Message #26 received at 77651 <at> debbugs.gnu.org (full text, mbox):

From: Andreas Enge <andreas <at> enge.fr>
To: Greg Hogan <code <at> greghogan.com>
Cc: 77651 <at> debbugs.gnu.org
Subject: Re: [PATCH c++-team 1/1] gnu: Update abseil-cpp and
 abseil-cpp-20220623.
Date: Tue, 8 Apr 2025 22:40:58 +0200

Am Tue, Apr 08, 2025 at 04:37:33PM -0400 schrieb Greg Hogan:
> You and Maxim should discuss this, whether in general it is preferred
> to make one commit per package or to combine commits to prevent
> breakage in between.

Well, Guix practice, as far as I know, has always been to use one commit
per package. Did Maxim suggest otherwise, or why should we discuss it?

Andreas

Message #29 received at 77651 <at> debbugs.gnu.org (full text, mbox):

From: Greg Hogan <code <at> greghogan.com>
To: Andreas Enge <andreas <at> enge.fr>
Cc: 77651 <at> debbugs.gnu.org
Subject: Re: [PATCH c++-team 1/1] gnu: Update abseil-cpp and
 abseil-cpp-20220623.
Date: Wed, 9 Apr 2025 11:18:01 -0400

On Tue, Apr 8, 2025 at 4:41 PM Andreas Enge <andreas <at> enge.fr> wrote:
>
> Am Tue, Apr 08, 2025 at 04:37:33PM -0400 schrieb Greg Hogan:
> > You and Maxim should discuss this, whether in general it is preferred
> > to make one commit per package or to combine commits to prevent
> > breakage in between.
>
> Well, Guix practice, as far as I know, has always been to use one commit
> per package. Did Maxim suggest otherwise, or why should we discuss it?
>
> Andreas

Discussion was part of #76960: https://issues.guix.gnu.org/76960#24

And I think I understand Maxim's point of view and am in agreement at
some level. My chief remark is that I don't see the project following
this practice, and that it is largely impractical to do so. But
perhaps we should do more of this where we can. Or instead simply do
(on the order of) quarterly releases.

I have seen, and have been writing, single commits which apply the
same very simple changes to multiple packages (for example, from
#76960 the pinning of the spdlog input).

Greg

Message #32 received at 77651 <at> debbugs.gnu.org (full text, mbox):

From: Andreas Enge <andreas <at> enge.fr>
To: Greg Hogan <code <at> greghogan.com>
Cc: 77651 <at> debbugs.gnu.org
Subject: Re: [PATCH c++-team 1/1] gnu: Update abseil-cpp and
 abseil-cpp-20220623.
Date: Wed, 9 Apr 2025 17:49:12 +0200

Hello,

Am Wed, Apr 09, 2025 at 11:18:01AM -0400 schrieb Greg Hogan:
> I have seen, and have been writing, single commits which apply the
> same very simple changes to multiple packages (for example, from
> #76960 the pinning of the spdlog input).

I see; but think this is a different case. There you apply the same
change to different packages (swap one input for another one). One could
still do this one commit after another, but I also see the point in
doing a "mass" commit (well, I would rather do this if really many
packages were concerned).

In this case, you update two different packages to two different
versions. So I would argue that this is not the same situation, just
that they are linked. But this is also true when updating python-numpy
and following its dependency chain, and we do not use one giant commit
updating lots of packages in the python-team branch.

I would, however, combine your first two patches of the v2 :)
Your choice!

Andreas

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.