GNU bug report logs - #78094
[PATCH 0/2] gnu: cni-plugins: Update to 1.7.1.

Previous Next

To reply to this bug, email your comments to 78094 AT debbugs.gnu.org.
There is no need to reopen the bug first.

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

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

From: Tomas Volf <~@wolfsden.cz>
To: guix-patches <at> gnu.org
Cc: Tomas Volf <~@wolfsden.cz>
Subject: [PATCH 0/2] gnu: cni-plugins: Update to 1.7.1.
Date: Sun, 27 Apr 2025 14:31:47 +0200

Add go-1.24 and use it to update cni-plugins.

Tomas Volf (2):
  gnu: Add go-1.24.
  gnu: cni-plugins: Update to 1.7.1.

 gnu/packages/containers.scm |  7 ++++---
 gnu/packages/golang.scm     | 19 +++++++++++++++++++
 2 files changed, 23 insertions(+), 3 deletions(-)

--
2.49.0

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

From: Tomas Volf <~@wolfsden.cz>
To: 78094 <at> debbugs.gnu.org
Cc: Tomas Volf <~@wolfsden.cz>
Subject: [PATCH 1/2] gnu: Add go-1.24.
Date: Sun, 27 Apr 2025 14:34:59 +0200

* gnu/packages/golang.scm (go-1.24): New variable.
(go-std-1.24): New variable.

Change-Id: I054c910af5b0a22934892a232b42fb92fc47d80d
---
 gnu/packages/golang.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 791e2db9f9..3146b0c905 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -1039,6 +1039,24 @@ (define-public go-1.23
        (sha256
         (base32 "0iffjgsmh4ilc1r30zbidqvxz2dd8k0sml5rzzk1k4wkab0cjw0i"))))))
 
+(define-public go-1.24
+  (package
+    (inherit go-1.23)
+    (name "go")
+    (version "1.24.2")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/golang/go")
+             (commit (string-append "go" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "199yajw3amvspl9k2a75v4jblwr965laqngxbnsi5l3ragp5c1ck"))))
+    (native-inputs
+     ;; Go 1.24 and later requires Go 1.22 or later.
+     (alist-replace "go" (list go-1.23) (package-native-inputs go-1.23)))))
+
 ;;
 ;; Default Golang version used in guix/build-system/go.scm to build packages.
 ;;
@@ -1086,6 +1104,7 @@ (define-public go-std-1.20 (make-go-std go-1.20))
 (define-public go-std-1.21 (make-go-std go-1.21))
 (define-public go-std-1.22 (make-go-std go-1.22))
 (define-public go-std-1.23 (make-go-std go-1.23))
