From eefd68e0ee3f26f305b1a77c6f9871fff7b85654 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 3 Jul 2024 13:57:45 +0100 Subject: [PATCH] gnu: Remove go-golang-org-x-exp-2023. * gnu/packages/golang-build.scm (go-golang-org-x-exp-2023): Delete variable. * gnu/packages/golang-web.scm (go-github-com-multiformats-go-multiaddr-0.12): [propagated-inputs]: Remove go-golang-org-x-exp-2023; add go-golang-org-x-exp. * gnu/packages/ipfs.scm (kubo): [inputs]: Remove go-golang-org-x-exp-2023; add go-golang-org-x-exp. Change-Id: I6d8984114f9aab5369f443e71838f93228a645e9 --- gnu/packages/golang-build.scm | 16 ---------------- gnu/packages/golang-web.scm | 2 +- gnu/packages/ipfs.scm | 2 +- 3 files changed, 2 insertions(+), 18 deletions(-) diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm index 1b966fd94e..45bad64c4b 100644 --- a/gnu/packages/golang-build.scm +++ b/gnu/packages/golang-build.scm @@ -160,22 +160,6 @@ (define-public go-golang-org-x-exp @code{old} directory) packages.") (license license:bsd-3))) -;; It's for the Kubo update; remove it when it is no longer needed. -(define-public go-golang-org-x-exp-2023 - (package - (inherit go-golang-org-x-exp) - (name "go-golang-org-x-exp") - (version "0.0.0-20230725012225-302865e7556b") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://go.googlesource.com/exp") - (commit (go-version->git-ref version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1fkmi0zjwv70n9d9q9bmzch2zvf7xm3d65qh63zll6dljq2lh4b8")))))) - (define-public go-golang-org-x-image (let ((commit "58c23975cae11f062d4b3b0c143fe248faac195d") (revision "1")) diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index e04fc91504..bc8c23b243 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -1762,7 +1762,7 @@ (define-public go-github-com-multiformats-go-multiaddr-0.12 go-github-com-multiformats-go-multibase go-github-com-multiformats-go-varint go-github-com-multiformats-go-multihash - go-golang-org-x-exp-2023)))) + go-golang-org-x-exp)))) (define-public go-github-com-multiformats-go-multiaddr-dns (package diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm index 078d50c5d8..c4914bbb80 100644 --- a/gnu/packages/ipfs.scm +++ b/gnu/packages/ipfs.scm @@ -845,7 +845,7 @@ (define-public kubo go-go-uber-org-multierr go-go-uber-org-zap go-golang-org-x-crypto - go-golang-org-x-exp-2023 + go-golang-org-x-exp go-golang-org-x-mod go-golang-org-x-sync go-golang-org-x-sys