[bug#78094,1/2] gnu: Add go-1.24.

Message ID d985dfca6866af7db4e091b512b70b1ea9b70ab1.1745757056.git.~@wolfsden.cz
State New
Headers
Series gnu: cni-plugins: Update to 1.7.1. |

Commit Message

Tomas Volf April 27, 2025, 12:34 p.m. UTC
  * 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(+)
  

Comments

Sharlatan Hellseher April 27, 2025, 4:31 p.m. UTC | #1
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
>
>
>
>
  
Tomas Volf April 27, 2025, 5:01 p.m. UTC | #2
Sharlatan Hellseher <sharlatanus@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
  

Patch

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")