+(define-public go-std-1.24 (make-go-std go-1.24))
 
 (define-public go-0xacab-org-leap-shapeshifter
   (let ((commit "0aa6226582efb8e563540ec1d3c5cfcd19200474")
-- 
2.49.0

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

From: Tomas Volf <~@wolfsden.cz>
To: 78094 <at> debbugs.gnu.org
Cc: Tomas Volf <~@wolfsden.cz>
Subject: [PATCH 2/2] gnu: cni-plugins: Update to 1.7.1.
Date: Sun, 27 Apr 2025 14:35:00 +0200

* gnu/packages/containers.scm (cni-plugins)[version]: Update to 1.7.1.
[arguments]<#:go>: Set to go-1.24.

Change-Id: I0c28e224501ea0e67cde8104d8bfa573751f4c9b
---
 gnu/packages/containers.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm
index cc5a3a82f0..66a5918840 100644
--- a/gnu/packages/containers.scm
+++ b/gnu/packages/containers.scm
@@ -342,7 +342,7 @@ (define-public passt
 (define-public cni-plugins
   (package
     (name "cni-plugins")
-    (version "1.6.1")
+    (version "1.7.1")
     (source
      (origin
        (method git-fetch)
@@ -350,12 +350,13 @@ (define-public cni-plugins
              (url "https://github.com/containernetworking/plugins")
              (commit (string-append "v" version))))
        (sha256
-        (base32 "164savm1iic5ax2xi4zgy9lm7wk8kjy22n4is463lj9rkbp4s6xn"))
+        (base32 "04acfjkc3z2yf85z0v1mlgj0fqy032dsklzik2g1cnz6ncw6jl2b"))
        (file-name (git-file-name name version))))
     (build-system go-build-system)
     (arguments
      `(#:unpack-path "github.com/containernetworking/plugins"
        #:tests? #f ; XXX: see stat /var/run below
+       #:go ,go-1.24
        #:phases (modify-phases %standard-phases
                   (replace 'build
                     (lambda _
@@ -364,7 +365,7 @@ (define-public cni-plugins
                         (invoke "./build_linux.sh"))))
                   (replace 'check
                     (lambda* (#:key tests? #:allow-other-keys)
-                      ; only pkg/ns tests run without root
+                      ;; Only pkg/ns tests run without root.
                       (when tests?
                         (with-directory-excursion
                             "src/github.com/containernetworking/plugins/pkg/ns"
-- 
2.49.0

Message #16 received at 78094-done <at> debbugs.gnu.org (full text, mbox):

From: Sharlatan Hellseher <sharlatanus <at> gmail.com>
To: 78094-done <at> debbugs.gnu.org
Cc: Tomas Volf <~@wolfsden.cz>,
 Katherine Cox-Buday <cox.katherine.e+guix <at> gmail.com>
Subject: Re: [bug#78094] [PATCH 1/2] gnu: Add go-1.24.
Date: Sun, 27 Apr 2025 17:31:54 +0100

[Message part 1 (text/plain, inline)]

Hi,



There is go-1.24 on go-team, waiting for the merge.

Thanks

VCS: https://github.incerto.xyz/; https://git.sr.ht/~hellseher/
GPG: 9847 81DE 689C 21C2 6418 0867 76D7 27BF F62C D2B5

… наш разум - превосходная объяснительная машина которая способна найти
смысл почти в чем угодно, истолковать любой феномен, но совершенно не в
состоянии принять мысль о непредсказуемости.

On Sun, 27 Apr 2025, 13:37 Tomas Volf, <~@wolfsden.cz> wrote:

> * gnu/packages/golang.scm (go-1.24): New variable.
> (go-std-1.24): New variable.
>
> Change-Id: I054c910af5b0a22934892a232b42fb92fc47d80d
> ---
>  gnu/packages/golang.scm | 19 +++++++++++++++++++
>  1 file changed, 19 insertions(+)
>
> diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
> index 791e2db9f9..3146b0c905 100644
> --- a/gnu/packages/golang.scm
> +++ b/gnu/packages/golang.scm
> @@ -1039,6 +1039,24 @@ (define-public go-1.23
>         (sha256
>          (base32
> "0iffjgsmh4ilc1r30zbidqvxz2dd8k0sml5rzzk1k4wkab0cjw0i"))))))
>
> +(define-public go-1.24
> +  (package
> +    (inherit go-1.23)
> +    (name "go")
> +    (version "1.24.2")
> +    (source
> +     (origin
> +       (method git-fetch)
> +       (uri (git-reference
> +             (url "https://github.com/golang/go")
> +             (commit (string-append "go" version))))
> +       (file-name (git-file-name name version))
> +       (sha256
> +        (base32 "199yajw3amvspl9k2a75v4jblwr965laqngxbnsi5l3ragp5c1ck"))))
> +    (native-inputs
> +     ;; Go 1.24 and later requires Go 1.22 or later.
> +     (alist-replace "go" (list go-1.23) (package-native-inputs
> go-1.23)))))
> +
>  ;;
>  ;; Default Golang version used in guix/build-system/go.scm to build
> packages.
>  ;;
> @@ -1086,6 +1104,7 @@ (define-public go-std-1.20 (make-go-std go-1.20))
>  (define-public go-std-1.21 (make-go-std go-1.21))
>  (define-public go-std-1.22 (make-go-std go-1.22))
>  (define-public go-std-1.23 (make-go-std go-1.23))
> +(define-public go-std-1.24 (make-go-std go-1.24))
>
>  (define-public go-0xacab-org-leap-shapeshifter
>    (let ((commit "0aa6226582efb8e563540ec1d3c5cfcd19200474")
> --
> 2.49.0
>
>
>
>

[Message part 2 (text/html, inline)]

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

From: Tomas Volf <~@wolfsden.cz>
To: Sharlatan Hellseher <sharlatanus <at> gmail.com>
Cc: Katherine Cox-Buday <cox.katherine.e+guix <at> gmail.com>, 78094 <at> debbugs.gnu.org
Subject: Re: [bug#78094] [PATCH 1/2] gnu: Add go-1.24.
Date: Sun, 27 Apr 2025 19:01:01 +0200

Sharlatan Hellseher <sharlatanus <at> gmail.com> writes:

> Hi,
>
>
>
> There is go-1.24 on go-team, waiting for the merge.

In that case, since you have decided to directly close this bug report,
can you at least apply the patch #2 of this series onto the go-team
branch?  The new cni-plugins require go-1.24.

(I am not sure why adding a new go version needs to go via team branch,
since it, by definition, cannot cause rebuilds...)

Thank you,
Tomas

-- 
There are only two hard things in Computer Science:
cache invalidation, naming things and off-by-one errors.

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

From: Tomas Volf <~@wolfsden.cz>
To: Sharlatan Hellseher <sharlatanus <at> gmail.com>
Cc: 78094 <at> debbugs.gnu.org
Subject: Re: [bug#78094] [PATCH 1/2] gnu: Add go-1.24.
Date: Mon, 28 Apr 2025 18:24:13 +0200

Tomas Volf <~@wolfsden.cz> writes:

> Sharlatan Hellseher <sharlatanus <at> gmail.com> writes:
>
>> Hi,
>>
>>
>>
>> There is go-1.24 on go-team, waiting for the merge.
>
> In that case, since you have decided to directly close this bug report,
> can you at least apply the patch #2 of this series onto the go-team
> branch?  The new cni-plugins require go-1.24.

Please disregard the message above.  There was a problem between the
keyboard and the chair.

Tomas

-- 
There are only two hard things in Computer Science:
cache invalidation, naming things and off-by-one errors.

Previous Next

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