08/18: gnu: Remove go-golang.org-x-sync-errgroup.

[guix-commits]

sharlatan pushed a commit to branch wip-go-team
in repository guix.

commit f4f1731824dc5b19da9fecb97db80cb6caa599b4
Author: Sharlatan Hellseher <sharlatanus@gmail.com>
AuthorDate: Thu Jun 20 07:36:58 2024 +0100

    gnu: Remove go-golang.org-x-sync-errgroup.
    
    * gnu/packages/golang-build.scm (go-golang.org-x-sync-errgroup): Delete 
variable.
    * gnu/packages/check.scm (actionlint): Adjust inputs.
    [inputs]: Remove go-golang.org-x-sync-errgroup; add go-golang-org-x-sync.
    * gnu/packages/golang.scm (gotestsum): Likewise.
    [native-inputs]: Remove go-golang.org-x-sync-errgroup; add 
go-golang-org-x-sync.
    * gnu/packages/golang.scm (go-github-com-prometheus-procfs): Likewise.
    [propagated-inputs]: Remove go-golang.org-x-sync-errgroup; add 
go-golang-org-x-sync.
    * gnu/packages/terminals.scm (go-github-com-junegunn-fzf): Likewise.
    [inputs]: Remove go-golang.org-x-sync-errgroup; add go-golang-org-x-sync.
    * gnu/packages/version-control.scm (ghq): Likewise.
    [inputs]: Remove go-golang.org-x-sync-errgroup; add go-golang-org-x-sync.
    
    Change-Id: If64c30da47ed9cd043798f427f2927b76394f3c4
---
 gnu/packages/check.scm           |  2 +-
 gnu/packages/golang-build.scm    | 29 +----------------------------
 gnu/packages/golang.scm          |  4 ++--
 gnu/packages/terminals.scm       |  2 +-
 gnu/packages/version-control.scm |  2 +-
 5 files changed, 6 insertions(+), 33 deletions(-)

diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index fafa5d3f33..f885940601 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -1031,7 +1031,7 @@ but it works for any C/C++ project.")
                   go-github-com-mattn-go-colorable
                   go-github-com-mattn-go-runewidth
                   go-github-com-robfig-cron
-                  go-golang.org-x-sync-errgroup
+                  go-golang-org-x-sync
                   go-golang.org-x-sync-semaphore
                   go-gopkg-in-yaml-v3))
     (native-inputs (list go-github-com-google-go-cmp-cmp))
diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index bccacf59f4..d69746a9be 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -293,36 +293,9 @@ addition to the ones provided by the language and “sync” 
and “sync/atomic
 packages.")
       (license license:bsd-3))))
 
-(define-public go-golang.org-x-sync-errgroup
-  (let ((commit "cd5d95a43a6e21273425c7ae415d3df9ea832eeb")
-        (revision "0"))
-    (package
-      (name "go-golang.org-x-sync-errgroup")
-      (version (git-version "0.0.0" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url "https://go.googlesource.com/sync";)
-               (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "1nqkyz2y1qvqcma52ijh02s8aiqmkfb95j08f6zcjhbga3ds6hds"))))
-      (build-system go-build-system)
-      (arguments
-       '(#:import-path "golang.org/x/sync/errgroup"
-         #:unpack-path "golang.org/x/sync"))
-      (home-page "https://godoc.org/golang.org/x/sync/errgroup";)
-      (synopsis "Synchronization, error propagation, and Context cancellation
-for groups of goroutines working on subtasks of a common task")
-      (description "This package provides synchronization, error
-propagation, and Context cancellation for groups of goroutines working on
-subtasks of a common task.")
-      (license license:bsd-3))))
-
 (define-public go-golang.org-x-sync-semaphore
   (package
-    (inherit go-golang.org-x-sync-errgroup)
+    (inherit go-golang-org-x-sync)
     (name "go-golang.org-x-sync-semaphore")
     (arguments
      '(#:import-path "golang.org/x/sync/semaphore"
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 7526b411e5..273cc092de 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -6232,7 +6232,7 @@ test when a comparison fails.")
      '(#:import-path "gotest.tools/gotestsum"))
     (native-inputs
      (list go-github-com-fatih-color
-           go-golang.org-x-sync-errgroup
+           go-golang-org-x-sync
            go-github-com-pkg-errors
            go-github-com-sirupsen-logrus
            go-github-com-spf13-pflag
@@ -7799,7 +7799,7 @@ Prometheus metrics.")
        ;; The tests require Go modules, which are not yet supported in Guix's
        ;; Go build system.
        #:tests? #f))
-    (propagated-inputs (list go-golang.org-x-sync-errgroup))
+    (propagated-inputs (list go-golang-org-x-sync))
     (synopsis "Go library for reading @file{/proc}")
     (description "The @code{procfs} Go package provides functions to retrieve
 system, kernel, and process metrics from the @file{/proc} pseudo file system.")
diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index 1c1294f663..8591330522 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -1038,7 +1038,7 @@ programmer to write text-based user interfaces.")
            go-github-com-gdamore-tcell
            go-github-com-rivo-uniseg
            go-github-com-saracen-walker
-           go-golang.org-x-sync-errgroup
+           go-golang-org-x-sync
            go-golang-org-x-term
            go-golang-org-x-crypto))
     (home-page "https://github.com/junegunn/fzf";)
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 8470ad9c89..745c7db49c 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -3840,7 +3840,7 @@ If several repos are related, it helps to see their 
status together.")
            go-github-com-saracen-walker
            go-github-com-urfave-cli-v2
            go-golang-org-x-net
-           go-golang.org-x-sync-errgroup))
+           go-golang-org-x-sync))
     (synopsis "Manage remote repository clones")
     (description
      "@code{ghq} provides a way to organize remote repository clones, like