* [bug#69042] [PATCH 01/30] gnu: Add (gnu packages golang-build) module.
2024-02-11 10:36 [bug#69042] [PATCH 00/30] Split (gnu packages golang) part IV Sharlatan Hellseher
@ 2024-02-11 10:52 ` Sharlatan Hellseher
2024-02-11 10:52 ` [bug#69042] [PATCH 02/30] gnu: Add (gnu packages golang-compression) module Sharlatan Hellseher
` (31 subsequent siblings)
32 siblings, 0 replies; 64+ messages in thread
From: Sharlatan Hellseher @ 2024-02-11 10:52 UTC (permalink / raw)
To: 69042; +Cc: Sharlatan Hellseher
* gnu/packages/golang-build.scm: New file.
* gnu/local.mk: Add to gnu/packages/golang-build.scm scope.
Change-Id: I4605d44452859b47ed6369a234c7ead496b19c2a
---
gnu/local.mk | 1 +
gnu/packages/golang-build.scm | 44 +++++++++++++++++++++++++++++++++++
2 files changed, 45 insertions(+)
create mode 100644 gnu/packages/golang-build.scm
diff --git a/gnu/local.mk b/gnu/local.mk
index 7806771eea..e40be7fb46 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -307,6 +307,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/gnu-pw-mgr.scm \
%D%/packages/gobby.scm \
%D%/packages/golang.scm \
+ %D%/packages/golang-build.scm \
%D%/packages/golang-check.scm \
%D%/packages/golang-crypto.scm \
%D%/packages/golang-web.scm \
diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
new file mode 100644
index 0000000000..03fcdede80
--- /dev/null
+++ b/gnu/packages/golang-build.scm
@@ -0,0 +1,44 @@
+;;; GNU Guix --- Functional package management for GNU
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages golang-build)
+ #:use-module ((guix licenses) #:prefix license:)
+ #:use-module (guix build-system go)
+ #:use-module (guix gexp)
+ #:use-module (guix git-download)
+ #:use-module (guix packages)
+ #:use-module (guix utils)
+ #:use-module (gnu packages))
+
+;;; Commentary:
+;;;
+;;; Modules (libraries) which are part of the Golang project but outside the
+;;; main Golang tree, see <https://pkg.go.dev/golang.org/x>
+;;;
+;;; Since they are bound to be relied on by many, their dependencies should be
+;;; kept minimal, and this module should not depend on other modules
+;;; containing Golang packages.
+;;;
+;;; Please: Try to add new module packages in alphabetic order.
+;;;
+;;; Code:
+\f
+;;;
+;;; Avoid adding new packages to the end of this file. To reduce the chances
+;;; of a merge conflict, place them above by existing packages with similar
+;;; functionality or similar names.
+;;;
--
2.41.0
^ permalink raw reply related [flat|nested] 64+ messages in thread* [bug#69042] [PATCH 02/30] gnu: Add (gnu packages golang-compression) module.
2024-02-11 10:36 [bug#69042] [PATCH 00/30] Split (gnu packages golang) part IV Sharlatan Hellseher
2024-02-11 10:52 ` [bug#69042] [PATCH 01/30] gnu: Add (gnu packages golang-build) module Sharlatan Hellseher
@ 2024-02-11 10:52 ` Sharlatan Hellseher
2024-02-11 10:52 ` [bug#69042] [PATCH 03/30] gnu: go-golang-org-x-net: Move to (gnu packages golang-build) Sharlatan Hellseher
` (30 subsequent siblings)
32 siblings, 0 replies; 64+ messages in thread
From: Sharlatan Hellseher @ 2024-02-11 10:52 UTC (permalink / raw)
To: 69042; +Cc: Sharlatan Hellseher
* gnu/packages/golang-compression.scm: New file.
* gnu/local.mk: Add to gnu/packages/golang-compression.scm scope.
Change-Id: I1c68a3f6f9b3d6a316cba560b7fc81e707376417
---
gnu/local.mk | 1 +
gnu/packages/golang-compression.scm | 37 +++++++++++++++++++++++++++++
2 files changed, 38 insertions(+)
create mode 100644 gnu/packages/golang-compression.scm
diff --git a/gnu/local.mk b/gnu/local.mk
index e40be7fb46..bb62c87bb6 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -309,6 +309,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/golang.scm \
%D%/packages/golang-build.scm \
%D%/packages/golang-check.scm \
+ %D%/packages/golang-compression.scm \
%D%/packages/golang-crypto.scm \
%D%/packages/golang-web.scm \
%D%/packages/golang-xyz.scm \
diff --git a/gnu/packages/golang-compression.scm b/gnu/packages/golang-compression.scm
new file mode 100644
index 0000000000..268cd16e30
--- /dev/null
+++ b/gnu/packages/golang-compression.scm
@@ -0,0 +1,37 @@
+;;; GNU Guix --- Functional package management for GNU
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages golang-compression)
+ #:use-module ((guix licenses) #:prefix license:)
+ #:use-module (guix build-system go)
+ #:use-module (guix gexp)
+ #:use-module (guix git-download)
+ #:use-module (guix packages)
+ #:use-module (guix utils)
+ #:use-module (gnu packages))
+
+;;; Commentary:
+;;;
+;;; Please: Try to add new module packages in alphabetic order.
+;;;
+;;; Code:
+\f
+;;;
+;;; Avoid adding new packages to the end of this file. To reduce the chances
+;;; of a merge conflict, place them above by existing packages with similar
+;;; functionality or similar names.
+;;;
--
2.41.0
^ permalink raw reply related [flat|nested] 64+ messages in thread* [bug#69042] [PATCH 03/30] gnu: go-golang-org-x-net: Move to (gnu packages golang-build).
2024-02-11 10:36 [bug#69042] [PATCH 00/30] Split (gnu packages golang) part IV Sharlatan Hellseher
2024-02-11 10:52 ` [bug#69042] [PATCH 01/30] gnu: Add (gnu packages golang-build) module Sharlatan Hellseher
2024-02-11 10:52 ` [bug#69042] [PATCH 02/30] gnu: Add (gnu packages golang-compression) module Sharlatan Hellseher
@ 2024-02-11 10:52 ` Sharlatan Hellseher
2024-02-11 10:52 ` [bug#69042] [PATCH 04/30] gnu: go-github-com-golang-snappy: Mmove to (gnu packages golang-compression) Sharlatan Hellseher
` (29 subsequent siblings)
32 siblings, 0 replies; 64+ messages in thread
From: Sharlatan Hellseher @ 2024-02-11 10:52 UTC (permalink / raw)
To: 69042; +Cc: Sharlatan Hellseher, Katherine Cox-Buday, Sharlatan Hellseher
* gnu/packages/golang.scm (go-golang-org-x-net,
go-golang-org-x-net-0.17, go-golang-org-x-net-html): Move from here ...
* gnu/packages/golang-build.scm: ... to here.
* gnu/packages/configuration-management.scm: Add (gnu packages golang-build) module.
* gnu/packages/education.scm: As above ...
* gnu/packages/file-systems.scm: As above ...
* gnu/packages/golang-check.scm: As above ...
* gnu/packages/golang-crypto.scm: As above ...
* gnu/packages/golang-web.scm: As above ...
* gnu/packages/golang-xyz.scm: As above ...
* gnu/packages/golang.scm: As above ...
* gnu/packages/ipfs.scm: As above ...
* gnu/packages/messaging.scm: As above ...
* gnu/packages/networking.scm: As above ...
* gnu/packages/uucp.scm: As above ...
* gnu/packages/version-control.scm: As above ...
Change-Id: If009e62555ada293f17cf0f42fde82c21ef4615e
---
gnu/packages/configuration-management.scm | 1 +
gnu/packages/education.scm | 1 +
gnu/packages/file-systems.scm | 1 +
gnu/packages/golang-build.scm | 64 +++++++++++++++++++++++
gnu/packages/golang-check.scm | 3 +-
gnu/packages/golang-crypto.scm | 1 +
gnu/packages/golang-web.scm | 1 +
gnu/packages/golang-xyz.scm | 1 +
gnu/packages/golang.scm | 60 +--------------------
gnu/packages/ipfs.scm | 1 +
gnu/packages/messaging.scm | 1 +
gnu/packages/networking.scm | 1 +
gnu/packages/uucp.scm | 1 +
gnu/packages/version-control.scm | 1 +
14 files changed, 78 insertions(+), 60 deletions(-)
diff --git a/gnu/packages/configuration-management.scm b/gnu/packages/configuration-management.scm
index 296f48dcd5..6632f429e2 100644
--- a/gnu/packages/configuration-management.scm
+++ b/gnu/packages/configuration-management.scm
@@ -21,6 +21,7 @@ (define-module (gnu packages configuration-management)
#:use-module (guix build-system go)
#:use-module (guix git-download)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-web)
#:use-module (gnu packages version-control)
#:use-module (gnu packages textutils)
diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index 7b72ed0349..0f4a251bcc 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -47,6 +47,7 @@ (define-module (gnu packages education)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-check)
#:use-module (gnu packages gtk)
#:use-module (gnu packages gstreamer)
diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm
index 61db3086c8..af6d1ee871 100644
--- a/gnu/packages/file-systems.scm
+++ b/gnu/packages/file-systems.scm
@@ -72,6 +72,7 @@ (define-module (gnu packages file-systems)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-check)
#:use-module (gnu packages golang-crypto)
#:use-module (gnu packages guile)
diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index 03fcdede80..2601dec27a 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -1,4 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2023 Artyom V. Poptsov <poptsov.artyom@gmail.com>
+;;; Copyright © 2023 Felix Lechner <felix.lechner@lease-up.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -37,6 +40,67 @@ (define-module (gnu packages golang-build)
;;;
;;; Code:
\f
+(define-public go-golang-org-x-net
+ (let ((commit "8e0e7d8d38f2b6d21d742845570dde2902d06a1d")
+ (revision "0"))
+ (package
+ (name "go-golang-org-x-net")
+ (version (git-version "0.5.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://go.googlesource.com/net")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1fidlcn3vcz42v2lc0rpmqh3bz08bcklj6jvnmz2vvgc481ci5hy"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "golang.org/x/net"
+ ;; Source-only package
+ #:tests? #f
+ #:phases
+ #~(modify-phases %standard-phases
+ ;; Source-only package
+ (delete 'build))))
+ (home-page "https://go.googlesource.com/net")
+ (synopsis "Go supplemental networking libraries")
+ (description "This package provides supplemental Go networking libraries.")
+ (license license:bsd-3))))
+
+;; XXX: Not in use by any other packages, consider to remove or merge with
+;; go-golang-org-x-net.
+(define-public go-golang-org-x-net-0.17
+ (let ((commit "b225e7ca6dde1ef5a5ae5ce922861bda011cfabd")
+ (revision "0"))
+ (package
+ (inherit go-golang-org-x-net)
+ (name "go-golang-org-x-net")
+ (version (git-version "0.17.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://go.googlesource.com/net")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "17zhim2m0r8nyy18g2lsawxm4rawix2qbjyn80x9vc6jc8fv05m9")))))))
+
+(define-public go-golang-org-x-net-html
+ (package
+ (inherit go-golang-org-x-net)
+ (name "go-golang-org-x-net-html")
+ (arguments
+ '(#:import-path "golang.org/x/net/html"
+ #:unpack-path "golang.org/x/net"))
+ (home-page "https://godoc.org/golang.org/x/net/html")
+ (synopsis "HTML5-compliant tokenizer and parser")
+ (description
+ "This package provides an HTML5-compliant tokenizer and parser.")))
+
;;;
;;; Avoid adding new packages to the end of this file. To reduce the chances
;;; of a merge conflict, place them above by existing packages with similar
diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm
index 912444bc8e..2decd1f664 100644
--- a/gnu/packages/golang-check.scm
+++ b/gnu/packages/golang-check.scm
@@ -41,7 +41,8 @@ (define-module (gnu packages golang-check)
#:use-module (guix gexp)
#:use-module (guix git-download)
#:use-module (gnu packages)
- #:use-module (gnu packages golang))
+ #:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build))
;;; Commentary:
;;;
diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm
index bf2fc11e17..39e7412558 100644
--- a/gnu/packages/golang-crypto.scm
+++ b/gnu/packages/golang-crypto.scm
@@ -44,6 +44,7 @@ (define-module (gnu packages golang-crypto)
#:use-module (guix utils)
#:use-module (gnu packages)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-check))
;;; Commentary:
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 719cb5dfeb..d7fb7dd366 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -48,6 +48,7 @@ (define-module (gnu packages golang-web)
#:use-module (guix utils)
#:use-module (gnu packages)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-check)
#:use-module (gnu packages golang-crypto)
#:use-module (gnu packages golang-xyz)
diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 8823ae21c6..33aa43357f 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -27,6 +27,7 @@ (define-module (gnu packages golang-xyz)
#:use-module (guix utils)
#:use-module (gnu packages)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-check)
#:use-module (gnu packages golang-crypto))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 163691a1e6..3997f4057d 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -81,6 +81,7 @@ (define-module (gnu packages golang)
#:use-module (gnu packages gcc)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnupg)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-check)
#:use-module (gnu packages golang-crypto)
#:use-module (gnu packages golang-web)
@@ -3650,65 +3651,6 @@ (define-public gopls
editor.")
(license license:bsd-3)))
-(define-public go-golang-org-x-net
- (let ((commit "8e0e7d8d38f2b6d21d742845570dde2902d06a1d")
- (revision "0"))
- (package
- (name "go-golang-org-x-net")
- (version (git-version "0.5.0" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://go.googlesource.com/net")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1fidlcn3vcz42v2lc0rpmqh3bz08bcklj6jvnmz2vvgc481ci5hy"))))
- (build-system go-build-system)
- (arguments
- (list
- #:import-path "golang.org/x/net"
- ;; Source-only package
- #:tests? #f
- #:phases
- #~(modify-phases %standard-phases
- ;; Source-only package
- (delete 'build))))
- (synopsis "Go supplemental networking libraries")
- (description "This package provides supplemental Go networking libraries.")
- (home-page "https://go.googlesource.com/net")
- (license license:bsd-3))))
-
-(define-public go-golang-org-x-net-0.17
- (let ((commit "b225e7ca6dde1ef5a5ae5ce922861bda011cfabd")
- (revision "0"))
- (package
- (inherit go-golang-org-x-net)
- (name "go-golang-org-x-net")
- (version (git-version "0.17.0" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://go.googlesource.com/net")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "17zhim2m0r8nyy18g2lsawxm4rawix2qbjyn80x9vc6jc8fv05m9")))))))
-
-(define-public go-golang-org-x-net-html
- (package
- (inherit go-golang-org-x-net)
- (name "go-golang.org-x-net-html")
- (arguments
- '(#:import-path "golang.org/x/net/html"
- #:unpack-path "golang.org/x/net"))
- (synopsis "HTML5-compliant tokenizer and parser")
- (description
- "This package provides an HTML5-compliant tokenizer and parser.")
- (home-page "https://godoc.org/golang.org/x/net/html")))
-
(define-public go-golang-org-x-image
(let ((commit "58c23975cae11f062d4b3b0c143fe248faac195d")
(revision "1"))
diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm
index a1b9333066..ae514cd93b 100644
--- a/gnu/packages/ipfs.scm
+++ b/gnu/packages/ipfs.scm
@@ -29,6 +29,7 @@ (define-module (gnu packages ipfs)
#:use-module (guix download)
#:use-module (guix build-system go)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-check)
#:use-module (gnu packages golang-crypto)
#:use-module (gnu packages golang-web)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index bb33be4872..98c1c9bf67 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -86,6 +86,7 @@ (define-module (gnu packages messaging)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages gperf)
#:use-module (gnu packages graphviz)
#:use-module (gnu packages gstreamer)
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 8d358961a1..dc21b2fbd0 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -125,6 +125,7 @@ (define-module (gnu packages networking)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-web)
#:use-module (gnu packages graphviz)
#:use-module (gnu packages gstreamer)
diff --git a/gnu/packages/uucp.scm b/gnu/packages/uucp.scm
index 37dc27625a..8f1759556e 100644
--- a/gnu/packages/uucp.scm
+++ b/gnu/packages/uucp.scm
@@ -19,6 +19,7 @@
(define-module (gnu packages uucp)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-crypto)
#:use-module (gnu packages golang-web)
#:use-module (gnu packages texinfo)
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 8f9fae5ce2..51754245d3 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -106,6 +106,7 @@ (define-module (gnu packages version-control)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-check)
#:use-module (gnu packages golang-crypto)
#:use-module (gnu packages golang-web)
--
2.41.0
^ permalink raw reply related [flat|nested] 64+ messages in thread* [bug#69042] [PATCH 04/30] gnu: go-github-com-golang-snappy: Mmove to (gnu packages golang-compression).
2024-02-11 10:36 [bug#69042] [PATCH 00/30] Split (gnu packages golang) part IV Sharlatan Hellseher
` (2 preceding siblings ...)
2024-02-11 10:52 ` [bug#69042] [PATCH 03/30] gnu: go-golang-org-x-net: Move to (gnu packages golang-build) Sharlatan Hellseher
@ 2024-02-11 10:52 ` Sharlatan Hellseher
2024-02-11 10:52 ` [bug#69042] [PATCH 05/30] gnu: go-github-com-mreiferson-go-options: Move to (gnu packages golang-xyz) Sharlatan Hellseher
` (28 subsequent siblings)
32 siblings, 0 replies; 64+ messages in thread
From: Sharlatan Hellseher @ 2024-02-11 10:52 UTC (permalink / raw)
To: 69042; +Cc: Sharlatan Hellseher, Katherine Cox-Buday, Sharlatan Hellseher
* gnu/packages/syncthing.scm (go-github-com-golang-snappy): Move from
here ...
* gnu/packages/golang-compression.scm: ... to here.
* gnu/packages/golang.scm: Add (gnu packages golang-compression) module.
* gnu/packages/high-availability.scm: As above.
* gnu/packages/ipfs.scm: As above.
* gnu/packages/syncthing.scm: As above.
Change-Id: I936c82c127e1aa25dde20693bee70e5a871249fe
---
gnu/packages/golang-compression.scm | 26 ++++++++++++++++++++++++++
gnu/packages/golang.scm | 1 +
gnu/packages/high-availability.scm | 4 ++--
gnu/packages/ipfs.scm | 1 +
gnu/packages/syncthing.scm | 24 +-----------------------
5 files changed, 31 insertions(+), 25 deletions(-)
diff --git a/gnu/packages/golang-compression.scm b/gnu/packages/golang-compression.scm
index 268cd16e30..670572ea90 100644
--- a/gnu/packages/golang-compression.scm
+++ b/gnu/packages/golang-compression.scm
@@ -1,4 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2021 Arun Isaac <arunisaac@systemreboot.net>
+;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -30,6 +33,29 @@ (define-module (gnu packages golang-compression)
;;;
;;; Code:
\f
+(define-public go-github-com-golang-snappy
+ (package
+ (name "go-github-com-golang-snappy")
+ (version "0.0.4")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/golang/snappy")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "004cw699yz3pdpawhjhpa0y94c4w479nw1rf39zj6h6027kpwv2j"))
+ (patches (search-patches "go-github-com-golang-snappy-32bit-test.patch"))))
+ (build-system go-build-system)
+ (arguments
+ `(#:import-path "github.com/golang/snappy"))
+ (home-page "https://github.com/golang/snappy")
+ (synopsis "Snappy compression format in the Go programming language")
+ (description "This package provides a Go implementation of the Snappy
+compression format.")
+ (license license:bsd-3)))
+
;;;
;;; Avoid adding new packages to the end of this file. To reduce the chances
;;; of a merge conflict, place them above by existing packages with similar
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 3997f4057d..43e9024167 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -83,6 +83,7 @@ (define-module (gnu packages golang)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-check)
+ #:use-module (gnu packages golang-compression)
#:use-module (gnu packages golang-crypto)
#:use-module (gnu packages golang-web)
#:use-module (gnu packages lua)
diff --git a/gnu/packages/high-availability.scm b/gnu/packages/high-availability.scm
index 9760084603..ad18a39738 100644
--- a/gnu/packages/high-availability.scm
+++ b/gnu/packages/high-availability.scm
@@ -36,6 +36,7 @@ (define-module (gnu packages high-availability)
#:use-module (gnu packages gettext)
#:use-module (gnu packages glib)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-compression)
#:use-module (gnu packages golang-crypto)
#:use-module (gnu packages golang-web)
#:use-module (gnu packages golang-xyz)
@@ -48,7 +49,6 @@ (define-module (gnu packages high-availability)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages rsync)
- #:use-module (gnu packages syncthing)
#:use-module (gnu packages tls)
#:use-module (gnu packages valgrind)
#:use-module (gnu packages version-control)
@@ -284,7 +284,7 @@ (define-public nsq
go-github-com-bmizerany-perks-quantile
go-github-com-burntsushi-toml
go-github-com-davecgh-go-spew
- go-github-com-golang-snappy ; Move to (gnu packages golang)
+ go-github-com-golang-snappy
go-github-com-julienschmidt-httprouter
go-github-com-mreiferson-go-options
go-github-com-mreiferson-go-svc
diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm
index ae514cd93b..f09d0190dd 100644
--- a/gnu/packages/ipfs.scm
+++ b/gnu/packages/ipfs.scm
@@ -31,6 +31,7 @@ (define-module (gnu packages ipfs)
#:use-module (gnu packages golang)
#:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-check)
+ #:use-module (gnu packages golang-compression)
#:use-module (gnu packages golang-crypto)
#:use-module (gnu packages golang-web)
#:use-module (gnu packages python)
diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm
index 4c3aa8f30b..c0270b87e5 100644
--- a/gnu/packages/syncthing.scm
+++ b/gnu/packages/syncthing.scm
@@ -38,6 +38,7 @@ (define-module (gnu packages syncthing)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-compression)
#:use-module (gnu packages gtk)
#:use-module (gnu packages linux)
#:use-module (gnu packages python-crypto)
@@ -398,29 +399,6 @@ (define-public go-github-com-golang-groupcache-lru
(home-page "https://github.com/golang/groupcache")
(license asl2.0))))
-(define-public go-github-com-golang-snappy
- (package
- (name "go-github-com-golang-snappy")
- (version "0.0.4")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/golang/snappy")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "004cw699yz3pdpawhjhpa0y94c4w479nw1rf39zj6h6027kpwv2j"))
- (patches (search-patches "go-github-com-golang-snappy-32bit-test.patch"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/golang/snappy"))
- (synopsis "Snappy compression format in the Go programming language")
- (description "This package provides a Go implementation of the Snappy
-compression format.")
- (home-page "https://github.com/golang/snappy")
- (license bsd-3)))
-
(define-public go-github-com-jackpal-gateway
(package
(name "go-github-com-jackpal-gateway")
--
2.41.0
^ permalink raw reply related [flat|nested] 64+ messages in thread* [bug#69042] [PATCH 05/30] gnu: go-github-com-mreiferson-go-options: Move to (gnu packages golang-xyz).
2024-02-11 10:36 [bug#69042] [PATCH 00/30] Split (gnu packages golang) part IV Sharlatan Hellseher
` (3 preceding siblings ...)
2024-02-11 10:52 ` [bug#69042] [PATCH 04/30] gnu: go-github-com-golang-snappy: Mmove to (gnu packages golang-compression) Sharlatan Hellseher
@ 2024-02-11 10:52 ` Sharlatan Hellseher
2024-02-11 10:52 ` [bug#69042] [PATCH 06/30] gnu: go-golang-org-x-sys: Move to (gnu packages golang-build) Sharlatan Hellseher
` (27 subsequent siblings)
32 siblings, 0 replies; 64+ messages in thread
From: Sharlatan Hellseher @ 2024-02-11 10:52 UTC (permalink / raw)
To: 69042; +Cc: Sharlatan Hellseher, Katherine Cox-Buday, Sharlatan Hellseher
* gnu/packages/golang.scm (go-github-com-mreiferson-go-options): Move
from here ...
* gnu/packages/golang-xyz.scm: ... to here.
Change-Id: Ia5cf19a48812b56b0b38ed80246a65c345454c79
---
gnu/packages/golang-xyz.scm | 24 ++++++++++++++++++++++++
gnu/packages/golang.scm | 23 -----------------------
2 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 33aa43357f..ebcf333b13 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2023 Benjamin <benjamin@uvy.fr>
+;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com>
;;; Copyright © 2023 Thomas Ieong <th.ieong@free.fr>
;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;;
@@ -146,6 +147,29 @@ (define-public go-github-com-matryer-try
(description "This package provides an idiomatic Go retry module.")
(license license:expat)))
+(define-public go-github-com-mreiferson-go-options
+ (package
+ (name "go-github-com-mreiferson-go-options")
+ (version "1.0.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/mreiferson/go-options")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1pxs9ybrh196qy14ijn4zn51h2z28lj31y6vxrz2xxhgvpmfmxyl"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/mreiferson/go-options"))
+ (home-page "https://github.com/mreiferson/go-options")
+ (synopsis "Go package to structure and resolve options")
+ (description
+ "The @code{options} Go package resolves configuration values set via
+command line flags, config files, and default struct values.")
+ (license license:expat)))
+
(define-public go-github-com-nats-io-nats-go
(package
(name "go-github-com-nats-io-nats-go")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 43e9024167..73e7077eac 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -5515,29 +5515,6 @@ (define-public go-github-com-mr-tron-base58
encoding and 8 times faster decoding.")
(license license:expat))))
-(define-public go-github-com-mreiferson-go-options
- (package
- (name "go-github-com-mreiferson-go-options")
- (version "1.0.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/mreiferson/go-options")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1pxs9ybrh196qy14ijn4zn51h2z28lj31y6vxrz2xxhgvpmfmxyl"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/mreiferson/go-options"))
- (home-page "https://github.com/mreiferson/go-options")
- (synopsis "Go package to structure and resolve options")
- (description
- "The @code{options} Go package resolves configuration values set via
-command line flags, config files, and default struct values.")
- (license license:expat)))
-
(define-public go-github-com-mreiferson-go-svc
;; NSQ specific fork of github.com/judwhite/go-svc, as Guix go build system
;; does not support go.mod with `replace' statement.
--
2.41.0
^ permalink raw reply related [flat|nested] 64+ messages in thread* [bug#69042] [PATCH 06/30] gnu: go-golang-org-x-sys: Move to (gnu packages golang-build).
2024-02-11 10:36 [bug#69042] [PATCH 00/30] Split (gnu packages golang) part IV Sharlatan Hellseher
` (4 preceding siblings ...)
2024-02-11 10:52 ` [bug#69042] [PATCH 05/30] gnu: go-github-com-mreiferson-go-options: Move to (gnu packages golang-xyz) Sharlatan Hellseher
@ 2024-02-11 10:52 ` Sharlatan Hellseher
2024-02-11 10:52 ` [bug#69042] [PATCH 07/30] gnu: go-github-com-mreiferson-go-svc: Move to (gnu packages golang-xyz) Sharlatan Hellseher
` (26 subsequent siblings)
32 siblings, 0 replies; 64+ messages in thread
From: Sharlatan Hellseher @ 2024-02-11 10:52 UTC (permalink / raw)
To: 69042
Cc: Sharlatan Hellseher, Katherine Cox-Buday, Leo Famulari,
Sharlatan Hellseher, Tobias Geerinckx-Rice, Wilko Meyer
* gnu/packages/golang.scm (go-golang-org-x-sys): Move
from here ...
* gnu/packages/golang-build.scm: ... to here.
* gnu/packages/curl.scm: Add (gnu packages golang-build) module.
* gnu/packages/databases.scm: As above.
* gnu/packages/docker.scm: As above.
* gnu/packages/golang-build.scm: As above.
* gnu/packages/golang.scm: As above.
* gnu/packages/irc.scm: As above.
* gnu/packages/linux.scm: As above.
* gnu/packages/password-utils.scm: As above.
* gnu/packages/syncthing.scm: As above.
* gnu/packages/textutils.scm: As above.
* gnu/packages/vpn.scm: As above.
* gnu/packages/weather.scm: As above.
* gnu/packages/web.scm: As above.
Change-Id: I161e89cacb9aa87b4fbb643ecd9ad32cfe49c9d7
---
gnu/packages/curl.scm | 1 +
gnu/packages/databases.scm | 1 +
gnu/packages/docker.scm | 1 +
gnu/packages/golang-build.scm | 31 +++++++++++++++++++++++++++++++
gnu/packages/golang.scm | 31 -------------------------------
gnu/packages/irc.scm | 1 +
gnu/packages/linux.scm | 1 +
gnu/packages/password-utils.scm | 1 +
gnu/packages/syncthing.scm | 1 +
gnu/packages/textutils.scm | 1 +
gnu/packages/vpn.scm | 1 +
gnu/packages/weather.scm | 3 ++-
gnu/packages/web.scm | 1 +
13 files changed, 43 insertions(+), 32 deletions(-)
diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm
index 0fb83a7a12..02a602a66d 100644
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@ -49,6 +49,7 @@ (define-module (gnu packages curl)
#:use-module (gnu packages check)
#:use-module (gnu packages compression)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages guile)
#:use-module (gnu packages kerberos)
#:use-module (gnu packages logging)
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 903088ed4b..dc4a91f14d 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -107,6 +107,7 @@ (define-module (gnu packages databases)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-check)
#:use-module (gnu packages golang-web)
#:use-module (gnu packages gperf)
diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm
index fbe8edeef0..0fe1f2c1c7 100644
--- a/gnu/packages/docker.scm
+++ b/gnu/packages/docker.scm
@@ -42,6 +42,7 @@ (define-module (gnu packages docker)
#:use-module (gnu packages compression)
#:use-module (gnu packages glib)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages linux)
#:use-module (gnu packages networking)
#:use-module (gnu packages pkg-config)
diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index 2601dec27a..eeab951f1e 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -101,6 +101,37 @@ (define-public go-golang-org-x-net-html
(description
"This package provides an HTML5-compliant tokenizer and parser.")))
+(define-public go-golang-org-x-sys
+ (let ((commit "ca59edaa5a761e1d0ea91d6c07b063f85ef24f78")
+ (revision "0"))
+ (package
+ (name "go-golang-org-x-sys")
+ (version (git-version "0.8.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://go.googlesource.com/sys")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1p81niiin8dwyrjl2xsc95136w3vdw4kmj0w3mlh0vh5v134s4xq"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "golang.org/x/sys"
+ ;; Source-only package
+ #:tests? #f
+ #:phases
+ #~(modify-phases %standard-phases
+ ;; Source-only package
+ (delete 'build))))
+ (home-page "https://go.googlesource.com/sys")
+ (synopsis "Go support for low-level system interaction")
+ (description "This package provides supplemental libraries offering Go
+support for low-level interaction with the operating system.")
+ (license license:bsd-3))))
+
;;;
;;; Avoid adding new packages to the end of this file. To reduce the chances
;;; of a merge conflict, place them above by existing packages with similar
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 73e7077eac..373b57c5ad 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3712,37 +3712,6 @@ (define-public go-golang-org-x-sync
(home-page "https://go.googlesource.com/sync/")
(license license:bsd-3))))
-(define-public go-golang-org-x-sys
- (let ((commit "ca59edaa5a761e1d0ea91d6c07b063f85ef24f78")
- (revision "0"))
- (package
- (name "go-golang-org-x-sys")
- (version (git-version "0.8.0" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://go.googlesource.com/sys")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1p81niiin8dwyrjl2xsc95136w3vdw4kmj0w3mlh0vh5v134s4xq"))))
- (build-system go-build-system)
- (arguments
- (list
- #:import-path "golang.org/x/sys"
- ;; Source-only package
- #:tests? #f
- #:phases
- #~(modify-phases %standard-phases
- ;; Source-only package
- (delete 'build))))
- (synopsis "Go support for low-level system interaction")
- (description "This package provides supplemental libraries offering Go
-support for low-level interaction with the operating system.")
- (home-page "https://go.googlesource.com/sys")
- (license license:bsd-3))))
-
(define-public go-golang-org-x-text
(package
(name "go-golang-org-x-text")
diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm
index 3200ccc135..c211fa6595 100644
--- a/gnu/packages/irc.scm
+++ b/gnu/packages/irc.scm
@@ -67,6 +67,7 @@ (define-module (gnu packages irc)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-check)
#:use-module (gnu packages gtk)
#:use-module (gnu packages guile)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index b8b119e474..d798c44a8f 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -134,6 +134,7 @@ (define-module (gnu packages linux)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages gperf)
#:use-module (gnu packages graphviz)
#:use-module (gnu packages gstreamer)
diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm
index 6dc257dc0e..3a2bb410f2 100644
--- a/gnu/packages/password-utils.scm
+++ b/gnu/packages/password-utils.scm
@@ -91,6 +91,7 @@ (define-module (gnu packages password-utils)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-crypto)
#:use-module (gnu packages gtk)
#:use-module (gnu packages guile)
diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm
index c0270b87e5..dbca1e5e90 100644
--- a/gnu/packages/syncthing.scm
+++ b/gnu/packages/syncthing.scm
@@ -38,6 +38,7 @@ (define-module (gnu packages syncthing)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-compression)
#:use-module (gnu packages gtk)
#:use-module (gnu packages linux)
diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index be5cb15cb8..25de916fcb 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -67,6 +67,7 @@ (define-module (gnu packages textutils)
#:use-module (gnu packages gcc)
#:use-module (gnu packages gettext)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-check)
#:use-module (gnu packages golang-crypto)
#:use-module (gnu packages java)
diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
index 02c1ee1043..5df50280c3 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -70,6 +70,7 @@ (define-module (gnu packages vpn)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages guile)
#:use-module (gnu packages libevent)
#:use-module (gnu packages linux)
diff --git a/gnu/packages/weather.scm b/gnu/packages/weather.scm
index 6ba656017f..5a58b97a30 100644
--- a/gnu/packages/weather.scm
+++ b/gnu/packages/weather.scm
@@ -22,7 +22,8 @@ (define-module (gnu packages weather)
#:use-module (guix git-download)
#:use-module (guix packages)
#:use-module (gnu packages)
- #:use-module (gnu packages golang))
+ #:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build))
(define-public wego
(package
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index a1039b9e0c..0c67e7d6e4 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -143,6 +143,7 @@ (define-module (gnu packages web)
#:use-module (gnu packages gnunet)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-web)
#:use-module (gnu packages gperf)
#:use-module (gnu packages graphviz)
--
2.41.0
^ permalink raw reply related [flat|nested] 64+ messages in thread* [bug#69042] [PATCH 07/30] gnu: go-github-com-mreiferson-go-svc: Move to (gnu packages golang-xyz).
2024-02-11 10:36 [bug#69042] [PATCH 00/30] Split (gnu packages golang) part IV Sharlatan Hellseher
` (5 preceding siblings ...)
2024-02-11 10:52 ` [bug#69042] [PATCH 06/30] gnu: go-golang-org-x-sys: Move to (gnu packages golang-build) Sharlatan Hellseher
@ 2024-02-11 10:52 ` Sharlatan Hellseher
2024-02-11 10:52 ` [bug#69042] [PATCH 08/30] gnu: go-github-com-nsqio-go-nsq: " Sharlatan Hellseher
` (25 subsequent siblings)
32 siblings, 0 replies; 64+ messages in thread
From: Sharlatan Hellseher @ 2024-02-11 10:52 UTC (permalink / raw)
To: 69042; +Cc: Sharlatan Hellseher, Katherine Cox-Buday, Sharlatan Hellseher
* gnu/packages/golang.scm (go-github-com-mreiferson-go-svc): Move
from here ...
* gnu/packages/golang-xyz.scm: ... to here.
Change-Id: I21f1d5f651fb09a3716cbcdb48aaf7f8dd37384d
---
gnu/packages/golang-xyz.scm | 28 ++++++++++++++++++++++++++++
gnu/packages/golang.scm | 28 ----------------------------
2 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index ebcf333b13..aefe0e0d9c 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -170,6 +170,34 @@ (define-public go-github-com-mreiferson-go-options
command line flags, config files, and default struct values.")
(license license:expat)))
+(define-public go-github-com-mreiferson-go-svc
+ ;; NSQ specific fork of github.com/judwhite/go-svc, as Guix go build system
+ ;; does not support go.mod with `replace' statement.
+ (let ((commit "7a96e00010f68d9436e3de53a70c53f209a0c244")
+ (revision "0"))
+ (package
+ (name "go-github-com-mreiferson-go-svc")
+ (version (git-version "1.2.1" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/mreiferson/go-svc")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1acgb0n3svhnraqj1fz5qc5n3b4vc5ffwyk9vfi6gcfkibm0hgmd"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/judwhite/go-svc"))
+ (propagated-inputs (list go-golang-org-x-sys))
+ (home-page "https://github.com/mreiferson/go-svc")
+ (synopsis "Go Windows Service wrapper for GNU/Linux")
+ (description
+ "Go Windows Service wrapper compatible with GNU/Linux. Windows tests
+@url{https://github.com/judwhite/go-svc/raw/master/svc/svc_windows_test.go,here}.")
+ (license license:expat))))
+
(define-public go-github-com-nats-io-nats-go
(package
(name "go-github-com-nats-io-nats-go")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 373b57c5ad..5887d68630 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -5484,34 +5484,6 @@ (define-public go-github-com-mr-tron-base58
encoding and 8 times faster decoding.")
(license license:expat))))
-(define-public go-github-com-mreiferson-go-svc
- ;; NSQ specific fork of github.com/judwhite/go-svc, as Guix go build system
- ;; does not support go.mod with `replace' statement.
- (let ((commit "7a96e00010f68d9436e3de53a70c53f209a0c244")
- (revision "0"))
- (package
- (name "go-github-com-mreiferson-go-svc")
- (version (git-version "1.2.1" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/mreiferson/go-svc")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1acgb0n3svhnraqj1fz5qc5n3b4vc5ffwyk9vfi6gcfkibm0hgmd"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/judwhite/go-svc"))
- (propagated-inputs (list go-golang-org-x-sys))
- (home-page "https://github.com/mreiferson/go-svc")
- (synopsis "Go Windows Service wrapper for GNU/Linux")
- (description
- "Go Windows Service wrapper compatible with GNU/Linux. Windows tests
-@url{https://github.com/judwhite/go-svc/raw/master/svc/svc_windows_test.go,here}.")
- (license license:expat))))
-
(define-public go-github-com-spaolacci-murmur3
(package
(name "go-github-com-spaolacci-murmur3")
--
2.41.0
^ permalink raw reply related [flat|nested] 64+ messages in thread* [bug#69042] [PATCH 08/30] gnu: go-github-com-nsqio-go-nsq: Move to (gnu packages golang-xyz).
2024-02-11 10:36 [bug#69042] [PATCH 00/30] Split (gnu packages golang) part IV Sharlatan Hellseher
` (6 preceding siblings ...)
2024-02-11 10:52 ` [bug#69042] [PATCH 07/30] gnu: go-github-com-mreiferson-go-svc: Move to (gnu packages golang-xyz) Sharlatan Hellseher
@ 2024-02-11 10:52 ` Sharlatan Hellseher
2024-02-11 10:52 ` [bug#69042] [PATCH 09/30] gnu: go-github-com-nsqio-go-diskqueue: " Sharlatan Hellseher
` (24 subsequent siblings)
32 siblings, 0 replies; 64+ messages in thread
From: Sharlatan Hellseher @ 2024-02-11 10:52 UTC (permalink / raw)
To: 69042; +Cc: Sharlatan Hellseher, Katherine Cox-Buday, Sharlatan Hellseher
* gnu/packages/golang.scm (go-github-com-nsqio-go-nsq): Move
from here ...
* gnu/packages/golang-xyz.scm: ... to here.
Change-Id: Ie718c9943dd527281b30c78ab4e23adc764289c1
---
gnu/packages/golang-xyz.scm | 27 +++++++++++++++++++++++++++
gnu/packages/golang.scm | 26 --------------------------
2 files changed, 27 insertions(+), 26 deletions(-)
diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index aefe0e0d9c..bbf72f1105 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -30,6 +30,7 @@ (define-module (gnu packages golang-xyz)
#:use-module (gnu packages golang)
#:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-check)
+ #:use-module (gnu packages golang-compression)
#:use-module (gnu packages golang-crypto))
;;; Commentary:
@@ -249,6 +250,32 @@ (define-public go-github-com-nats-io-nuid
very fast, and tries to be entropy pool friendly.")
(license license:asl2.0)))
+(define-public go-github-com-nsqio-go-nsq
+ (package
+ (name "go-github-com-nsqio-go-nsq")
+ (version "1.1.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/nsqio/go-nsq")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1h9z3z225sdgg7fl3l7x11xn5ch6lm5flgmcj046cdp453qj2qhf"))))
+ (build-system go-build-system)
+ (arguments
+ (list #:tests? #f ;tests require networking
+ #:import-path "github.com/nsqio/go-nsq"))
+ (propagated-inputs (list go-github-com-golang-snappy))
+ (home-page "https://github.com/nsqio/go-nsq")
+ (synopsis "Consumer/producer library for NSQ")
+ (description
+ "The @code{nsq} Go module provides a high-level @code{Consumer} and
+@code{Producer} types as well as low-level functions to communicate over the
+NSQ protocol @url{https://nsq.io/}.")
+ (license license:expat)))
+
(define-public go-go-uber-org-automaxprocs
(package
(name "go-go-uber-org-automaxprocs")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 5887d68630..b8b5a67613 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3098,32 +3098,6 @@ (define-public go-github-com-nsqio-go-diskqueue
queue.")
(license license:expat)))
-(define-public go-github-com-nsqio-go-nsq
- (package
- (name "go-github-com-nsqio-go-nsq")
- (version "1.1.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/nsqio/go-nsq")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1h9z3z225sdgg7fl3l7x11xn5ch6lm5flgmcj046cdp453qj2qhf"))))
- (build-system go-build-system)
- (arguments
- (list #:tests? #f ;tests require networking
- #:import-path "github.com/nsqio/go-nsq"))
- (propagated-inputs (list go-github-com-golang-snappy))
- (home-page "https://github.com/nsqio/go-nsq")
- (synopsis "Consumer/producer library for NSQ")
- (description
- "The @code{nsq} Go module provides a high-level @code{Consumer} and
-@code{Producer} types as well as low-level functions to communicate over the
-NSQ protocol @url{https://nsq.io/}.")
- (license license:expat)))
-
(define-public go-github-com-hebcal-gematriya
(let ((commit "fe3043f73e415eb82727701d10f2fb40f87675e9")
(revision "0"))
--
2.41.0
^ permalink raw reply related [flat|nested] 64+ messages in thread* [bug#69042] [PATCH 09/30] gnu: go-github-com-nsqio-go-diskqueue: Move to (gnu packages golang-xyz).
2024-02-11 10:36 [bug#69042] [PATCH 00/30] Split (gnu packages golang) part IV Sharlatan Hellseher
` (7 preceding siblings ...)
2024-02-11 10:52 ` [bug#69042] [PATCH 08/30] gnu: go-github-com-nsqio-go-nsq: " Sharlatan Hellseher
@ 2024-02-11 10:52 ` Sharlatan Hellseher
2024-02-11 10:52 ` [bug#69042] [PATCH 10/30] gnu: go-github-com-davecgh-go-spew: Move to (gnu packages golang-check) Sharlatan Hellseher
` (23 subsequent siblings)
32 siblings, 0 replies; 64+ messages in thread
From: Sharlatan Hellseher @ 2024-02-11 10:52 UTC (permalink / raw)
To: 69042; +Cc: Sharlatan Hellseher, Katherine Cox-Buday, Sharlatan Hellseher
* gnu/packages/golang.scm (go-github-com-nsqio-go-diskqueue): Move
from here ...
* gnu/packages/golang-xyz.scm: ... to here.
Change-Id: I2051eb1f8a40eeab9c8cc96c540413f5818dd78e
---
gnu/packages/golang-xyz.scm | 23 +++++++++++++++++++++++
gnu/packages/golang.scm | 23 -----------------------
2 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index bbf72f1105..1999aab7fb 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -250,6 +250,29 @@ (define-public go-github-com-nats-io-nuid
very fast, and tries to be entropy pool friendly.")
(license license:asl2.0)))
+(define-public go-github-com-nsqio-go-diskqueue
+ (package
+ (name "go-github-com-nsqio-go-diskqueue")
+ (version "1.1.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/nsqio/go-diskqueue")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1hp66hkmfn0nyf3c53a40f94ah11a9rj01r5zp3jph9p54j8rany"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/nsqio/go-diskqueue"))
+ (home-page "https://github.com/nsqio/go-diskqueue")
+ (synopsis "Go package providing a file system backed FIFO queue")
+ (description
+ "The @code{diskqueue} Go package provides a file system backed FIFO
+queue.")
+ (license license:expat)))
+
(define-public go-github-com-nsqio-go-nsq
(package
(name "go-github-com-nsqio-go-nsq")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index b8b5a67613..599fdf9f2d 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3075,29 +3075,6 @@ (define-public go-github-com-nathan-osman-go-sunrise
sunset times from geographical coordinates and a date.")
(license license:expat))))
-(define-public go-github-com-nsqio-go-diskqueue
- (package
- (name "go-github-com-nsqio-go-diskqueue")
- (version "1.1.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/nsqio/go-diskqueue")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1hp66hkmfn0nyf3c53a40f94ah11a9rj01r5zp3jph9p54j8rany"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/nsqio/go-diskqueue"))
- (home-page "https://github.com/nsqio/go-diskqueue")
- (synopsis "Go package providing a file system backed FIFO queue")
- (description
- "The @code{diskqueue} Go package provides a file system backed FIFO
-queue.")
- (license license:expat)))
-
(define-public go-github-com-hebcal-gematriya
(let ((commit "fe3043f73e415eb82727701d10f2fb40f87675e9")
(revision "0"))
--
2.41.0
^ permalink raw reply related [flat|nested] 64+ messages in thread* [bug#69042] [PATCH 10/30] gnu: go-github-com-davecgh-go-spew: Move to (gnu packages golang-check).
2024-02-11 10:36 [bug#69042] [PATCH 00/30] Split (gnu packages golang) part IV Sharlatan Hellseher
` (8 preceding siblings ...)
2024-02-11 10:52 ` [bug#69042] [PATCH 09/30] gnu: go-github-com-nsqio-go-diskqueue: " Sharlatan Hellseher
@ 2024-02-11 10:52 ` Sharlatan Hellseher
2024-02-11 10:53 ` [bug#69042] [PATCH 11/30] gnu: go-github-com-burntsushi-toml: Move to (gnu packages golang-xyz) Sharlatan Hellseher
` (22 subsequent siblings)
32 siblings, 0 replies; 64+ messages in thread
From: Sharlatan Hellseher @ 2024-02-11 10:52 UTC (permalink / raw)
To: 69042; +Cc: Sharlatan Hellseher, Katherine Cox-Buday, Sharlatan Hellseher
* gnu/packages/golang.scm (go-github-com-davecgh-go-spew): Move
from here ...
* gnu/packages/golang-check.scm: ... to here.
* gnu/packages/high-availability.scm: Add (gnu packages golang-check) module.
Change-Id: I935006c3656b7bf18b91e529296778672338f094
---
gnu/packages/golang-check.scm | 38 ++++++++++++++++++++++++++++++
gnu/packages/golang.scm | 38 ------------------------------
gnu/packages/high-availability.scm | 1 +
3 files changed, 39 insertions(+), 38 deletions(-)
diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm
index 2decd1f664..c5e30f7fe1 100644
--- a/gnu/packages/golang-check.scm
+++ b/gnu/packages/golang-check.scm
@@ -124,6 +124,44 @@ (define-public go-github-com-cheekybits-is
@end itemize\n")
(license license:expat))))
+(define-public go-github-com-davecgh-go-spew
+ (package
+ (name "go-github-com-davecgh-go-spew")
+ (version "1.1.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/davecgh/go-spew")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:unpack-path "github.com/davecgh/go-spew"
+ #:import-path "github.com/davecgh/go-spew/spew"))
+ (home-page "https://github.com/davecgh/go-spew")
+ (synopsis "Deep pretty printer for Go data structures to aid in debugging")
+ (description "Package @command{spew} implements a deep pretty printer
+for Go data structures to aid in debugging.
+
+A quick overview of the additional features spew provides over the built-in
+printing facilities for Go data types are as follows:
+
+@itemize
+@item Pointers are dereferenced and followed.
+@item Circular data structures are detected and handled properly.
+@item Custom Stringer/error interfaces are optionally invoked, including on
+unexported types.
+@item Custom types which only implement the Stringer/error interfaces via a
+pointer receiver are optionally invoked when passing non-pointer variables.
+@item Byte arrays and slices are dumped like the hexdump -C command which
+includes offsets, byte values in hex, and ASCII output (only when using Dump
+style).
+@end itemize")
+ (license license:isc)))
+
(define-public go-github-com-frankban-quicktest
(package
(name "go-github-com-frankban-quicktest")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 599fdf9f2d..903f2126c4 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -5344,44 +5344,6 @@ (define-public go-github-com-libp2p-go-flow-metrics
that's a lot faster (and only does simple bandwidth metrics).")
(license license:expat))))
-(define-public go-github-com-davecgh-go-spew
- (package
- (name "go-github-com-davecgh-go-spew")
- (version "1.1.1")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/davecgh/go-spew")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"))))
- (build-system go-build-system)
- (arguments
- '(#:unpack-path "github.com/davecgh/go-spew"
- #:import-path "github.com/davecgh/go-spew/spew"))
- (home-page "https://github.com/davecgh/go-spew")
- (synopsis "Deep pretty printer for Go data structures to aid in debugging")
- (description "Package @command{spew} implements a deep pretty printer
-for Go data structures to aid in debugging.
-
-A quick overview of the additional features spew provides over the built-in printing facilities for Go data types are as follows:
-
-@itemize
-@item Pointers are dereferenced and followed.
-@item Circular data structures are detected and handled properly.
-@item Custom Stringer/error interfaces are optionally invoked, including on
-unexported types.
-@item Custom types which only implement the Stringer/error interfaces via a
-pointer receiver are optionally invoked when passing non-pointer variables.
-@item Byte arrays and slices are dumped like the hexdump -C command which
-includes offsets, byte values in hex, and ASCII output (only when using Dump
-style).
-@end itemize\n")
- (license license:isc)))
-
(define-public go-github-com-btcsuite-btclog
(let ((commit "84c8d2346e9fc8c7b947e243b9c24e6df9fd206a")
(revision "0"))
diff --git a/gnu/packages/high-availability.scm b/gnu/packages/high-availability.scm
index ad18a39738..0678edaf4e 100644
--- a/gnu/packages/high-availability.scm
+++ b/gnu/packages/high-availability.scm
@@ -36,6 +36,7 @@ (define-module (gnu packages high-availability)
#:use-module (gnu packages gettext)
#:use-module (gnu packages glib)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-check)
#:use-module (gnu packages golang-compression)
#:use-module (gnu packages golang-crypto)
#:use-module (gnu packages golang-web)
--
2.41.0
^ permalink raw reply related [flat|nested] 64+ messages in thread* [bug#69042] [PATCH 11/30] gnu: go-github-com-burntsushi-toml: Move to (gnu packages golang-xyz).
2024-02-11 10:36 [bug#69042] [PATCH 00/30] Split (gnu packages golang) part IV Sharlatan Hellseher
` (9 preceding siblings ...)
2024-02-11 10:52 ` [bug#69042] [PATCH 10/30] gnu: go-github-com-davecgh-go-spew: Move to (gnu packages golang-check) Sharlatan Hellseher
@ 2024-02-11 10:53 ` Sharlatan Hellseher
2024-02-11 10:53 ` [bug#69042] [PATCH 12/30] gnu: go-github-com-bmizerany-perks-quantile: " Sharlatan Hellseher
` (21 subsequent siblings)
32 siblings, 0 replies; 64+ messages in thread
From: Sharlatan Hellseher @ 2024-02-11 10:53 UTC (permalink / raw)
To: 69042; +Cc: Sharlatan Hellseher, Katherine Cox-Buday, Sharlatan Hellseher
* gnu/packages/golang.scm (go-github-com-burntsushi-toml): Move
from here ...
* gnu/packages/golang-xyz.scm: ... to here.
* gnu/packages/golang-check.scm: Add (gnu packages golang-xyz) module.
* gnu/packages/golang.scm: As above.
* gnu/packages/shellutils.scm: As above.
Change-Id: If8a645431a1fb17159681daae70db49fd21b37c1
---
gnu/packages/golang-check.scm | 3 ++-
gnu/packages/golang-xyz.scm | 26 ++++++++++++++++++++++++++
gnu/packages/golang.scm | 24 +-----------------------
gnu/packages/shellutils.scm | 1 +
4 files changed, 30 insertions(+), 24 deletions(-)
diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm
index c5e30f7fe1..8ce85421e9 100644
--- a/gnu/packages/golang-check.scm
+++ b/gnu/packages/golang-check.scm
@@ -42,7 +42,8 @@ (define-module (gnu packages golang-check)
#:use-module (guix git-download)
#:use-module (gnu packages)
#:use-module (gnu packages golang)
- #:use-module (gnu packages golang-build))
+ #:use-module (gnu packages golang-build)
+ #:use-module (gnu packages golang-xyz))
;;; Commentary:
;;;
diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 1999aab7fb..9d2b43b86c 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -1,5 +1,8 @@
;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
+;;; Copyright © 2019 Leo Famulari <leo@famulari.name>
;;; Copyright © 2023 Benjamin <benjamin@uvy.fr>
+;;; Copyright © 2023 Katherine Cox-Buday <cox.katherine.e@gmail.com>
;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com>
;;; Copyright © 2023 Thomas Ieong <th.ieong@free.fr>
;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
@@ -41,6 +44,29 @@ (define-module (gnu packages golang-xyz)
;;;
;;; Code:
\f
+(define-public go-github-com-burntsushi-toml
+ (package
+ (name "go-github-com-burntsushi-toml")
+ (version "1.2.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/BurntSushi/toml")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1v9czq4hsyvdz7yx70y6sgq77wmrgfmn09r9cj4w85z38jqnamv7"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/BurntSushi/toml"))
+ (home-page "https://github.com/BurntSushi/toml")
+ (synopsis "Toml parser and encoder for Go")
+ (description
+ "This package is toml parser and encoder for Go. The interface is
+similar to Go's standard library @code{json} and @code{xml} package.")
+ (license license:expat)))
+
(define-public go-github-com-djherbis-atime
(package
(name "go-github-com-djherbis-atime")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 903f2126c4..5f8a550b15 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -86,6 +86,7 @@ (define-module (gnu packages golang)
#:use-module (gnu packages golang-compression)
#:use-module (gnu packages golang-crypto)
#:use-module (gnu packages golang-web)
+ #:use-module (gnu packages golang-xyz)
#:use-module (gnu packages lua)
#:use-module (gnu packages mail)
#:use-module (gnu packages mp3)
@@ -3807,29 +3808,6 @@ (define-public go-golang-org-x-mod
loading algorithms.")
(license license:bsd-3))))
-(define-public go-github-com-burntsushi-toml
- (package
- (name "go-github-com-burntsushi-toml")
- (version "1.2.1")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/BurntSushi/toml")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1v9czq4hsyvdz7yx70y6sgq77wmrgfmn09r9cj4w85z38jqnamv7"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/BurntSushi/toml"))
- (home-page "https://github.com/BurntSushi/toml")
- (synopsis "Toml parser and encoder for Go")
- (description
- "This package is toml parser and encoder for Go. The interface
-is similar to Go's standard library @code{json} and @code{xml} package.")
- (license license:expat)))
-
(define-public go-github-com-hashicorp-go-uuid
(package
(name "go-github-com-hashicorp-go-uuid")
diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm
index 00352dc327..48c5250c8c 100644
--- a/gnu/packages/shellutils.scm
+++ b/gnu/packages/shellutils.scm
@@ -51,6 +51,7 @@ (define-module (gnu packages shellutils)
#:use-module (gnu packages check)
#:use-module (gnu packages flex)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-xyz)
#:use-module (gnu packages libunistring)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages pcre)
--
2.41.0
^ permalink raw reply related [flat|nested] 64+ messages in thread* [bug#69042] [PATCH 12/30] gnu: go-github-com-bmizerany-perks-quantile: Move to (gnu packages golang-xyz).
2024-02-11 10:36 [bug#69042] [PATCH 00/30] Split (gnu packages golang) part IV Sharlatan Hellseher
` (10 preceding siblings ...)
2024-02-11 10:53 ` [bug#69042] [PATCH 11/30] gnu: go-github-com-burntsushi-toml: Move to (gnu packages golang-xyz) Sharlatan Hellseher
@ 2024-02-11 10:53 ` Sharlatan Hellseher
2024-02-11 10:53 ` [bug#69042] [PATCH 13/30] gnu: go-github-com-blang-semver: " Sharlatan Hellseher
` (20 subsequent siblings)
32 siblings, 0 replies; 64+ messages in thread
From: Sharlatan Hellseher @ 2024-02-11 10:53 UTC (permalink / raw)
To: 69042; +Cc: Sharlatan Hellseher, Katherine Cox-Buday, Sharlatan Hellseher
* gnu/packages/golang.scm (go-github-com-bmizerany-perks-quantile): Move
from here ...
* gnu/packages/golang-xyz.scm: ... to here.
Change-Id: I215d8f1f2710bd21ad9a251e4cb029064a0968f6
---
gnu/packages/golang-xyz.scm | 24 ++++++++++++++++++++++++
gnu/packages/golang.scm | 24 ------------------------
2 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 9d2b43b86c..741023c098 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -44,6 +44,30 @@ (define-module (gnu packages golang-xyz)
;;;
;;; Code:
\f
+(define-public go-github-com-bmizerany-perks-quantile
+ (package
+ (name "go-github-com-bmizerany-perks-quantile")
+ (version "0.0.0-20230307044200-03f9df79da1e")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/bmizerany/perks")
+ (commit (go-version->git-ref version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1f2a99v3618bz2mf61iwhdjm3xi1gam6v4apqgcrz71gj7ba9943"))))
+ (build-system go-build-system)
+ (arguments
+ (list #:unpack-path "github.com/bmizerany/perks"
+ #:import-path "github.com/bmizerany/perks/quantile"))
+ (home-page "https://github.com/bmizerany/perks")
+ (synopsis "Library for computing quantiles")
+ (description
+ "Perks contains the Go package @code{quantile} that computes approximate
+quantiles over an unbounded data stream within low memory and CPU bounds.")
+ (license license:bsd-2)))
+
(define-public go-github-com-burntsushi-toml
(package
(name "go-github-com-burntsushi-toml")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 5f8a550b15..60781f0172 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -7923,30 +7923,6 @@ (define-public go-github-com-bmatcuk-doublestar
matching and globbing with support for \"doublestar\" patterns.")
(license license:expat)))
-(define-public go-github-com-bmizerany-perks-quantile
- (package
- (name "go-github-com-bmizerany-perks-quantile")
- (version "0.0.0-20230307044200-03f9df79da1e")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/bmizerany/perks")
- (commit (go-version->git-ref version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1f2a99v3618bz2mf61iwhdjm3xi1gam6v4apqgcrz71gj7ba9943"))))
- (build-system go-build-system)
- (arguments
- (list #:unpack-path "github.com/bmizerany/perks"
- #:import-path "github.com/bmizerany/perks/quantile"))
- (home-page "https://github.com/bmizerany/perks")
- (synopsis "Library for computing quantiles")
- (description
- "Perks contains the Go package @code{quantile} that computes approximate
-quantiles over an unbounded data stream within low memory and CPU bounds.")
- (license license:bsd-2)))
-
(define-public go-github-com-dlclark-regexp2
(package
(name "go-github-com-dlclark-regexp2")
--
2.41.0
^ permalink raw reply related [flat|nested] 64+ messages in thread* [bug#69042] [PATCH 13/30] gnu: go-github-com-blang-semver: Move to (gnu packages golang-xyz).
2024-02-11 10:36 [bug#69042] [PATCH 00/30] Split (gnu packages golang) part IV Sharlatan Hellseher
` (11 preceding siblings ...)
2024-02-11 10:53 ` [bug#69042] [PATCH 12/30] gnu: go-github-com-bmizerany-perks-quantile: " Sharlatan Hellseher
@ 2024-02-11 10:53 ` Sharlatan Hellseher
2024-02-11 10:53 ` [bug#69042] [PATCH 14/30] gnu: go-github-com-bitly-timer-metrics: " Sharlatan Hellseher
` (19 subsequent siblings)
32 siblings, 0 replies; 64+ messages in thread
From: Sharlatan Hellseher @ 2024-02-11 10:53 UTC (permalink / raw)
To: 69042; +Cc: Sharlatan Hellseher, Katherine Cox-Buday, Sharlatan Hellseher
* gnu/packages/golang.scm (go-github-com-blang-semver): Move
from here ...
* gnu/packages/golang-xyz.scm: ... to here.
* gnu/packages/education.scm: Add (gnu packages golang-xyz) module.
* gnu/packages/ipfs.scm: As above.
Change-Id: I620543088661512bcc8135922a454c5f2dc73119
---
gnu/packages/education.scm | 1 +
gnu/packages/golang-xyz.scm | 25 +++++++++++++++++++++++++
gnu/packages/golang.scm | 24 ------------------------
gnu/packages/ipfs.scm | 1 +
4 files changed, 27 insertions(+), 24 deletions(-)
diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index 0f4a251bcc..c3009537e9 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -49,6 +49,7 @@ (define-module (gnu packages education)
#:use-module (gnu packages golang)
#:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-check)
+ #:use-module (gnu packages golang-xyz)
#:use-module (gnu packages gtk)
#:use-module (gnu packages gstreamer)
#:use-module (gnu packages image)
diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 741023c098..292ff10a47 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
;;; Copyright © 2019 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2023 Benjamin <benjamin@uvy.fr>
;;; Copyright © 2023 Katherine Cox-Buday <cox.katherine.e@gmail.com>
;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com>
@@ -44,6 +45,30 @@ (define-module (gnu packages golang-xyz)
;;;
;;; Code:
\f
+(define-public go-github-com-blang-semver
+ (let ((commit "60ec3488bfea7cca02b021d106d9911120d25fe9")
+ (revision "0"))
+ (package
+ (name "go-github-com-blang-semver")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/blang/semver")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "19pli07y5592g4dyjyj0jq5rn548vc3fz0qg3624vm1j5828p1c2"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/blang/semver"))
+ (home-page "https://github.com/blang/semver")
+ (synopsis "Semantic versioning library written in Go")
+ (description
+ "Semver is a library for Semantic versioning written in Go.")
+ (license license:expat))))
+
(define-public go-github-com-bmizerany-perks-quantile
(package
(name "go-github-com-bmizerany-perks-quantile")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 60781f0172..41adf51bfb 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -4020,30 +4020,6 @@ (define-public go-github-com-tomnomnom-gron
absolute \"path\" to it.")
(license license:expat)))
-(define-public go-github-com-blang-semver
- (let ((commit "60ec3488bfea7cca02b021d106d9911120d25fe9")
- (revision "0"))
- (package
- (name "go-github-com-blang-semver")
- (version (git-version "0.0.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/blang/semver")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "19pli07y5592g4dyjyj0jq5rn548vc3fz0qg3624vm1j5828p1c2"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/blang/semver"))
- (home-page "https://github.com/blang/semver")
- (synopsis "Semantic versioning library written in Go")
- (description "Semver is a library for Semantic versioning written in Go.")
- (license license:expat))))
-
(define-public go-github-com-google-cadvisor
(let ((commit "2ed7198f77395ee9a172878a0a7ab92ab59a2cfd")
(revision "0"))
diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm
index f09d0190dd..830e2ccd32 100644
--- a/gnu/packages/ipfs.scm
+++ b/gnu/packages/ipfs.scm
@@ -34,6 +34,7 @@ (define-module (gnu packages ipfs)
#:use-module (gnu packages golang-compression)
#:use-module (gnu packages golang-crypto)
#:use-module (gnu packages golang-web)
+ #:use-module (gnu packages golang-xyz)
#:use-module (gnu packages python)
#:use-module (gnu packages shells)
#:use-module (gnu packages syncthing))
--
2.41.0
^ permalink raw reply related [flat|nested] 64+ messages in thread* [bug#69042] [PATCH 14/30] gnu: go-github-com-bitly-timer-metrics: Move to (gnu packages golang-xyz).
2024-02-11 10:36 [bug#69042] [PATCH 00/30] Split (gnu packages golang) part IV Sharlatan Hellseher
` (12 preceding siblings ...)
2024-02-11 10:53 ` [bug#69042] [PATCH 13/30] gnu: go-github-com-blang-semver: " Sharlatan Hellseher
@ 2024-02-11 10:53 ` Sharlatan Hellseher
2024-02-11 10:53 ` [bug#69042] [PATCH 15/30] gnu: go-github-com-bitly-go-hostpool: " Sharlatan Hellseher
` (18 subsequent siblings)
32 siblings, 0 replies; 64+ messages in thread
From: Sharlatan Hellseher @ 2024-02-11 10:53 UTC (permalink / raw)
To: 69042; +Cc: Sharlatan Hellseher, Katherine Cox-Buday, Sharlatan Hellseher
* gnu/packages/golang.scm (go-github-com-bitly-timer-metrics): Move
from here ...
* gnu/packages/golang-xyz.scm: ... to here.
Change-Id: Id30d1add9ccbfbc05af114f6ccf82f353a7aa74b
---
gnu/packages/golang-xyz.scm | 22 ++++++++++++++++++++++
gnu/packages/golang.scm | 23 -----------------------
2 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 292ff10a47..a396057da9 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -45,6 +45,28 @@ (define-module (gnu packages golang-xyz)
;;;
;;; Code:
\f
+(define-public go-github-com-bitly-timer-metrics
+ (package
+ (name "go-github-com-bitly-timer-metrics")
+ (version "1.0.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/bitly/timer_metrics")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "02fhx8hx8126m2cgxw9fm8q2401r7zfann8b5zy5yyark1sgkrb4"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/bitly/timer_metrics"))
+ (home-page "https://github.com/bitly/timer_metrics")
+ (synopsis "Capture timings and enable periodic metrics every @var{n} events")
+ (description "This package provides an efficient way to capture timing
+information and periodically output metrics")
+ (license license:expat)))
+
(define-public go-github-com-blang-semver
(let ((commit "60ec3488bfea7cca02b021d106d9911120d25fe9")
(revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 41adf51bfb..d594759bdf 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -1906,29 +1906,6 @@ (define-public go-github-com-bitly-go-hostpool
robin or epsilon greedy mode, and unresponsive hosts are avoided.")
(license license:expat)))
-(define-public go-github-com-bitly-timer-metrics
- (package
- (name "go-github-com-bitly-timer-metrics")
- (version "1.0.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/bitly/timer_metrics")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "02fhx8hx8126m2cgxw9fm8q2401r7zfann8b5zy5yyark1sgkrb4"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/bitly/timer_metrics"))
- (home-page "https://github.com/bitly/timer_metrics")
- (synopsis "Capture timings and enable periodic metrics every @var{n} events")
- (description
- "This package provides an efficient way to capture timing information and
-periodically output metrics")
- (license license:expat)))
-
(define-public go-github-com-blanu-dust
(package
(name "go-github-com-blanu-dust")
--
2.41.0
^ permalink raw reply related [flat|nested] 64+ messages in thread* [bug#69042] [PATCH 15/30] gnu: go-github-com-bitly-go-hostpool: Move to (gnu packages golang-xyz).
2024-02-11 10:36 [bug#69042] [PATCH 00/30] Split (gnu packages golang) part IV Sharlatan Hellseher
` (13 preceding siblings ...)
2024-02-11 10:53 ` [bug#69042] [PATCH 14/30] gnu: go-github-com-bitly-timer-metrics: " Sharlatan Hellseher
@ 2024-02-11 10:53 ` Sharlatan Hellseher
2024-02-11 10:53 ` [bug#69042] [PATCH 16/30] gnu: go-golang-org-x-exp: Move to (gnu packages golang-build) Sharlatan Hellseher
` (17 subsequent siblings)
32 siblings, 0 replies; 64+ messages in thread
From: Sharlatan Hellseher @ 2024-02-11 10:53 UTC (permalink / raw)
To: 69042; +Cc: Sharlatan Hellseher, Katherine Cox-Buday, Sharlatan Hellseher
* gnu/packages/golang.scm (go-github-com-bitly-go-hostpool): Move
from here ...
* gnu/packages/golang-xyz.scm: ... to here.
Change-Id: Ia314e6134f229c004f23d99a9c42dbd0adf105f8
---
gnu/packages/golang-xyz.scm | 25 +++++++++++++++++++++++++
gnu/packages/golang.scm | 25 -------------------------
gnu/packages/high-availability.scm | 1 +
3 files changed, 26 insertions(+), 25 deletions(-)
diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index a396057da9..f3087149e7 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -45,6 +45,31 @@ (define-module (gnu packages golang-xyz)
;;;
;;; Code:
\f
+(define-public go-github-com-bitly-go-hostpool
+ (package
+ (name "go-github-com-bitly-go-hostpool")
+ (version "0.1.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/bitly/go-hostpool")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1iibj7dwymczw7cknrh6glc6sdpp4yap2plnyr8qphynwrzlz73w"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/bitly/go-hostpool"))
+ (native-inputs (list go-github-com-stretchr-testify))
+ (home-page "https://github.com/bitly/go-hostpool")
+ (synopsis "Pool among multiple hosts from Golang")
+ (description
+ "This package provides a Go package to intelligently and flexibly pool among
+multiple hosts from your Go application. Host selection can operate in round
+robin or epsilon greedy mode, and unresponsive hosts are avoided.")
+ (license license:expat)))
+
(define-public go-github-com-bitly-timer-metrics
(package
(name "go-github-com-bitly-timer-metrics")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index d594759bdf..4a8e9dbc78 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -1881,31 +1881,6 @@ (define-public go-github-com-dhowett-go-plist
types.")
(license license:giftware))))
-(define-public go-github-com-bitly-go-hostpool
- (package
- (name "go-github-com-bitly-go-hostpool")
- (version "0.1.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/bitly/go-hostpool")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1iibj7dwymczw7cknrh6glc6sdpp4yap2plnyr8qphynwrzlz73w"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/bitly/go-hostpool"))
- (native-inputs (list go-github-com-stretchr-testify))
- (home-page "https://github.com/bitly/go-hostpool")
- (synopsis "Pool among multiple hosts from Golang")
- (description
- "This package provides a Go package to intelligently and flexibly pool among
-multiple hosts from your Go application. Host selection can operate in round
-robin or epsilon greedy mode, and unresponsive hosts are avoided.")
- (license license:expat)))
-
(define-public go-github-com-blanu-dust
(package
(name "go-github-com-blanu-dust")
diff --git a/gnu/packages/high-availability.scm b/gnu/packages/high-availability.scm
index 0678edaf4e..b0e6631389 100644
--- a/gnu/packages/high-availability.scm
+++ b/gnu/packages/high-availability.scm
@@ -36,6 +36,7 @@ (define-module (gnu packages high-availability)
#:use-module (gnu packages gettext)
#:use-module (gnu packages glib)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-check)
#:use-module (gnu packages golang-compression)
#:use-module (gnu packages golang-crypto)
--
2.41.0
^ permalink raw reply related [flat|nested] 64+ messages in thread* [bug#69042] [PATCH 16/30] gnu: go-golang-org-x-exp: Move to (gnu packages golang-build).
2024-02-11 10:36 [bug#69042] [PATCH 00/30] Split (gnu packages golang) part IV Sharlatan Hellseher
` (14 preceding siblings ...)
2024-02-11 10:53 ` [bug#69042] [PATCH 15/30] gnu: go-github-com-bitly-go-hostpool: " Sharlatan Hellseher
@ 2024-02-11 10:53 ` Sharlatan Hellseher
2024-02-11 10:53 ` [bug#69042] [PATCH 17/30] gnu: go-golang-org-x-mod: Move to (gnu packages-build) Sharlatan Hellseher
` (16 subsequent siblings)
32 siblings, 0 replies; 64+ messages in thread
From: Sharlatan Hellseher @ 2024-02-11 10:53 UTC (permalink / raw)
To: 69042; +Cc: Sharlatan Hellseher, Katherine Cox-Buday, Sharlatan Hellseher
* gnu/packages/golang.scm (go-golang-org-x-exp): Move from here ...
* gnu/packages/golang-build.scm: ... to here.
Change-Id: I2253ac166a8830662360b14cec0fa301686dac22
---
gnu/packages/golang-build.scm | 27 +++++++++++++++++++++++++++
gnu/packages/golang.scm | 27 ---------------------------
2 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index eeab951f1e..ffedc946c2 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
;;; Copyright © 2023 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;; Copyright © 2023 Felix Lechner <felix.lechner@lease-up.com>
+;;; Copyright © 2023 Katherine Cox-Buday <cox.katherine.e@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -40,6 +41,32 @@ (define-module (gnu packages golang-build)
;;;
;;; Code:
\f
+(define-public go-golang-org-x-exp
+ (package
+ (name "go-golang-org-x-exp")
+ (version "0.0.0-20221004215720-b9f4876ce741")
+ (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 "030b929xyg8dpp6f4qbyg63msi6zgzj9sqmvnyphfcrjkqf7nr41"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "golang.org/x/exp"
+ ;; Source-only package
+ #:tests? #f
+ #:phases (modify-phases %standard-phases
+ (delete 'build))))
+ (home-page "https://golang.org/x/exp")
+ (synopsis "Experimental and deprecated Go packages")
+ (description "This subrepository holds experimental and deprecated (in the
+@code{old} directory) packages.")
+ (license license:bsd-3)))
+
(define-public go-golang-org-x-net
(let ((commit "8e0e7d8d38f2b6d21d742845570dde2902d06a1d")
(revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 4a8e9dbc78..dd0ac7e3e8 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3347,33 +3347,6 @@ (define-public go-github-com-hashicorp-hcl-v2
(home-page "https://github.com/hashicorp/hcl")
(license license:mpl2.0)))
-(define-public go-golang-org-x-exp
- (package
- (name "go-golang-org-x-exp")
- (version "0.0.0-20221004215720-b9f4876ce741")
- (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
- "030b929xyg8dpp6f4qbyg63msi6zgzj9sqmvnyphfcrjkqf7nr41"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "golang.org/x/exp"
- ;; Source-only package
- #:tests? #f
- #:phases (modify-phases %standard-phases
- (delete 'build))))
- (home-page "https://golang.org/x/exp")
- (synopsis "Experimental and deprecated Go packages")
- (description
- "This subrepository holds experimental and deprecated (in the @code{old}
-directory) packages.")
- (license license:bsd-3)))
-
(define-public go-golang-org-x-tools
(package
(name "go-golang-org-x-tools")
--
2.41.0
^ permalink raw reply related [flat|nested] 64+ messages in thread* [bug#69042] [PATCH 17/30] gnu: go-golang-org-x-mod: Move to (gnu packages-build).
2024-02-11 10:36 [bug#69042] [PATCH 00/30] Split (gnu packages golang) part IV Sharlatan Hellseher
` (15 preceding siblings ...)
2024-02-11 10:53 ` [bug#69042] [PATCH 16/30] gnu: go-golang-org-x-exp: Move to (gnu packages golang-build) Sharlatan Hellseher
@ 2024-02-11 10:53 ` Sharlatan Hellseher
2024-02-11 10:53 ` [bug#69042] [PATCH 18/30] gnu: go-golang-org-x-xerrors: " Sharlatan Hellseher
` (15 subsequent siblings)
32 siblings, 0 replies; 64+ messages in thread
From: Sharlatan Hellseher @ 2024-02-11 10:53 UTC (permalink / raw)
To: 69042; +Cc: Sharlatan Hellseher, Katherine Cox-Buday, Sharlatan Hellseher
* gnu/packages/golang.scm (go-golang-org-x-mod): Move from here ...
* gnu/packages/golang-build.scm: ... to here.
* gnu/packages/shellutils.scm: Add (gnu packages golang-build) module.
Change-Id: I88ce7ac1e264cb545a272f9c8a485747e84f7c82
---
gnu/packages/golang-build.scm | 36 +++++++++++++++++++++++++++++++++++
gnu/packages/golang.scm | 34 ---------------------------------
gnu/packages/shellutils.scm | 1 +
3 files changed, 37 insertions(+), 34 deletions(-)
diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index ffedc946c2..a8e97e7acb 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -1,5 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2021 hackeryarn <artemchernyak@gmail.com>
;;; Copyright © 2023 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;; Copyright © 2023 Felix Lechner <felix.lechner@lease-up.com>
;;; Copyright © 2023 Katherine Cox-Buday <cox.katherine.e@gmail.com>
@@ -67,6 +69,40 @@ (define-public go-golang-org-x-exp
@code{old} directory) packages.")
(license license:bsd-3)))
+(define-public go-golang-org-x-mod
+ (let ((commit "7c05a442b7c1d1a107879b4a090bb5a38d3774a1")
+ (revision "0"))
+ (package
+ (name "go-golang-org-x-mod")
+ (version (git-version "0.7.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/golang/mod")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "14r24fq3kn84k2y2jvvg8hwpy52a3q429pimrdwl5zwknbr2awmh"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "golang.org/x/mod/"
+ #:tests? #f
+ #:phases (modify-phases %standard-phases
+ ;; Source-only package
+ (delete 'build))))
+ (home-page "https://golang.org/x/mod")
+ (synopsis "Tools to work directly with Go module mechanics")
+ (description
+ "This repository holds packages for writing tools that work directly
+with Go module mechanics. That is, it is for direct manipulation of Go
+modules themselves.
+
+The specific case of loading packages should still be done by invoking the
+@command{go} command, which remains the single point of truth for package
+loading algorithms.")
+ (license license:bsd-3))))
+
(define-public go-golang-org-x-net
(let ((commit "8e0e7d8d38f2b6d21d742845570dde2902d06a1d")
(revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index dd0ac7e3e8..e7b98028a5 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3699,40 +3699,6 @@ (define-public go-golang-org-x-xerrors
(home-page "https://godoc.org/golang.org/x/xerrors")
(license license:bsd-3))))
-(define-public go-golang-org-x-mod
- (let ((commit "7c05a442b7c1d1a107879b4a090bb5a38d3774a1")
- (revision "0"))
- (package
- (name "go-golang-org-x-mod")
- (version (git-version "0.7.0" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/golang/mod")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "14r24fq3kn84k2y2jvvg8hwpy52a3q429pimrdwl5zwknbr2awmh"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "golang.org/x/mod/"
- #:tests? #f
- #:phases (modify-phases %standard-phases
- ;; Source-only package
- (delete 'build))))
- (home-page "https://golang.org/x/mod")
- (synopsis "Tools to work directly with Go module mechanics")
- (description
- "This repository holds packages for writing tools that work directly
-with Go module mechanics. That is, it is for direct manipulation of Go modules
-themselves.
-
-The specific case of loading packages should still be done by invoking the
-@command{go} command, which remains the single point of truth for package
-loading algorithms.")
- (license license:bsd-3))))
-
(define-public go-github-com-hashicorp-go-uuid
(package
(name "go-github-com-hashicorp-go-uuid")
diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm
index 48c5250c8c..e58e9e61fc 100644
--- a/gnu/packages/shellutils.scm
+++ b/gnu/packages/shellutils.scm
@@ -51,6 +51,7 @@ (define-module (gnu packages shellutils)
#:use-module (gnu packages check)
#:use-module (gnu packages flex)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-xyz)
#:use-module (gnu packages libunistring)
#:use-module (gnu packages ncurses)
--
2.41.0
^ permalink raw reply related [flat|nested] 64+ messages in thread* [bug#69042] [PATCH 18/30] gnu: go-golang-org-x-xerrors: Move to (gnu packages-build).
2024-02-11 10:36 [bug#69042] [PATCH 00/30] Split (gnu packages golang) part IV Sharlatan Hellseher
` (16 preceding siblings ...)
2024-02-11 10:53 ` [bug#69042] [PATCH 17/30] gnu: go-golang-org-x-mod: Move to (gnu packages-build) Sharlatan Hellseher
@ 2024-02-11 10:53 ` Sharlatan Hellseher
2024-02-11 10:53 ` [bug#69042] [PATCH 19/30] gnu: go-golang.org-x-sync-errgroup: " Sharlatan Hellseher
` (14 subsequent siblings)
32 siblings, 0 replies; 64+ messages in thread
From: Sharlatan Hellseher @ 2024-02-11 10:53 UTC (permalink / raw)
To: 69042; +Cc: Sharlatan Hellseher, Katherine Cox-Buday, Sharlatan Hellseher
* gnu/packages/golang.scm (go-golang-org-x-xerrors): Move from here ...
* gnu/packages/golang-build.scm: ... to here.
Change-Id: I68c9aa1607d71d08eb7ea4e5caf27121cdd0df4c
---
gnu/packages/golang-build.scm | 25 +++++++++++++++++++++++++
gnu/packages/golang.scm | 24 ------------------------
2 files changed, 25 insertions(+), 24 deletions(-)
diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index a8e97e7acb..fed606e8fb 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2021 hackeryarn <artemchernyak@gmail.com>
;;; Copyright © 2023 Artyom V. Poptsov <poptsov.artyom@gmail.com>
@@ -195,6 +196,30 @@ (define-public go-golang-org-x-sys
support for low-level interaction with the operating system.")
(license license:bsd-3))))
+(define-public go-golang-org-x-xerrors
+ (let ((commit "5ec99f83aff198f5fbd629d6c8d8eb38a04218ca")
+ (revision "0"))
+ (package
+ (name "go-golang-org-x-xerrors")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://go.googlesource.com/xerrors")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1dbzc3gmf2haazpv7cgmv97rq40g2xzwbglc17vas8dwhgwgwrzb"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "golang.org/x/xerrors"))
+ (home-page "https://godoc.org/golang.org/x/xerrors")
+ (synopsis "Go 1.13 error values")
+ (description "This package holds the transition packages for the new Go
+1.13 error values.")
+ (license license:bsd-3))))
+
;;;
;;; Avoid adding new packages to the end of this file. To reduce the chances
;;; of a merge conflict, place them above by existing packages with similar
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index e7b98028a5..68b905ff8b 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3675,30 +3675,6 @@ (define-public go-golang-org-x-oauth2
spec in Go.")
(license license:bsd-3))))
-(define-public go-golang-org-x-xerrors
- (let ((commit "5ec99f83aff198f5fbd629d6c8d8eb38a04218ca")
- (revision "0"))
- (package
- (name "go-golang-org-x-xerrors")
- (version (git-version "0.0.0" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://go.googlesource.com/xerrors")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1dbzc3gmf2haazpv7cgmv97rq40g2xzwbglc17vas8dwhgwgwrzb"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "golang.org/x/xerrors"))
- (synopsis "Go 1.13 error values")
- (description
- "This package holds the transition packages for the new Go 1.13 error values.")
- (home-page "https://godoc.org/golang.org/x/xerrors")
- (license license:bsd-3))))
-
(define-public go-github-com-hashicorp-go-uuid
(package
(name "go-github-com-hashicorp-go-uuid")
--
2.41.0
^ permalink raw reply related [flat|nested] 64+ messages in thread* [bug#69042] [PATCH 19/30] gnu: go-golang.org-x-sync-errgroup: Move to (gnu packages-build).
2024-02-11 10:36 [bug#69042] [PATCH 00/30] Split (gnu packages golang) part IV Sharlatan Hellseher
` (17 preceding siblings ...)
2024-02-11 10:53 ` [bug#69042] [PATCH 18/30] gnu: go-golang-org-x-xerrors: " Sharlatan Hellseher
@ 2024-02-11 10:53 ` Sharlatan Hellseher
2024-02-11 10:53 ` [bug#69042] [PATCH 20/30] gnu: go-golang-org-x-sync: " Sharlatan Hellseher
` (13 subsequent siblings)
32 siblings, 0 replies; 64+ messages in thread
From: Sharlatan Hellseher @ 2024-02-11 10:53 UTC (permalink / raw)
To: 69042; +Cc: Sharlatan Hellseher, Katherine Cox-Buday, Sharlatan Hellseher
* gnu/packages/golang.scm (go-golang.org-x-sync-errgroup,
go-golang.org-x-sync-semaphore): Move from here ...
* gnu/packages/golang-build.scm: ... to here.
* gnu/packages/check.scm: Add (gnu packages golang-build) module.
Change-Id: Ie886c0f44e0a70629e23371b447f5a35006ade21
---
gnu/packages/check.scm | 1 +
gnu/packages/golang-build.scm | 41 +++++++++++++++++++++++++++++++++++
gnu/packages/golang.scm | 38 --------------------------------
gnu/packages/terminals.scm | 1 +
4 files changed, 43 insertions(+), 38 deletions(-)
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 4f593cde8d..b520d6c58a 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -77,6 +77,7 @@ (define-module (gnu packages check)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages gtk)
#:use-module (gnu packages guile)
#:use-module (gnu packages guile-xyz)
diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index fed606e8fb..8e64571929 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -1,11 +1,14 @@
;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
+;;; Copyright © 2020 Vagrant Cascadian <vagrant@debian.org>
;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2021 hackeryarn <artemchernyak@gmail.com>
;;; Copyright © 2023 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;; Copyright © 2023 Felix Lechner <felix.lechner@lease-up.com>
;;; Copyright © 2023 Katherine Cox-Buday <cox.katherine.e@gmail.com>
+;;; Copyright © 2023 Timo Wilken <guix@twilken.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -165,6 +168,44 @@ (define-public go-golang-org-x-net-html
(description
"This package provides an HTML5-compliant tokenizer and parser.")))
+(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)
+ (name "go-golang.org-x-sync-semaphore")
+ (arguments
+ '(#:import-path "golang.org/x/sync/semaphore"
+ #:unpack-path "golang.org/x/sync"))
+ (home-page "https://godoc.org/golang.org/x/sync/semaphore")
+ (synopsis "Weighted semaphore implementation in Go")
+ (description "Weighted semaphore implementation in Go.")))
+
(define-public go-golang-org-x-sys
(let ((commit "ca59edaa5a761e1d0ea91d6c07b063f85ef24f78")
(revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 68b905ff8b..7e5626a303 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -7023,44 +7023,6 @@ (define-public go-github-com-google-renameio
create or replace a file or symbolic link.")
(license license:asl2.0)))
-(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"))
- (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.")
- (home-page "https://godoc.org/golang.org/x/sync/errgroup")
- (license license:bsd-3))))
-
-(define-public go-golang.org-x-sync-semaphore
- (package
- (inherit go-golang.org-x-sync-errgroup)
- (name "go-golang.org-x-sync-semaphore")
- (arguments
- '(#:import-path "golang.org/x/sync/semaphore"
- #:unpack-path "golang.org/x/sync"))
- (synopsis "Weighted semaphore implementation in Go")
- (description "Weighted semaphore implementation in Go.")
- (home-page "https://godoc.org/golang.org/x/sync/semaphore")))
-
(define (go-gotest-tools-source version sha256-base32-hash)
(origin
(method git-fetch)
diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index f609de8eff..37223d0d18 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -90,6 +90,7 @@ (define-module (gnu packages terminals)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages gtk)
#:use-module (gnu packages image)
#:use-module (gnu packages libcanberra)
--
2.41.0
^ permalink raw reply related [flat|nested] 64+ messages in thread* [bug#69042] [PATCH 20/30] gnu: go-golang-org-x-sync: Move to (gnu packages-build).
2024-02-11 10:36 [bug#69042] [PATCH 00/30] Split (gnu packages golang) part IV Sharlatan Hellseher
` (18 preceding siblings ...)
2024-02-11 10:53 ` [bug#69042] [PATCH 19/30] gnu: go-golang.org-x-sync-errgroup: " Sharlatan Hellseher
@ 2024-02-11 10:53 ` Sharlatan Hellseher
2024-02-11 10:53 ` [bug#69042] [PATCH 21/30] gnu: go-golang-org-x-term: " Sharlatan Hellseher
` (12 subsequent siblings)
32 siblings, 0 replies; 64+ messages in thread
From: Sharlatan Hellseher @ 2024-02-11 10:53 UTC (permalink / raw)
To: 69042; +Cc: Sharlatan Hellseher, Katherine Cox-Buday, Sharlatan Hellseher
* gnu/packages/golang.scm (go-golang-org-x-sync): Move from here ...
* gnu/packages/golang-build.scm: ... to here.
Change-Id: I28b72dc45116398512c0255ac9e06b9c539e9e7b
---
gnu/packages/golang-build.scm | 30 ++++++++++++++++++++++++++++++
gnu/packages/golang.scm | 30 ------------------------------
2 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index 8e64571929..7b8653960d 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org>
+;;; Copyright © 2020 HiPhish <hiphish@posteo.de>
;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
;;; Copyright © 2020 Vagrant Cascadian <vagrant@debian.org>
@@ -168,6 +169,35 @@ (define-public go-golang-org-x-net-html
(description
"This package provides an HTML5-compliant tokenizer and parser.")))
+(define-public go-golang-org-x-sync
+ (let ((commit "8fcdb60fdcc0539c5e357b2308249e4e752147f1")
+ (revision "1"))
+ (package
+ (name "go-golang-org-x-sync")
+ (version (git-version "0.1.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 "07qrhni6f5hh5p95k1yk6s4wsj341q663irvx6rllrxfsymj6a0z"))))
+ (build-system go-build-system)
+ (arguments
+ `(#:import-path "golang.org/x/sync"
+ #:tests? #f
+ ;; Source-only package
+ #:phases (modify-phases %standard-phases
+ (delete 'build))))
+ (home-page "https://go.googlesource.com/sync/")
+ (synopsis "Additional Go concurrency primitives")
+ (description "This package provides Go concurrency primitives in
+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"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 7e5626a303..8bfabb9da9 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3559,36 +3559,6 @@ (define-public go-golang-org-x-image
processing.")
(license license:bsd-3))))
-(define-public go-golang-org-x-sync
- (let ((commit "8fcdb60fdcc0539c5e357b2308249e4e752147f1")
- (revision "1"))
- (package
- (name "go-golang-org-x-sync")
- (version (git-version "0.1.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
- "07qrhni6f5hh5p95k1yk6s4wsj341q663irvx6rllrxfsymj6a0z"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "golang.org/x/sync"
- #:tests? #f
- ;; Source-only package
- #:phases (modify-phases %standard-phases
- (delete 'build))))
- (synopsis "Additional Go concurrency primitives")
- (description
- "This package provides Go concurrency primitives in addition
-to the ones provided by the language and “sync” and “sync/atomic”
-packages.")
- (home-page "https://go.googlesource.com/sync/")
- (license license:bsd-3))))
-
(define-public go-golang-org-x-text
(package
(name "go-golang-org-x-text")
--
2.41.0
^ permalink raw reply related [flat|nested] 64+ messages in thread* [bug#69042] [PATCH 21/30] gnu: go-golang-org-x-term: Move to (gnu packages-build).
2024-02-11 10:36 [bug#69042] [PATCH 00/30] Split (gnu packages golang) part IV Sharlatan Hellseher
` (19 preceding siblings ...)
2024-02-11 10:53 ` [bug#69042] [PATCH 20/30] gnu: go-golang-org-x-sync: " Sharlatan Hellseher
@ 2024-02-11 10:53 ` Sharlatan Hellseher
2024-02-11 10:53 ` [bug#69042] [PATCH 22/30] gnu: go-golang-org-x-time: " Sharlatan Hellseher
` (11 subsequent siblings)
32 siblings, 0 replies; 64+ messages in thread
From: Sharlatan Hellseher @ 2024-02-11 10:53 UTC (permalink / raw)
To: 69042; +Cc: Sharlatan Hellseher, Katherine Cox-Buday, Sharlatan Hellseher
* gnu/packages/golang.scm (go-golang-org-x-term): Move from here ...
* gnu/packages/golang-build.scm: ... to here.
* gnu/packages/disk.scm: Add (gnu packages golang-build) module.
* gnu/packages/image-viewers.scm: As above.
Change-Id: Ibdb637bb129437ef74a0270fd44edc8804bb3055
---
gnu/packages/disk.scm | 1 +
gnu/packages/golang-build.scm | 25 +++++++++++++++++++++++++
gnu/packages/golang.scm | 24 ------------------------
gnu/packages/image-viewers.scm | 1 +
4 files changed, 27 insertions(+), 24 deletions(-)
diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm
index 165f0a8a74..b0117d77ce 100644
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@@ -69,6 +69,7 @@ (define-module (gnu packages disk)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages graphics)
#:use-module (gnu packages gtk)
#:use-module (gnu packages guile)
diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index 7b8653960d..db94ad2c7b 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -4,11 +4,13 @@
;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
;;; Copyright © 2020 Vagrant Cascadian <vagrant@debian.org>
+;;; Copyright © 2021 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2021 hackeryarn <artemchernyak@gmail.com>
;;; Copyright © 2023 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;; Copyright © 2023 Felix Lechner <felix.lechner@lease-up.com>
;;; Copyright © 2023 Katherine Cox-Buday <cox.katherine.e@gmail.com>
+;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
;;; Copyright © 2023 Timo Wilken <guix@twilken.net>
;;;
;;; This file is part of GNU Guix.
@@ -267,6 +269,29 @@ (define-public go-golang-org-x-sys
support for low-level interaction with the operating system.")
(license license:bsd-3))))
+(define-public go-golang-org-x-term
+ (package
+ (name "go-golang-org-x-term")
+ (version "0.3.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://go.googlesource.com/term")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "16s3d62fgdhiqvcib61s5pwxp08hhrmzx8bdv5zk1w1krjizdarl"))))
+ (build-system go-build-system)
+ (arguments '(#:import-path "golang.org/x/term"))
+ (propagated-inputs
+ (list go-golang-org-x-sys))
+ (home-page "https://pkg.go.dev/golang.org/x/term")
+ (synopsis "Go terminal/console support")
+ (description "@code{term} provides support functions for dealing with
+terminals, as commonly found on Unix systems.")
+ (license license:bsd-3)))
+
(define-public go-golang-org-x-xerrors
(let ((commit "5ec99f83aff198f5fbd629d6c8d8eb38a04218ca")
(revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 8bfabb9da9..240c87c3ba 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9659,30 +9659,6 @@ (define-public go-github-com-dustin-go-humanize
back.")
(license license:expat)))
-(define-public go-golang-org-x-term
- (package
- (name "go-golang-org-x-term")
- (version "0.3.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://go.googlesource.com/term")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "16s3d62fgdhiqvcib61s5pwxp08hhrmzx8bdv5zk1w1krjizdarl"))))
- (build-system go-build-system)
- (arguments '(#:import-path "golang.org/x/term"))
- (propagated-inputs
- (list go-golang-org-x-sys))
- (home-page "https://pkg.go.dev/golang.org/x/term")
- (synopsis "Go terminal/console support")
- (description "@code{term} provides support functions for dealing with
-terminals, as commonly found on Unix systems.")
- (license license:bsd-3)))
-
(define-public go-github-com-klauspost-compress
(package
(name "go-github-com-klauspost-compress")
diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm
index 206b91c878..f2b87268f0 100644
--- a/gnu/packages/image-viewers.scm
+++ b/gnu/packages/image-viewers.scm
@@ -77,6 +77,7 @@ (define-module (gnu packages image-viewers)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages gtk)
#:use-module (gnu packages graphics)
#:use-module (gnu packages image)
--
2.41.0
^ permalink raw reply related [flat|nested] 64+ messages in thread* [bug#69042] [PATCH 22/30] gnu: go-golang-org-x-time: Move to (gnu packages-build).
2024-02-11 10:36 [bug#69042] [PATCH 00/30] Split (gnu packages golang) part IV Sharlatan Hellseher
` (20 preceding siblings ...)
2024-02-11 10:53 ` [bug#69042] [PATCH 21/30] gnu: go-golang-org-x-term: " Sharlatan Hellseher
@ 2024-02-11 10:53 ` Sharlatan Hellseher
2024-02-11 10:53 ` [bug#69042] [PATCH 23/30] gnu: go-golang-org-x-text: " Sharlatan Hellseher
` (10 subsequent siblings)
32 siblings, 0 replies; 64+ messages in thread
From: Sharlatan Hellseher @ 2024-02-11 10:53 UTC (permalink / raw)
To: 69042; +Cc: Sharlatan Hellseher, Katherine Cox-Buday, Sharlatan Hellseher
* gnu/packages/golang.scm (go-golang-org-x-time): Move from here ...
* gnu/packages/golang-build.scm: ... to here.
* gnu/packages/high-availability.scm: Add (gnu packages golang-build) module.
Change-Id: I2f2704501b19d991d153c6d8636e1f9fc4cf154b
---
gnu/packages/golang-build.scm | 30 ++++++++++++++++++++++++++++++
gnu/packages/golang.scm | 31 -------------------------------
2 files changed, 30 insertions(+), 31 deletions(-)
diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index db94ad2c7b..3885701078 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -292,6 +292,36 @@ (define-public go-golang-org-x-term
terminals, as commonly found on Unix systems.")
(license license:bsd-3)))
+(define-public go-golang-org-x-time
+ (let ((commit "9d24e82272b4f38b78bc8cff74fa936d31ccd8ef")
+ (revision "2"))
+ (package
+ (name "go-golang-org-x-time")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://go.googlesource.com/time")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1f5nkr4vys2vbd8wrwyiq2f5wcaahhpxmia85d1gshcbqjqf8dkb"))))
+ (build-system go-build-system)
+ (arguments
+ `(#:import-path "golang.org/x/time"
+ ;; Source-only package
+ #:tests? #f
+ #:phases
+ (modify-phases %standard-phases
+ ;; Source-only package
+ (delete 'build))))
+ (home-page "https://godoc.org/golang.org/x/time/rate")
+ (synopsis "Supplemental Go time libraries")
+ (description "This package provides supplemental Go libraries related to
+time.")
+ (license license:bsd-3))))
+
(define-public go-golang-org-x-xerrors
(let ((commit "5ec99f83aff198f5fbd629d6c8d8eb38a04218ca")
(revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 240c87c3ba..6c056e19a9 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3587,37 +3587,6 @@ (define-public go-golang-org-x-text
(home-page "https://go.googlesource.com/text")
(license license:bsd-3)))
-(define-public go-golang-org-x-time
- (let ((commit "9d24e82272b4f38b78bc8cff74fa936d31ccd8ef")
- (revision "2"))
- (package
- (name "go-golang-org-x-time")
- (version (git-version "0.0.0" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://go.googlesource.com/time")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1f5nkr4vys2vbd8wrwyiq2f5wcaahhpxmia85d1gshcbqjqf8dkb"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "golang.org/x/time"
- ; Source-only package
- #:tests? #f
- #:phases
- (modify-phases %standard-phases
- (delete 'build))))
-; (propagated-inputs
-; `(("go-golang-org-x-net" ,go-golang-org-x-net)))
- (synopsis "Supplemental Go time libraries")
- (description "This package provides supplemental Go libraries related to
-time.")
- (home-page "https://godoc.org/golang.org/x/time/rate")
- (license license:bsd-3))))
-
(define-public go-golang-org-x-oauth2
(let ((commit "0f29369cfe4552d0e4bcddc57cc75f4d7e672a33")
(revision "1"))
--
2.41.0
^ permalink raw reply related [flat|nested] 64+ messages in thread* [bug#69042] [PATCH 23/30] gnu: go-golang-org-x-text: Move to (gnu packages-build).
2024-02-11 10:36 [bug#69042] [PATCH 00/30] Split (gnu packages golang) part IV Sharlatan Hellseher
` (21 preceding siblings ...)
2024-02-11 10:53 ` [bug#69042] [PATCH 22/30] gnu: go-golang-org-x-time: " Sharlatan Hellseher
@ 2024-02-11 10:53 ` Sharlatan Hellseher
2024-02-11 10:53 ` [bug#69042] [PATCH 24/30] gnu: go-github-com-yuin-goldmark: " Sharlatan Hellseher
` (9 subsequent siblings)
32 siblings, 0 replies; 64+ messages in thread
From: Sharlatan Hellseher @ 2024-02-11 10:53 UTC (permalink / raw)
To: 69042; +Cc: Sharlatan Hellseher, Katherine Cox-Buday, Sharlatan Hellseher
* gnu/packages/golang.scm (go-golang-org-x-text): Move from here ...
* gnu/packages/golang-build.scm: ... to here.
* gnu/packages/admin.scm: Add (gnu packages golang-build) module.
* gnu/packages/bioinformatics.scm: As above.
* gnu/packages/mail.scm: As above.
Change-Id: Ifd15b35b460ae30c5c1d677551e95842b322b246
---
gnu/packages/admin.scm | 1 +
gnu/packages/bioinformatics.scm | 1 +
gnu/packages/golang-build.scm | 29 +++++++++++++++++++++++++++++
gnu/packages/golang.scm | 28 ----------------------------
gnu/packages/mail.scm | 1 +
5 files changed, 32 insertions(+), 28 deletions(-)
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 2dbb604fa9..c595e1270f 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -130,6 +130,7 @@ (define-module (gnu packages admin)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages groff)
#:use-module (gnu packages gtk)
#:use-module (gnu packages guile)
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 554df0b42f..08683bc8e9 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -93,6 +93,7 @@ (define-module (gnu packages bioinformatics)
#:use-module (gnu packages gcc)
#:use-module (gnu packages gd)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-check)
#:use-module (gnu packages glib)
#:use-module (gnu packages graph)
diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index 3885701078..325470ca4e 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -1,4 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2019 Brian Leung <bkleung89@gmail.com>
;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2020 HiPhish <hiphish@posteo.de>
;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
@@ -292,6 +293,34 @@ (define-public go-golang-org-x-term
terminals, as commonly found on Unix systems.")
(license license:bsd-3)))
+(define-public go-golang-org-x-text
+ (package
+ (name "go-golang-org-x-text")
+ (version "0.3.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://go.googlesource.com/text")
+ (commit (string-append "v" version))))
+ (file-name (string-append "go.googlesource.com-text-"
+ version "-checkout"))
+ (sha256
+ (base32 "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"))))
+ (build-system go-build-system)
+ (arguments
+ `(#:import-path "golang.org/x/text"
+ ;; Source-only package
+ #:tests? #f
+ #:phases
+ (modify-phases %standard-phases
+ (delete 'build))))
+ (home-page "https://go.googlesource.com/text")
+ (synopsis "Supplemental Go text processing libraries")
+ (description "This package provides supplemental Go libraries for text
+processing.")
+ (license license:bsd-3)))
+
(define-public go-golang-org-x-time
(let ((commit "9d24e82272b4f38b78bc8cff74fa936d31ccd8ef")
(revision "2"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 6c056e19a9..eb4740f91e 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3559,34 +3559,6 @@ (define-public go-golang-org-x-image
processing.")
(license license:bsd-3))))
-(define-public go-golang-org-x-text
- (package
- (name "go-golang-org-x-text")
- (version "0.3.2")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://go.googlesource.com/text")
- (commit (string-append "v" version))))
- (file-name (string-append "go.googlesource.com-text-"
- version "-checkout"))
- (sha256
- (base32
- "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "golang.org/x/text"
- ; Source-only package
- #:tests? #f
- #:phases
- (modify-phases %standard-phases
- (delete 'build))))
- (synopsis "Supplemental Go text processing libraries")
- (description "This package provides supplemental Go libraries for text
- processing.")
- (home-page "https://go.googlesource.com/text")
- (license license:bsd-3)))
-
(define-public go-golang-org-x-oauth2
(let ((commit "0f29369cfe4552d0e4bcddc57cc75f4d7e672a33")
(revision "1"))
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 76f379a710..4a439d2f8f 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -108,6 +108,7 @@ (define-module (gnu packages mail)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-check)
#:use-module (gnu packages golang-crypto)
#:use-module (gnu packages golang-web)
--
2.41.0
^ permalink raw reply related [flat|nested] 64+ messages in thread* [bug#69042] [PATCH 24/30] gnu: go-github-com-yuin-goldmark: Move to (gnu packages-build).
2024-02-11 10:36 [bug#69042] [PATCH 00/30] Split (gnu packages golang) part IV Sharlatan Hellseher
` (22 preceding siblings ...)
2024-02-11 10:53 ` [bug#69042] [PATCH 23/30] gnu: go-golang-org-x-text: " Sharlatan Hellseher
@ 2024-02-11 10:53 ` Sharlatan Hellseher
2024-02-11 10:53 ` [bug#69042] [PATCH 25/30] gnu: go-golang-org-x-tools: " Sharlatan Hellseher
` (8 subsequent siblings)
32 siblings, 0 replies; 64+ messages in thread
From: Sharlatan Hellseher @ 2024-02-11 10:53 UTC (permalink / raw)
To: 69042; +Cc: Sharlatan Hellseher, Katherine Cox-Buday, Sharlatan Hellseher
* gnu/packages/golang.scm (go-github-com-yuin-goldmark): Move from here ...
* gnu/packages/golang-build.scm: ... to here.
Change-Id: If553b4a00b288a913d1d54da8b5b52eab87bb277
---
gnu/packages/golang-build.scm | 22 ++++++++++++++++++++++
gnu/packages/golang.scm | 21 ---------------------
2 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index 325470ca4e..b2b2872907 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2020 HiPhish <hiphish@posteo.de>
;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
;;; Copyright © 2020 Vagrant Cascadian <vagrant@debian.org>
;;; Copyright © 2021 Arun Isaac <arunisaac@systemreboot.net>
@@ -51,6 +52,27 @@ (define-module (gnu packages golang-build)
;;;
;;; Code:
\f
+(define-public go-github-com-yuin-goldmark
+ (package
+ (name "go-github-com-yuin-goldmark")
+ (version "1.2.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/yuin/goldmark")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "12rsnsf65drcp0jfw2jl9w589vsn3pxdk1zh3v9q908iigngrcmy"))))
+ (build-system go-build-system)
+ (arguments
+ `(#:import-path "github.com/yuin/goldmark"))
+ (home-page "https://github.com/yuin/goldmark/")
+ (synopsis "Markdown parser")
+ (description "This package provides a markdown parser.")
+ (license license:expat)))
+
(define-public go-golang-org-x-exp
(package
(name "go-golang-org-x-exp")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index eb4740f91e..22a76daef4 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -7925,27 +7925,6 @@ (define-public go-github-com-olekukonko-ts
size of the terminal.")
(license license:expat))))
-(define-public go-github-com-yuin-goldmark
- (package
- (name "go-github-com-yuin-goldmark")
- (version "1.2.1")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/yuin/goldmark")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "12rsnsf65drcp0jfw2jl9w589vsn3pxdk1zh3v9q908iigngrcmy"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/yuin/goldmark"))
- (home-page "https://github.com/yuin/goldmark/")
- (synopsis "Markdown parser")
- (description "This package provides a markdown parser.")
- (license license:expat)))
-
(define-public go-github-com-charmbracelet-glamour
(package
(name "go-github-com-charmbracelet-glamour")
--
2.41.0
^ permalink raw reply related [flat|nested] 64+ messages in thread* [bug#69042] [PATCH 25/30] gnu: go-golang-org-x-tools: Move to (gnu packages-build).
2024-02-11 10:36 [bug#69042] [PATCH 00/30] Split (gnu packages golang) part IV Sharlatan Hellseher
` (23 preceding siblings ...)
2024-02-11 10:53 ` [bug#69042] [PATCH 24/30] gnu: go-github-com-yuin-goldmark: " Sharlatan Hellseher
@ 2024-02-11 10:53 ` Sharlatan Hellseher
2024-02-11 10:53 ` [bug#69042] [PATCH 26/30] gnu: go-golang-org-x-image: " Sharlatan Hellseher
` (7 subsequent siblings)
32 siblings, 0 replies; 64+ messages in thread
From: Sharlatan Hellseher @ 2024-02-11 10:53 UTC (permalink / raw)
To: 69042; +Cc: Sharlatan Hellseher, Katherine Cox-Buday, Sharlatan Hellseher
* gnu/packages/golang.scm (go-golang-org-x-tools): Move from here ...
* gnu/packages/golang-build.scm: ... to here.
Change-Id: Ib9a69a5dab73b6f9d935fd0216658f5e4f8cf1f8
---
gnu/packages/golang-build.scm | 39 +++++++++++++++++++++++++++++++++
gnu/packages/golang.scm | 41 -----------------------------------
2 files changed, 39 insertions(+), 41 deletions(-)
diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index b2b2872907..87f184fb14 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -373,6 +373,45 @@ (define-public go-golang-org-x-time
time.")
(license license:bsd-3))))
+(define-public go-golang-org-x-tools
+ (package
+ (name "go-golang-org-x-tools")
+ (version "0.5.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://go.googlesource.com/tools")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "08kx2nndq3sr6xai7403mbsqvz5shxmp2icylfr2fmwagr59cb2n"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; gopls versions are tagged separately, and it is a
+ ;; separate Guix package.
+ (delete-file-recursively "gopls")))))
+ (build-system go-build-system)
+ (arguments
+ `(#:import-path "golang.org/x/tools"
+ ;; Source-only package
+ #:tests? #f
+ #:phases
+ (modify-phases %standard-phases
+ ;; Source-only package
+ (delete 'build))))
+ (propagated-inputs
+ (list go-github-com-yuin-goldmark
+ go-golang-org-x-mod
+ go-golang-org-x-net
+ go-golang-org-x-sys))
+ (home-page "https://go.googlesource.com/tools/")
+ (synopsis "Tools that support the Go programming language")
+ (description "This package provides miscellaneous tools that support the
+Go programming language.")
+ (license license:bsd-3)))
+
(define-public go-golang-org-x-xerrors
(let ((commit "5ec99f83aff198f5fbd629d6c8d8eb38a04218ca")
(revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 22a76daef4..4c2781bf45 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3347,47 +3347,6 @@ (define-public go-github-com-hashicorp-hcl-v2
(home-page "https://github.com/hashicorp/hcl")
(license license:mpl2.0)))
-(define-public go-golang-org-x-tools
- (package
- (name "go-golang-org-x-tools")
- (version "0.5.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://go.googlesource.com/tools")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "08kx2nndq3sr6xai7403mbsqvz5shxmp2icylfr2fmwagr59cb2n"))
- (modules '((guix build utils)))
- (snippet
- '(begin
- ;; gopls versions are tagged separately, and it is a
- ;; separate Guix package.
- (delete-file-recursively "gopls")))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "golang.org/x/tools"
- ;; Source-only package
- #:tests? #f
- #:phases
- (modify-phases %standard-phases
- ;; Source-only package
- (delete 'build))))
- (propagated-inputs
- (list
- go-github-com-yuin-goldmark
- go-golang-org-x-mod
- go-golang-org-x-net
- go-golang-org-x-sys))
- (synopsis "Tools that support the Go programming language")
- (description "This package provides miscellaneous tools that support the
-Go programming language.")
- (home-page "https://go.googlesource.com/tools/")
- (license license:bsd-3)))
-
(define-public go-golang-org-x-crypto
(package
(name "go-golang-org-x-crypto")
--
2.41.0
^ permalink raw reply related [flat|nested] 64+ messages in thread* [bug#69042] [PATCH 26/30] gnu: go-golang-org-x-image: Move to (gnu packages-build).
2024-02-11 10:36 [bug#69042] [PATCH 00/30] Split (gnu packages golang) part IV Sharlatan Hellseher
` (24 preceding siblings ...)
2024-02-11 10:53 ` [bug#69042] [PATCH 25/30] gnu: go-golang-org-x-tools: " Sharlatan Hellseher
@ 2024-02-11 10:53 ` Sharlatan Hellseher
2024-02-12 13:57 ` Liliana Marie Prikler
2024-02-11 10:53 ` [bug#69042] [PATCH 27/30] gnu: go-golang-org-x-crypto: " Sharlatan Hellseher
` (6 subsequent siblings)
32 siblings, 1 reply; 64+ messages in thread
From: Sharlatan Hellseher @ 2024-02-11 10:53 UTC (permalink / raw)
To: 69042
Cc: Sharlatan Hellseher, Katherine Cox-Buday, Liliana Marie Prikler,
Sharlatan Hellseher, 宋文武
* gnu/packages/golang.scm (go-golang-org-x-image): Move from here ...
* gnu/packages/golang-build.scm: ... to here.
* gnu/packages/game.scm: Add (gnu packages golang-build) module.
Change-Id: Icd0b303d8f7544f6eae10ac30d7bd01779abaede
---
gnu/packages/games.scm | 1 +
gnu/packages/golang-build.scm | 31 +++++++++++++++++++++++++++++++
gnu/packages/golang.scm | 30 ------------------------------
3 files changed, 32 insertions(+), 30 deletions(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index f95681fbb7..c257a2cfe8 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -150,6 +150,7 @@ (define-module (gnu packages games)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages gnuzilla)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages gperf)
#:use-module (gnu packages graphics)
#:use-module (gnu packages graphviz)
diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index 87f184fb14..b717c3ad27 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019 Brian Leung <bkleung89@gmail.com>
;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org>
+;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2020 HiPhish <hiphish@posteo.de>
;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
@@ -99,6 +100,36 @@ (define-public go-golang-org-x-exp
@code{old} directory) packages.")
(license license:bsd-3)))
+(define-public go-golang-org-x-image
+ (let ((commit "58c23975cae11f062d4b3b0c143fe248faac195d")
+ (revision "1"))
+ (package
+ (name "go-golang-org-x-image")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://go.googlesource.com/image")
+ (commit commit)))
+ (file-name (string-append "go.googlesource.com-image-"
+ version "-checkout"))
+ (sha256
+ (base32 "0i2p2girc1sfcic6xs6vrq0fp3szfx057xppksb67kliywjjrm5x"))))
+ (build-system go-build-system)
+ (arguments
+ `(#:import-path "golang.org/x/image"
+ ;; Source-only package
+ #:tests? #f
+ #:phases
+ (modify-phases %standard-phases
+ (delete 'build))))
+ (home-page "https://go.googlesource.com/image")
+ (synopsis "Supplemental Go image libraries")
+ (description "This package provides supplemental Go libraries for image
+processing.")
+ (license license:bsd-3))))
+
(define-public go-golang-org-x-mod
(let ((commit "7c05a442b7c1d1a107879b4a090bb5a38d3774a1")
(revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 4c2781bf45..0437b4e83d 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3488,36 +3488,6 @@ (define-public gopls
editor.")
(license license:bsd-3)))
-(define-public go-golang-org-x-image
- (let ((commit "58c23975cae11f062d4b3b0c143fe248faac195d")
- (revision "1"))
- (package
- (name "go-golang-org-x-image")
- (version (git-version "0.0.0" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://go.googlesource.com/image")
- (commit commit)))
- (file-name (string-append "go.googlesource.com-image-"
- version "-checkout"))
- (sha256
- (base32
- "0i2p2girc1sfcic6xs6vrq0fp3szfx057xppksb67kliywjjrm5x"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "golang.org/x/image"
- ; Source-only package
- #:tests? #f
- #:phases
- (modify-phases %standard-phases
- (delete 'build))))
- (home-page "https://go.googlesource.com/image")
- (synopsis "Supplemental Go image libraries")
- (description "This package provides supplemental Go libraries for image
-processing.")
- (license license:bsd-3))))
-
(define-public go-golang-org-x-oauth2
(let ((commit "0f29369cfe4552d0e4bcddc57cc75f4d7e672a33")
(revision "1"))
--
2.41.0
^ permalink raw reply related [flat|nested] 64+ messages in thread* [bug#69042] [PATCH 26/30] gnu: go-golang-org-x-image: Move to (gnu packages-build).
2024-02-11 10:53 ` [bug#69042] [PATCH 26/30] gnu: go-golang-org-x-image: " Sharlatan Hellseher
@ 2024-02-12 13:57 ` Liliana Marie Prikler
0 siblings, 0 replies; 64+ messages in thread
From: Liliana Marie Prikler @ 2024-02-12 13:57 UTC (permalink / raw)
To: Sharlatan Hellseher, 69042; +Cc: Katherine Cox-Buday, 宋文武
Am Sonntag, dem 11.02.2024 um 10:53 +0000 schrieb Sharlatan Hellseher:
> * gnu/packages/golang.scm (go-golang-org-x-image): Move from here ...
> * gnu/packages/golang-build.scm: ... to here.
>
> * gnu/packages/game.scm: Add (gnu packages golang-build) module.
>
> Change-Id: Icd0b303d8f7544f6eae10ac30d7bd01779abaede
The commit message itself looks borked. It ought to be "Move to (gnu
packages golang-build)" or – if you want to shorten it "Move to golang-
build".
Cheers
^ permalink raw reply [flat|nested] 64+ messages in thread
* [bug#69042] [PATCH 27/30] gnu: go-golang-org-x-crypto: Move to (gnu packages-build).
2024-02-11 10:36 [bug#69042] [PATCH 00/30] Split (gnu packages golang) part IV Sharlatan Hellseher
` (25 preceding siblings ...)
2024-02-11 10:53 ` [bug#69042] [PATCH 26/30] gnu: go-golang-org-x-image: " Sharlatan Hellseher
@ 2024-02-11 10:53 ` Sharlatan Hellseher
2024-02-11 10:53 ` [bug#69042] [PATCH 28/30] gnu: go-github-com-klauspost-compress: Move to (gnu packages-compression) Sharlatan Hellseher
` (5 subsequent siblings)
32 siblings, 0 replies; 64+ messages in thread
From: Sharlatan Hellseher @ 2024-02-11 10:53 UTC (permalink / raw)
To: 69042; +Cc: Sharlatan Hellseher, Katherine Cox-Buday, Sharlatan Hellseher
* gnu/packages/golang.scm (go-golang-org-x-crypto): Move from here ...
* gnu/packages/golang-build.scm: ... to here.
* gnu/packages/backup.scm: Add (gnu packages golang-build) module.
* gnu/packages/crypto.scm: As above.
Change-Id: I5daad7fe90e1507958fe73c04fc043ebbc006395
---
gnu/packages/backup.scm | 1 +
gnu/packages/crypto.scm | 1 +
gnu/packages/golang-build.scm | 34 +++++++++++++++++++++++++++++++++-
gnu/packages/golang.scm | 31 -------------------------------
4 files changed, 35 insertions(+), 32 deletions(-)
diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index f160efd37d..3b3b9d332a 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -71,6 +71,7 @@ (define-module (gnu packages backup)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-crypto)
#:use-module (gnu packages golang-web)
#:use-module (gnu packages gperf)
diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm
index c7145bcb0c..6857ea2075 100644
--- a/gnu/packages/crypto.scm
+++ b/gnu/packages/crypto.scm
@@ -60,6 +60,7 @@ (define-module (gnu packages crypto)
#:use-module (gnu packages gettext)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages graphviz)
#:use-module (gnu packages image)
#:use-module (gnu packages kerberos)
diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index b717c3ad27..8b7dca46a6 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -1,14 +1,15 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019 Brian Leung <bkleung89@gmail.com>
+;;; Copyright © 2019, 2020 Leo Famulari <leo@famulari.name>
;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2020 HiPhish <hiphish@posteo.de>
-;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
;;; Copyright © 2020 Vagrant Cascadian <vagrant@debian.org>
;;; Copyright © 2021 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2021 hackeryarn <artemchernyak@gmail.com>
;;; Copyright © 2023 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;; Copyright © 2023 Felix Lechner <felix.lechner@lease-up.com>
@@ -74,6 +75,37 @@ (define-public go-github-com-yuin-goldmark
(description "This package provides a markdown parser.")
(license license:expat)))
+(define-public go-golang-org-x-crypto
+ (package
+ (name "go-golang-org-x-crypto")
+ (version "0.4.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://go.googlesource.com/crypto")
+ (commit (string-append "v" version))))
+ (file-name (string-append "go.googlesource.com-crypto-"
+ version "-checkout"))
+ (sha256
+ (base32 "13i0yz4hvc4qdr438nmzilvl5ns73v3910bakcddny3jbzq72i2m"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "golang.org/x/crypto"
+ ;; Source-only package
+ #:tests? #f
+ #:phases
+ (modify-phases %standard-phases
+ ;; Source-only package
+ (delete 'build))))
+ (propagated-inputs
+ (list go-golang-org-x-sys))
+ (home-page "https://go.googlesource.com/crypto/")
+ (synopsis "Supplementary cryptographic libraries in Go")
+ (description "This package provides supplementary cryptographic libraries
+for the Go language.")
+ (license license:bsd-3)))
+
(define-public go-golang-org-x-exp
(package
(name "go-golang-org-x-exp")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 0437b4e83d..e473c0880b 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3347,37 +3347,6 @@ (define-public go-github-com-hashicorp-hcl-v2
(home-page "https://github.com/hashicorp/hcl")
(license license:mpl2.0)))
-(define-public go-golang-org-x-crypto
- (package
- (name "go-golang-org-x-crypto")
- (version "0.4.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://go.googlesource.com/crypto")
- (commit (string-append "v" version))))
- (file-name (string-append "go.googlesource.com-crypto-"
- version "-checkout"))
- (sha256
- (base32
- "13i0yz4hvc4qdr438nmzilvl5ns73v3910bakcddny3jbzq72i2m"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "golang.org/x/crypto"
- ;; Source-only package
- #:tests? #f
- #:phases
- (modify-phases %standard-phases
- ;; Source-only package
- (delete 'build))))
- (propagated-inputs
- (list go-golang-org-x-sys))
- (synopsis "Supplementary cryptographic libraries in Go")
- (description "This package provides supplementary cryptographic libraries
-for the Go language.")
- (home-page "https://go.googlesource.com/crypto/")
- (license license:bsd-3)))
-
(define-public govulncheck
(package
(name "govulncheck")
--
2.41.0
^ permalink raw reply related [flat|nested] 64+ messages in thread* [bug#69042] [PATCH 28/30] gnu: go-github-com-klauspost-compress: Move to (gnu packages-compression).
2024-02-11 10:36 [bug#69042] [PATCH 00/30] Split (gnu packages golang) part IV Sharlatan Hellseher
` (26 preceding siblings ...)
2024-02-11 10:53 ` [bug#69042] [PATCH 27/30] gnu: go-golang-org-x-crypto: " Sharlatan Hellseher
@ 2024-02-11 10:53 ` Sharlatan Hellseher
2024-02-11 10:53 ` [bug#69042] [PATCH 29/30] gnu: go-github-com-andybalholm-brotli: " Sharlatan Hellseher
` (4 subsequent siblings)
32 siblings, 0 replies; 64+ messages in thread
From: Sharlatan Hellseher @ 2024-02-11 10:53 UTC (permalink / raw)
To: 69042; +Cc: Sharlatan Hellseher, Katherine Cox-Buday, Sharlatan Hellseher
* gnu/packages/golang.scm (go-github-com-klauspost-compress): Move from here ...
* gnu/packages/golang-compression.scm: ... to here.
* gnu/packages/golang-compression.scm: Add (gnu packages
golang-compression) module.
* gnu/packages/golang-crypto.scm: As above.
* gnu/packages/golang-web.scm: As above.
* gnu/packages/uucp.scm: As above.
Change-Id: Ia99f1e6aae7f75940fc150eb02862c0b3e9f3325
---
gnu/packages/golang-compression.scm | 31 ++++++++++++++++++++++++++++
gnu/packages/golang-crypto.scm | 3 ++-
gnu/packages/golang-web.scm | 1 +
gnu/packages/golang.scm | 32 -----------------------------
gnu/packages/uucp.scm | 1 +
5 files changed, 35 insertions(+), 33 deletions(-)
diff --git a/gnu/packages/golang-compression.scm b/gnu/packages/golang-compression.scm
index 670572ea90..5aacc34a66 100644
--- a/gnu/packages/golang-compression.scm
+++ b/gnu/packages/golang-compression.scm
@@ -56,6 +56,37 @@ (define-public go-github-com-golang-snappy
compression format.")
(license license:bsd-3)))
+(define-public go-github-com-klauspost-compress
+ (package
+ (name "go-github-com-klauspost-compress")
+ (version "1.13.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/klauspost/compress")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0ydnf9rizlhm8rilh14674qqx272sbwbkjx06xn9pqvy6mmn2r3r"))))
+ (build-system go-build-system)
+ (arguments
+ `(#:import-path "github.com/klauspost/compress"
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'reset-gzip-timestamps 'fix-permissions
+ (lambda* (#:key outputs #:allow-other-keys)
+ ;; Provide write permissions on gzip files so that
+ ;; reset-gzip-timestamps has sufficient permissions.
+ (for-each make-file-writable
+ (find-files (assoc-ref outputs "out") ".gz$")))))))
+ (propagated-inputs
+ (list go-github-com-golang-snappy))
+ (home-page "https://github.com/klauspost/compress")
+ (synopsis "Go compression library")
+ (description "@code{compress} provides various compression algorithms.")
+ (license license:bsd-3)))
+
;;;
;;; Avoid adding new packages to the end of this file. To reduce the chances
;;; of a merge conflict, place them above by existing packages with similar
diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm
index 39e7412558..58fd9cb250 100644
--- a/gnu/packages/golang-crypto.scm
+++ b/gnu/packages/golang-crypto.scm
@@ -45,7 +45,8 @@ (define-module (gnu packages golang-crypto)
#:use-module (gnu packages)
#:use-module (gnu packages golang)
#:use-module (gnu packages golang-build)
- #:use-module (gnu packages golang-check))
+ #:use-module (gnu packages golang-check)
+ #:use-module (gnu packages golang-compression))
;;; Commentary:
;;;
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index d7fb7dd366..28a9fad113 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -50,6 +50,7 @@ (define-module (gnu packages golang-web)
#:use-module (gnu packages golang)
#:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-check)
+ #:use-module (gnu packages golang-compression)
#:use-module (gnu packages golang-crypto)
#:use-module (gnu packages golang-xyz)
#:use-module (gnu packages tls)
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index e473c0880b..24ca39fc58 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9477,38 +9477,6 @@ (define-public go-github-com-dustin-go-humanize
back.")
(license license:expat)))
-(define-public go-github-com-klauspost-compress
- (package
- (name "go-github-com-klauspost-compress")
- (version "1.13.1")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/klauspost/compress")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0ydnf9rizlhm8rilh14674qqx272sbwbkjx06xn9pqvy6mmn2r3r"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/klauspost/compress"
- #:phases
- (modify-phases %standard-phases
- (add-before 'reset-gzip-timestamps 'fix-permissions
- (lambda* (#:key outputs #:allow-other-keys)
- ;; Provide write permissions on gzip files so that
- ;; reset-gzip-timestamps has sufficient permissions.
- (for-each make-file-writable
- (find-files (assoc-ref outputs "out") ".gz$")))))))
- (propagated-inputs
- (list go-github-com-golang-snappy))
- (home-page "https://github.com/klauspost/compress")
- (synopsis "Go compression library")
- (description "@code{compress} provides various compression algorithms.")
- (license license:bsd-3)))
-
(define-public go-github-com-oneofone-xxhash
(package
(name "go-github-com-oneofone-xxhash")
diff --git a/gnu/packages/uucp.scm b/gnu/packages/uucp.scm
index 8f1759556e..8e47834fef 100644
--- a/gnu/packages/uucp.scm
+++ b/gnu/packages/uucp.scm
@@ -20,6 +20,7 @@
(define-module (gnu packages uucp)
#:use-module (gnu packages golang)
#:use-module (gnu packages golang-build)
+ #:use-module (gnu packages golang-compression)
#:use-module (gnu packages golang-crypto)
#:use-module (gnu packages golang-web)
#:use-module (gnu packages texinfo)
--
2.41.0
^ permalink raw reply related [flat|nested] 64+ messages in thread* [bug#69042] [PATCH 29/30] gnu: go-github-com-andybalholm-brotli: Move to (gnu packages-compression).
2024-02-11 10:36 [bug#69042] [PATCH 00/30] Split (gnu packages golang) part IV Sharlatan Hellseher
` (27 preceding siblings ...)
2024-02-11 10:53 ` [bug#69042] [PATCH 28/30] gnu: go-github-com-klauspost-compress: Move to (gnu packages-compression) Sharlatan Hellseher
@ 2024-02-11 10:53 ` Sharlatan Hellseher
2024-02-11 10:53 ` [bug#69042] [PATCH 30/30] gnu: go-github.com-ulikunitz-xz: " Sharlatan Hellseher
` (3 subsequent siblings)
32 siblings, 0 replies; 64+ messages in thread
From: Sharlatan Hellseher @ 2024-02-11 10:53 UTC (permalink / raw)
To: 69042; +Cc: Sharlatan Hellseher, Katherine Cox-Buday, Sharlatan Hellseher
* gnu/packages/golang.scm (go-github-com-andybalholm-brotli): Move from here ...
* gnu/packages/golang-compression.scm: ... to here.
Change-Id: I820b0211b1fe4d90643e82fc32a99d8e8b6a9b0f
---
gnu/packages/golang-compression.scm | 27 +++++++++++++++++++++++++++
gnu/packages/golang.scm | 26 --------------------------
2 files changed, 27 insertions(+), 26 deletions(-)
diff --git a/gnu/packages/golang-compression.scm b/gnu/packages/golang-compression.scm
index 5aacc34a66..6a556daa25 100644
--- a/gnu/packages/golang-compression.scm
+++ b/gnu/packages/golang-compression.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2021 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2022 Sharlatan Hellseher <sharlatanus@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -33,6 +34,32 @@ (define-module (gnu packages golang-compression)
;;;
;;; Code:
\f
+(define-public go-github-com-andybalholm-brotli
+ (package
+ (name "go-github-com-andybalholm-brotli")
+ (version "1.0.4")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/andybalholm/brotli")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1zvmj7gbnkq9xwv1bvcxk9acxl06y902148qwbd2kqwgs52wy2c0"))))
+ (build-system go-build-system)
+ (arguments
+ `(#:import-path "github.com/andybalholm/brotli"))
+ (home-page "https://github.com/andybalholm/brotli")
+ (synopsis "Pure Go Brotli encoder and decoder")
+ (description
+ "This package is a brotli compressor and decompressor implemented in Go.
+It was translated from the reference implementation
+(@url{https://github.com/google/brotli,https://github.com/google/brotli}) with
+the @code{c2go} tool at
+@url{https://github.com/andybalholm/c2go,https://github.com/andybalholm/c2go}.")
+ (license license:expat)))
+
(define-public go-github-com-golang-snappy
(package
(name "go-github-com-golang-snappy")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 24ca39fc58..644121a761 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3722,32 +3722,6 @@ (define-public go-github-com-google-cadvisor
containers.")
(license license:asl2.0))))
-(define-public go-github-com-andybalholm-brotli
- (package
- (name "go-github-com-andybalholm-brotli")
- (version "1.0.4")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/andybalholm/brotli")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "1zvmj7gbnkq9xwv1bvcxk9acxl06y902148qwbd2kqwgs52wy2c0"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/andybalholm/brotli"))
- (home-page "https://github.com/andybalholm/brotli")
- (synopsis "Pure Go Brotli encoder and decoder")
- (description
- "This package is a brotli compressor and decompressor implemented in Go.
-It was translated from the reference implementation
-(@url{https://github.com/google/brotli,https://github.com/google/brotli}) with
-the @code{c2go} tool at
-@url{https://github.com/andybalholm/c2go,https://github.com/andybalholm/c2go}.")
- (license license:expat)))
-
(define-public go-github-com-jonboulle-clockwork
(let ((commit "e3653ace2d63753697e0e5b07b9393971c0bba9d")
(revision "0"))
--
2.41.0
^ permalink raw reply related [flat|nested] 64+ messages in thread* [bug#69042] [PATCH 30/30] gnu: go-github.com-ulikunitz-xz: Move to (gnu packages-compression).
2024-02-11 10:36 [bug#69042] [PATCH 00/30] Split (gnu packages golang) part IV Sharlatan Hellseher
` (28 preceding siblings ...)
2024-02-11 10:53 ` [bug#69042] [PATCH 29/30] gnu: go-github-com-andybalholm-brotli: " Sharlatan Hellseher
@ 2024-02-11 10:53 ` Sharlatan Hellseher
2024-02-12 15:08 ` [bug#69042] [PATCH 00/30] Split (gnu packages golang) part IV Sharlatan Hellseher
` (2 subsequent siblings)
32 siblings, 0 replies; 64+ messages in thread
From: Sharlatan Hellseher @ 2024-02-11 10:53 UTC (permalink / raw)
To: 69042; +Cc: Sharlatan Hellseher, Katherine Cox-Buday, Sharlatan Hellseher
* gnu/packages/golang.scm (go-github.com-ulikunitz-xz): Move from here ...
* gnu/packages/golang-compression.scm: ... to here.
* gnu/packages/admin.scm: Add (gnu packages golang-compression) module.
* gnu/packages/bioinformatics.scm: As above.
Change-Id: I1901e67ac4336efd356085332572b3f09de90f7a
---
gnu/packages/admin.scm | 1 +
gnu/packages/bioinformatics.scm | 1 +
gnu/packages/golang-compression.scm | 23 +++++++++++++++++++++++
gnu/packages/golang.scm | 22 ----------------------
4 files changed, 25 insertions(+), 22 deletions(-)
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index c595e1270f..11f69e57a4 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -131,6 +131,7 @@ (define-module (gnu packages admin)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang)
#:use-module (gnu packages golang-build)
+ #:use-module (gnu packages golang-compression)
#:use-module (gnu packages groff)
#:use-module (gnu packages gtk)
#:use-module (gnu packages guile)
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 08683bc8e9..bcfe3c2656 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -95,6 +95,7 @@ (define-module (gnu packages bioinformatics)
#:use-module (gnu packages golang)
#:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-check)
+ #:use-module (gnu packages golang-compression)
#:use-module (gnu packages glib)
#:use-module (gnu packages graph)
#:use-module (gnu packages graphics)
diff --git a/gnu/packages/golang-compression.scm b/gnu/packages/golang-compression.scm
index 6a556daa25..568fdd12b9 100644
--- a/gnu/packages/golang-compression.scm
+++ b/gnu/packages/golang-compression.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2021 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2022 Sharlatan Hellseher <sharlatanus@gmail.com>
@@ -114,6 +115,28 @@ (define-public go-github-com-klauspost-compress
(description "@code{compress} provides various compression algorithms.")
(license license:bsd-3)))
+(define-public go-github.com-ulikunitz-xz
+ (package
+ (name "go-github.com-ulikunitz-xz")
+ (version "0.5.8")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/ulikunitz/xz.git")
+ (commit (string-append "v" version))))
+ (file-name (string-append name "-" version "-checkout"))
+ (sha256
+ (base32 "1xnsymi5fmmm734bi4c6z57p5cvnyxlpi29yxs4v21w5k763aypd"))))
+ (build-system go-build-system)
+ (arguments
+ `(#:import-path "github.com/ulikunitz/xz"))
+ (home-page "https://github.com/ulikunitz/xz")
+ (synopsis "Read and write xz compressed streams in Go")
+ (description "This package provides a library to read and write xz
+compressed streams in Go.")
+ (license license:bsd-3)))
+
;;;
;;; Avoid adding new packages to the end of this file. To reduce the chances
;;; of a merge conflict, place them above by existing packages with similar
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 644121a761..7d1ae9699b 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -8968,28 +8968,6 @@ (define-public go-github-com-tekwizely-go-parsing
parsers, and related tools.")
(license license:expat))))
-(define-public go-github.com-ulikunitz-xz
- (package
- (name "go-github.com-ulikunitz-xz")
- (version "0.5.8")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/ulikunitz/xz.git")
- (commit (string-append "v" version))))
- (file-name (string-append name "-" version "-checkout"))
- (sha256
- (base32
- "1xnsymi5fmmm734bi4c6z57p5cvnyxlpi29yxs4v21w5k763aypd"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/ulikunitz/xz"))
- (synopsis "Read and write xz compressed streams in Go")
- (description "This package provides a library to read and write xz
-compressed streams in Go.")
- (home-page "https://github.com/ulikunitz/xz")
- (license license:bsd-3)))
-
(define-public go-github-com-songmu-gitconfig
(package
(name "go-github-com-songmu-gitconfig")
--
2.41.0
^ permalink raw reply related [flat|nested] 64+ messages in thread* [bug#69042] [PATCH 00/30] Split (gnu packages golang) part IV.
2024-02-11 10:36 [bug#69042] [PATCH 00/30] Split (gnu packages golang) part IV Sharlatan Hellseher
` (29 preceding siblings ...)
2024-02-11 10:53 ` [bug#69042] [PATCH 30/30] gnu: go-github.com-ulikunitz-xz: " Sharlatan Hellseher
@ 2024-02-12 15:08 ` Sharlatan Hellseher
2024-02-12 18:48 ` [bug#69042] [PATCH v2 01/30] gnu: Add (gnu packages golang-build) module Sharlatan Hellseher
2024-02-13 14:48 ` bug#69042: [PATCH 00/30] Split (gnu packages golang) part IV Sharlatan Hellseher
32 siblings, 0 replies; 64+ messages in thread
From: Sharlatan Hellseher @ 2024-02-12 15:08 UTC (permalink / raw)
To: 69042; +Cc: liliana.prikler
[-- Attachment #1: Type: text/plain, Size: 100 bytes --]
Hi,
Great, I see it. It might be a bad macro I've used.
I will prepare v2 tonight.
Thanks,
Oleg
[-- Attachment #2: Type: text/html, Size: 317 bytes --]
^ permalink raw reply [flat|nested] 64+ messages in thread* [bug#69042] [PATCH v2 01/30] gnu: Add (gnu packages golang-build) module.
2024-02-11 10:36 [bug#69042] [PATCH 00/30] Split (gnu packages golang) part IV Sharlatan Hellseher
` (30 preceding siblings ...)
2024-02-12 15:08 ` [bug#69042] [PATCH 00/30] Split (gnu packages golang) part IV Sharlatan Hellseher
@ 2024-02-12 18:48 ` Sharlatan Hellseher
2024-02-12 18:48 ` [bug#69042] [PATCH v2 02/30] gnu: Add (gnu packages golang-compression) module Sharlatan Hellseher
` (28 more replies)
2024-02-13 14:48 ` bug#69042: [PATCH 00/30] Split (gnu packages golang) part IV Sharlatan Hellseher
32 siblings, 29 replies; 64+ messages in thread
From: Sharlatan Hellseher @ 2024-02-12 18:48 UTC (permalink / raw)
To: 69042; +Cc: Sharlatan Hellseher
* gnu/packages/golang-build.scm: New file.
* gnu/local.mk: Add to gnu/packages/golang-build.scm scope.
Change-Id: I4605d44452859b47ed6369a234c7ead496b19c2a
---
gnu/local.mk | 1 +
gnu/packages/golang-build.scm | 44 +++++++++++++++++++++++++++++++++++
2 files changed, 45 insertions(+)
create mode 100644 gnu/packages/golang-build.scm
diff --git a/gnu/local.mk b/gnu/local.mk
index 7806771eea..e40be7fb46 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -307,6 +307,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/gnu-pw-mgr.scm \
%D%/packages/gobby.scm \
%D%/packages/golang.scm \
+ %D%/packages/golang-build.scm \
%D%/packages/golang-check.scm \
%D%/packages/golang-crypto.scm \
%D%/packages/golang-web.scm \
diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
new file mode 100644
index 0000000000..03fcdede80
--- /dev/null
+++ b/gnu/packages/golang-build.scm
@@ -0,0 +1,44 @@
+;;; GNU Guix --- Functional package management for GNU
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages golang-build)
+ #:use-module ((guix licenses) #:prefix license:)
+ #:use-module (guix build-system go)
+ #:use-module (guix gexp)
+ #:use-module (guix git-download)
+ #:use-module (guix packages)
+ #:use-module (guix utils)
+ #:use-module (gnu packages))
+
+;;; Commentary:
+;;;
+;;; Modules (libraries) which are part of the Golang project but outside the
+;;; main Golang tree, see <https://pkg.go.dev/golang.org/x>
+;;;
+;;; Since they are bound to be relied on by many, their dependencies should be
+;;; kept minimal, and this module should not depend on other modules
+;;; containing Golang packages.
+;;;
+;;; Please: Try to add new module packages in alphabetic order.
+;;;
+;;; Code:
+\f
+;;;
+;;; Avoid adding new packages to the end of this file. To reduce the chances
+;;; of a merge conflict, place them above by existing packages with similar
+;;; functionality or similar names.
+;;;
base-commit: bb92a4d7bc71197a51eea9075387c5313f299085
--
2.41.0
^ permalink raw reply related [flat|nested] 64+ messages in thread* [bug#69042] [PATCH v2 02/30] gnu: Add (gnu packages golang-compression) module.
2024-02-12 18:48 ` [bug#69042] [PATCH v2 01/30] gnu: Add (gnu packages golang-build) module Sharlatan Hellseher
@ 2024-02-12 18:48 ` Sharlatan Hellseher
2024-02-12 18:48 ` [bug#69042] [PATCH v2 03/30] gnu: go-golang-org-x-net: Move to golang-build Sharlatan Hellseher
` (27 subsequent siblings)
28 siblings, 0 replies; 64+ messages in thread
From: Sharlatan Hellseher @ 2024-02-12 18:48 UTC (permalink / raw)
To: 69042; +Cc: Sharlatan Hellseher
* gnu/packages/golang-compression.scm: New file.
* gnu/local.mk: Add to gnu/packages/golang-compression.scm scope.
Change-Id: I1c68a3f6f9b3d6a316cba560b7fc81e707376417
---
gnu/local.mk | 1 +
gnu/packages/golang-compression.scm | 37 +++++++++++++++++++++++++++++
2 files changed, 38 insertions(+)
create mode 100644 gnu/packages/golang-compression.scm
diff --git a/gnu/local.mk b/gnu/local.mk
index e40be7fb46..bb62c87bb6 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -309,6 +309,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/golang.scm \
%D%/packages/golang-build.scm \
%D%/packages/golang-check.scm \
+ %D%/packages/golang-compression.scm \
%D%/packages/golang-crypto.scm \
%D%/packages/golang-web.scm \
%D%/packages/golang-xyz.scm \
diff --git a/gnu/packages/golang-compression.scm b/gnu/packages/golang-compression.scm
new file mode 100644
index 0000000000..268cd16e30
--- /dev/null
+++ b/gnu/packages/golang-compression.scm
@@ -0,0 +1,37 @@
+;;; GNU Guix --- Functional package management for GNU
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages golang-compression)
+ #:use-module ((guix licenses) #:prefix license:)
+ #:use-module (guix build-system go)
+ #:use-module (guix gexp)
+ #:use-module (guix git-download)
+ #:use-module (guix packages)
+ #:use-module (guix utils)
+ #:use-module (gnu packages))
+
+;;; Commentary:
+;;;
+;;; Please: Try to add new module packages in alphabetic order.
+;;;
+;;; Code:
+\f
+;;;
+;;; Avoid adding new packages to the end of this file. To reduce the chances
+;;; of a merge conflict, place them above by existing packages with similar
+;;; functionality or similar names.
+;;;
--
2.41.0
^ permalink raw reply related [flat|nested] 64+ messages in thread* [bug#69042] [PATCH v2 03/30] gnu: go-golang-org-x-net: Move to golang-build.
2024-02-12 18:48 ` [bug#69042] [PATCH v2 01/30] gnu: Add (gnu packages golang-build) module Sharlatan Hellseher
2024-02-12 18:48 ` [bug#69042] [PATCH v2 02/30] gnu: Add (gnu packages golang-compression) module Sharlatan Hellseher
@ 2024-02-12 18:48 ` Sharlatan Hellseher
2024-02-12 18:48 ` [bug#69042] [PATCH v2 04/30] gnu: go-github-com-golang-snappy: Mmove to golang-compression Sharlatan Hellseher
` (26 subsequent siblings)
28 siblings, 0 replies; 64+ messages in thread
From: Sharlatan Hellseher @ 2024-02-12 18:48 UTC (permalink / raw)
To: 69042; +Cc: Sharlatan Hellseher, Katherine Cox-Buday, Sharlatan Hellseher
* gnu/packages/golang.scm (go-golang-org-x-net,
go-golang-org-x-net-0.17, go-golang-org-x-net-html): Move from here ...
* gnu/packages/golang-build.scm: ... to here.
* gnu/packages/configuration-management.scm: Add (gnu packages golang-build) module.
* gnu/packages/education.scm: As above ...
* gnu/packages/file-systems.scm: As above ...
* gnu/packages/golang-check.scm: As above ...
* gnu/packages/golang-crypto.scm: As above ...
* gnu/packages/golang-web.scm: As above ...
* gnu/packages/golang-xyz.scm: As above ...
* gnu/packages/golang.scm: As above ...
* gnu/packages/ipfs.scm: As above ...
* gnu/packages/messaging.scm: As above ...
* gnu/packages/networking.scm: As above ...
* gnu/packages/uucp.scm: As above ...
* gnu/packages/version-control.scm: As above ...
Change-Id: If009e62555ada293f17cf0f42fde82c21ef4615e
---
gnu/packages/configuration-management.scm | 1 +
gnu/packages/education.scm | 1 +
gnu/packages/file-systems.scm | 1 +
gnu/packages/golang-build.scm | 64 +++++++++++++++++++++++
gnu/packages/golang-check.scm | 3 +-
gnu/packages/golang-crypto.scm | 1 +
gnu/packages/golang-web.scm | 1 +
gnu/packages/golang-xyz.scm | 1 +
gnu/packages/golang.scm | 60 +--------------------
gnu/packages/ipfs.scm | 1 +
gnu/packages/messaging.scm | 1 +
gnu/packages/networking.scm | 1 +
gnu/packages/uucp.scm | 1 +
gnu/packages/version-control.scm | 1 +
14 files changed, 78 insertions(+), 60 deletions(-)
diff --git a/gnu/packages/configuration-management.scm b/gnu/packages/configuration-management.scm
index 296f48dcd5..6632f429e2 100644
--- a/gnu/packages/configuration-management.scm
+++ b/gnu/packages/configuration-management.scm
@@ -21,6 +21,7 @@ (define-module (gnu packages configuration-management)
#:use-module (guix build-system go)
#:use-module (guix git-download)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-web)
#:use-module (gnu packages version-control)
#:use-module (gnu packages textutils)
diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index 7b72ed0349..0f4a251bcc 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -47,6 +47,7 @@ (define-module (gnu packages education)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-check)
#:use-module (gnu packages gtk)
#:use-module (gnu packages gstreamer)
diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm
index 61db3086c8..af6d1ee871 100644
--- a/gnu/packages/file-systems.scm
+++ b/gnu/packages/file-systems.scm
@@ -72,6 +72,7 @@ (define-module (gnu packages file-systems)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-check)
#:use-module (gnu packages golang-crypto)
#:use-module (gnu packages guile)
diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index 03fcdede80..2601dec27a 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -1,4 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2023 Artyom V. Poptsov <poptsov.artyom@gmail.com>
+;;; Copyright © 2023 Felix Lechner <felix.lechner@lease-up.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -37,6 +40,67 @@ (define-module (gnu packages golang-build)
;;;
;;; Code:
\f
+(define-public go-golang-org-x-net
+ (let ((commit "8e0e7d8d38f2b6d21d742845570dde2902d06a1d")
+ (revision "0"))
+ (package
+ (name "go-golang-org-x-net")
+ (version (git-version "0.5.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://go.googlesource.com/net")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1fidlcn3vcz42v2lc0rpmqh3bz08bcklj6jvnmz2vvgc481ci5hy"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "golang.org/x/net"
+ ;; Source-only package
+ #:tests? #f
+ #:phases
+ #~(modify-phases %standard-phases
+ ;; Source-only package
+ (delete 'build))))
+ (home-page "https://go.googlesource.com/net")
+ (synopsis "Go supplemental networking libraries")
+ (description "This package provides supplemental Go networking libraries.")
+ (license license:bsd-3))))
+
+;; XXX: Not in use by any other packages, consider to remove or merge with
+;; go-golang-org-x-net.
+(define-public go-golang-org-x-net-0.17
+ (let ((commit "b225e7ca6dde1ef5a5ae5ce922861bda011cfabd")
+ (revision "0"))
+ (package
+ (inherit go-golang-org-x-net)
+ (name "go-golang-org-x-net")
+ (version (git-version "0.17.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://go.googlesource.com/net")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "17zhim2m0r8nyy18g2lsawxm4rawix2qbjyn80x9vc6jc8fv05m9")))))))
+
+(define-public go-golang-org-x-net-html
+ (package
+ (inherit go-golang-org-x-net)
+ (name "go-golang-org-x-net-html")
+ (arguments
+ '(#:import-path "golang.org/x/net/html"
+ #:unpack-path "golang.org/x/net"))
+ (home-page "https://godoc.org/golang.org/x/net/html")
+ (synopsis "HTML5-compliant tokenizer and parser")
+ (description
+ "This package provides an HTML5-compliant tokenizer and parser.")))
+
;;;
;;; Avoid adding new packages to the end of this file. To reduce the chances
;;; of a merge conflict, place them above by existing packages with similar
diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm
index 912444bc8e..2decd1f664 100644
--- a/gnu/packages/golang-check.scm
+++ b/gnu/packages/golang-check.scm
@@ -41,7 +41,8 @@ (define-module (gnu packages golang-check)
#:use-module (guix gexp)
#:use-module (guix git-download)
#:use-module (gnu packages)
- #:use-module (gnu packages golang))
+ #:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build))
;;; Commentary:
;;;
diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm
index bf2fc11e17..39e7412558 100644
--- a/gnu/packages/golang-crypto.scm
+++ b/gnu/packages/golang-crypto.scm
@@ -44,6 +44,7 @@ (define-module (gnu packages golang-crypto)
#:use-module (guix utils)
#:use-module (gnu packages)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-check))
;;; Commentary:
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 719cb5dfeb..d7fb7dd366 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -48,6 +48,7 @@ (define-module (gnu packages golang-web)
#:use-module (guix utils)
#:use-module (gnu packages)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-check)
#:use-module (gnu packages golang-crypto)
#:use-module (gnu packages golang-xyz)
diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 8823ae21c6..33aa43357f 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -27,6 +27,7 @@ (define-module (gnu packages golang-xyz)
#:use-module (guix utils)
#:use-module (gnu packages)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-check)
#:use-module (gnu packages golang-crypto))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 163691a1e6..3997f4057d 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -81,6 +81,7 @@ (define-module (gnu packages golang)
#:use-module (gnu packages gcc)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnupg)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-check)
#:use-module (gnu packages golang-crypto)
#:use-module (gnu packages golang-web)
@@ -3650,65 +3651,6 @@ (define-public gopls
editor.")
(license license:bsd-3)))
-(define-public go-golang-org-x-net
- (let ((commit "8e0e7d8d38f2b6d21d742845570dde2902d06a1d")
- (revision "0"))
- (package
- (name "go-golang-org-x-net")
- (version (git-version "0.5.0" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://go.googlesource.com/net")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1fidlcn3vcz42v2lc0rpmqh3bz08bcklj6jvnmz2vvgc481ci5hy"))))
- (build-system go-build-system)
- (arguments
- (list
- #:import-path "golang.org/x/net"
- ;; Source-only package
- #:tests? #f
- #:phases
- #~(modify-phases %standard-phases
- ;; Source-only package
- (delete 'build))))
- (synopsis "Go supplemental networking libraries")
- (description "This package provides supplemental Go networking libraries.")
- (home-page "https://go.googlesource.com/net")
- (license license:bsd-3))))
-
-(define-public go-golang-org-x-net-0.17
- (let ((commit "b225e7ca6dde1ef5a5ae5ce922861bda011cfabd")
- (revision "0"))
- (package
- (inherit go-golang-org-x-net)
- (name "go-golang-org-x-net")
- (version (git-version "0.17.0" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://go.googlesource.com/net")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "17zhim2m0r8nyy18g2lsawxm4rawix2qbjyn80x9vc6jc8fv05m9")))))))
-
-(define-public go-golang-org-x-net-html
- (package
- (inherit go-golang-org-x-net)
- (name "go-golang.org-x-net-html")
- (arguments
- '(#:import-path "golang.org/x/net/html"
- #:unpack-path "golang.org/x/net"))
- (synopsis "HTML5-compliant tokenizer and parser")
- (description
- "This package provides an HTML5-compliant tokenizer and parser.")
- (home-page "https://godoc.org/golang.org/x/net/html")))
-
(define-public go-golang-org-x-image
(let ((commit "58c23975cae11f062d4b3b0c143fe248faac195d")
(revision "1"))
diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm
index a1b9333066..ae514cd93b 100644
--- a/gnu/packages/ipfs.scm
+++ b/gnu/packages/ipfs.scm
@@ -29,6 +29,7 @@ (define-module (gnu packages ipfs)
#:use-module (guix download)
#:use-module (guix build-system go)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-check)
#:use-module (gnu packages golang-crypto)
#:use-module (gnu packages golang-web)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index bb33be4872..98c1c9bf67 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -86,6 +86,7 @@ (define-module (gnu packages messaging)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages gperf)
#:use-module (gnu packages graphviz)
#:use-module (gnu packages gstreamer)
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 8d358961a1..dc21b2fbd0 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -125,6 +125,7 @@ (define-module (gnu packages networking)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-web)
#:use-module (gnu packages graphviz)
#:use-module (gnu packages gstreamer)
diff --git a/gnu/packages/uucp.scm b/gnu/packages/uucp.scm
index 37dc27625a..8f1759556e 100644
--- a/gnu/packages/uucp.scm
+++ b/gnu/packages/uucp.scm
@@ -19,6 +19,7 @@
(define-module (gnu packages uucp)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-crypto)
#:use-module (gnu packages golang-web)
#:use-module (gnu packages texinfo)
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 8f9fae5ce2..51754245d3 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -106,6 +106,7 @@ (define-module (gnu packages version-control)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-check)
#:use-module (gnu packages golang-crypto)
#:use-module (gnu packages golang-web)
--
2.41.0
^ permalink raw reply related [flat|nested] 64+ messages in thread* [bug#69042] [PATCH v2 04/30] gnu: go-github-com-golang-snappy: Mmove to golang-compression.
2024-02-12 18:48 ` [bug#69042] [PATCH v2 01/30] gnu: Add (gnu packages golang-build) module Sharlatan Hellseher
2024-02-12 18:48 ` [bug#69042] [PATCH v2 02/30] gnu: Add (gnu packages golang-compression) module Sharlatan Hellseher
2024-02-12 18:48 ` [bug#69042] [PATCH v2 03/30] gnu: go-golang-org-x-net: Move to golang-build Sharlatan Hellseher
@ 2024-02-12 18:48 ` Sharlatan Hellseher
2024-02-12 18:48 ` [bug#69042] [PATCH v2 05/30] gnu: go-github-com-mreiferson-go-options: Move to golang-xyz Sharlatan Hellseher
` (25 subsequent siblings)
28 siblings, 0 replies; 64+ messages in thread
From: Sharlatan Hellseher @ 2024-02-12 18:48 UTC (permalink / raw)
To: 69042; +Cc: Sharlatan Hellseher, Katherine Cox-Buday, Sharlatan Hellseher
* gnu/packages/syncthing.scm (go-github-com-golang-snappy): Move from
here ...
* gnu/packages/golang-compression.scm: ... to here.
* gnu/packages/golang.scm: Add (gnu packages golang-compression) module.
* gnu/packages/high-availability.scm: As above.
* gnu/packages/ipfs.scm: As above.
* gnu/packages/syncthing.scm: As above.
Change-Id: I936c82c127e1aa25dde20693bee70e5a871249fe
---
gnu/packages/golang-compression.scm | 26 ++++++++++++++++++++++++++
gnu/packages/golang.scm | 1 +
gnu/packages/high-availability.scm | 4 ++--
gnu/packages/ipfs.scm | 1 +
gnu/packages/syncthing.scm | 24 +-----------------------
5 files changed, 31 insertions(+), 25 deletions(-)
diff --git a/gnu/packages/golang-compression.scm b/gnu/packages/golang-compression.scm
index 268cd16e30..670572ea90 100644
--- a/gnu/packages/golang-compression.scm
+++ b/gnu/packages/golang-compression.scm
@@ -1,4 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2021 Arun Isaac <arunisaac@systemreboot.net>
+;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -30,6 +33,29 @@ (define-module (gnu packages golang-compression)
;;;
;;; Code:
\f
+(define-public go-github-com-golang-snappy
+ (package
+ (name "go-github-com-golang-snappy")
+ (version "0.0.4")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/golang/snappy")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "004cw699yz3pdpawhjhpa0y94c4w479nw1rf39zj6h6027kpwv2j"))
+ (patches (search-patches "go-github-com-golang-snappy-32bit-test.patch"))))
+ (build-system go-build-system)
+ (arguments
+ `(#:import-path "github.com/golang/snappy"))
+ (home-page "https://github.com/golang/snappy")
+ (synopsis "Snappy compression format in the Go programming language")
+ (description "This package provides a Go implementation of the Snappy
+compression format.")
+ (license license:bsd-3)))
+
;;;
;;; Avoid adding new packages to the end of this file. To reduce the chances
;;; of a merge conflict, place them above by existing packages with similar
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 3997f4057d..43e9024167 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -83,6 +83,7 @@ (define-module (gnu packages golang)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-check)
+ #:use-module (gnu packages golang-compression)
#:use-module (gnu packages golang-crypto)
#:use-module (gnu packages golang-web)
#:use-module (gnu packages lua)
diff --git a/gnu/packages/high-availability.scm b/gnu/packages/high-availability.scm
index 9760084603..ad18a39738 100644
--- a/gnu/packages/high-availability.scm
+++ b/gnu/packages/high-availability.scm
@@ -36,6 +36,7 @@ (define-module (gnu packages high-availability)
#:use-module (gnu packages gettext)
#:use-module (gnu packages glib)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-compression)
#:use-module (gnu packages golang-crypto)
#:use-module (gnu packages golang-web)
#:use-module (gnu packages golang-xyz)
@@ -48,7 +49,6 @@ (define-module (gnu packages high-availability)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages rsync)
- #:use-module (gnu packages syncthing)
#:use-module (gnu packages tls)
#:use-module (gnu packages valgrind)
#:use-module (gnu packages version-control)
@@ -284,7 +284,7 @@ (define-public nsq
go-github-com-bmizerany-perks-quantile
go-github-com-burntsushi-toml
go-github-com-davecgh-go-spew
- go-github-com-golang-snappy ; Move to (gnu packages golang)
+ go-github-com-golang-snappy
go-github-com-julienschmidt-httprouter
go-github-com-mreiferson-go-options
go-github-com-mreiferson-go-svc
diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm
index ae514cd93b..f09d0190dd 100644
--- a/gnu/packages/ipfs.scm
+++ b/gnu/packages/ipfs.scm
@@ -31,6 +31,7 @@ (define-module (gnu packages ipfs)
#:use-module (gnu packages golang)
#:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-check)
+ #:use-module (gnu packages golang-compression)
#:use-module (gnu packages golang-crypto)
#:use-module (gnu packages golang-web)
#:use-module (gnu packages python)
diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm
index 4c3aa8f30b..c0270b87e5 100644
--- a/gnu/packages/syncthing.scm
+++ b/gnu/packages/syncthing.scm
@@ -38,6 +38,7 @@ (define-module (gnu packages syncthing)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-compression)
#:use-module (gnu packages gtk)
#:use-module (gnu packages linux)
#:use-module (gnu packages python-crypto)
@@ -398,29 +399,6 @@ (define-public go-github-com-golang-groupcache-lru
(home-page "https://github.com/golang/groupcache")
(license asl2.0))))
-(define-public go-github-com-golang-snappy
- (package
- (name "go-github-com-golang-snappy")
- (version "0.0.4")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/golang/snappy")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "004cw699yz3pdpawhjhpa0y94c4w479nw1rf39zj6h6027kpwv2j"))
- (patches (search-patches "go-github-com-golang-snappy-32bit-test.patch"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/golang/snappy"))
- (synopsis "Snappy compression format in the Go programming language")
- (description "This package provides a Go implementation of the Snappy
-compression format.")
- (home-page "https://github.com/golang/snappy")
- (license bsd-3)))
-
(define-public go-github-com-jackpal-gateway
(package
(name "go-github-com-jackpal-gateway")
--
2.41.0
^ permalink raw reply related [flat|nested] 64+ messages in thread* [bug#69042] [PATCH v2 05/30] gnu: go-github-com-mreiferson-go-options: Move to golang-xyz.
2024-02-12 18:48 ` [bug#69042] [PATCH v2 01/30] gnu: Add (gnu packages golang-build) module Sharlatan Hellseher
` (2 preceding siblings ...)
2024-02-12 18:48 ` [bug#69042] [PATCH v2 04/30] gnu: go-github-com-golang-snappy: Mmove to golang-compression Sharlatan Hellseher
@ 2024-02-12 18:48 ` Sharlatan Hellseher
2024-02-12 18:48 ` [bug#69042] [PATCH v2 06/30] gnu: go-golang-org-x-sys: Move to golang-build Sharlatan Hellseher
` (24 subsequent siblings)
28 siblings, 0 replies; 64+ messages in thread
From: Sharlatan Hellseher @ 2024-02-12 18:48 UTC (permalink / raw)
To: 69042; +Cc: Sharlatan Hellseher, Katherine Cox-Buday, Sharlatan Hellseher
* gnu/packages/golang.scm (go-github-com-mreiferson-go-options): Move
from here ...
* gnu/packages/golang-xyz.scm: ... to here.
Change-Id: Ia5cf19a48812b56b0b38ed80246a65c345454c79
---
gnu/packages/golang-xyz.scm | 24 ++++++++++++++++++++++++
gnu/packages/golang.scm | 23 -----------------------
2 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 33aa43357f..ebcf333b13 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2023 Benjamin <benjamin@uvy.fr>
+;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com>
;;; Copyright © 2023 Thomas Ieong <th.ieong@free.fr>
;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;;
@@ -146,6 +147,29 @@ (define-public go-github-com-matryer-try
(description "This package provides an idiomatic Go retry module.")
(license license:expat)))
+(define-public go-github-com-mreiferson-go-options
+ (package
+ (name "go-github-com-mreiferson-go-options")
+ (version "1.0.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/mreiferson/go-options")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1pxs9ybrh196qy14ijn4zn51h2z28lj31y6vxrz2xxhgvpmfmxyl"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/mreiferson/go-options"))
+ (home-page "https://github.com/mreiferson/go-options")
+ (synopsis "Go package to structure and resolve options")
+ (description
+ "The @code{options} Go package resolves configuration values set via
+command line flags, config files, and default struct values.")
+ (license license:expat)))
+
(define-public go-github-com-nats-io-nats-go
(package
(name "go-github-com-nats-io-nats-go")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 43e9024167..73e7077eac 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -5515,29 +5515,6 @@ (define-public go-github-com-mr-tron-base58
encoding and 8 times faster decoding.")
(license license:expat))))
-(define-public go-github-com-mreiferson-go-options
- (package
- (name "go-github-com-mreiferson-go-options")
- (version "1.0.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/mreiferson/go-options")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1pxs9ybrh196qy14ijn4zn51h2z28lj31y6vxrz2xxhgvpmfmxyl"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/mreiferson/go-options"))
- (home-page "https://github.com/mreiferson/go-options")
- (synopsis "Go package to structure and resolve options")
- (description
- "The @code{options} Go package resolves configuration values set via
-command line flags, config files, and default struct values.")
- (license license:expat)))
-
(define-public go-github-com-mreiferson-go-svc
;; NSQ specific fork of github.com/judwhite/go-svc, as Guix go build system
;; does not support go.mod with `replace' statement.
--
2.41.0
^ permalink raw reply related [flat|nested] 64+ messages in thread* [bug#69042] [PATCH v2 06/30] gnu: go-golang-org-x-sys: Move to golang-build.
2024-02-12 18:48 ` [bug#69042] [PATCH v2 01/30] gnu: Add (gnu packages golang-build) module Sharlatan Hellseher
` (3 preceding siblings ...)
2024-02-12 18:48 ` [bug#69042] [PATCH v2 05/30] gnu: go-github-com-mreiferson-go-options: Move to golang-xyz Sharlatan Hellseher
@ 2024-02-12 18:48 ` Sharlatan Hellseher
2024-02-12 18:48 ` [bug#69042] [PATCH v2 07/30] gnu: go-github-com-mreiferson-go-svc: Move to golang-xyz Sharlatan Hellseher
` (23 subsequent siblings)
28 siblings, 0 replies; 64+ messages in thread
From: Sharlatan Hellseher @ 2024-02-12 18:48 UTC (permalink / raw)
To: 69042
Cc: Sharlatan Hellseher, Katherine Cox-Buday, Leo Famulari,
Sharlatan Hellseher, Tobias Geerinckx-Rice, Wilko Meyer
* gnu/packages/golang.scm (go-golang-org-x-sys): Move
from here ...
* gnu/packages/golang-build.scm: ... to here.
* gnu/packages/curl.scm: Add (gnu packages golang-build) module.
* gnu/packages/databases.scm: As above.
* gnu/packages/docker.scm: As above.
* gnu/packages/golang-build.scm: As above.
* gnu/packages/golang.scm: As above.
* gnu/packages/irc.scm: As above.
* gnu/packages/linux.scm: As above.
* gnu/packages/password-utils.scm: As above.
* gnu/packages/syncthing.scm: As above.
* gnu/packages/textutils.scm: As above.
* gnu/packages/vpn.scm: As above.
* gnu/packages/weather.scm: As above.
* gnu/packages/web.scm: As above.
Change-Id: I161e89cacb9aa87b4fbb643ecd9ad32cfe49c9d7
---
gnu/packages/curl.scm | 1 +
gnu/packages/databases.scm | 1 +
gnu/packages/docker.scm | 1 +
gnu/packages/golang-build.scm | 31 +++++++++++++++++++++++++++++++
gnu/packages/golang.scm | 31 -------------------------------
gnu/packages/irc.scm | 1 +
gnu/packages/linux.scm | 1 +
gnu/packages/password-utils.scm | 1 +
gnu/packages/syncthing.scm | 1 +
gnu/packages/textutils.scm | 1 +
gnu/packages/vpn.scm | 1 +
gnu/packages/weather.scm | 3 ++-
gnu/packages/web.scm | 1 +
13 files changed, 43 insertions(+), 32 deletions(-)
diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm
index 0fb83a7a12..02a602a66d 100644
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@ -49,6 +49,7 @@ (define-module (gnu packages curl)
#:use-module (gnu packages check)
#:use-module (gnu packages compression)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages guile)
#:use-module (gnu packages kerberos)
#:use-module (gnu packages logging)
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 903088ed4b..dc4a91f14d 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -107,6 +107,7 @@ (define-module (gnu packages databases)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-check)
#:use-module (gnu packages golang-web)
#:use-module (gnu packages gperf)
diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm
index fbe8edeef0..0fe1f2c1c7 100644
--- a/gnu/packages/docker.scm
+++ b/gnu/packages/docker.scm
@@ -42,6 +42,7 @@ (define-module (gnu packages docker)
#:use-module (gnu packages compression)
#:use-module (gnu packages glib)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages linux)
#:use-module (gnu packages networking)
#:use-module (gnu packages pkg-config)
diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index 2601dec27a..eeab951f1e 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -101,6 +101,37 @@ (define-public go-golang-org-x-net-html
(description
"This package provides an HTML5-compliant tokenizer and parser.")))
+(define-public go-golang-org-x-sys
+ (let ((commit "ca59edaa5a761e1d0ea91d6c07b063f85ef24f78")
+ (revision "0"))
+ (package
+ (name "go-golang-org-x-sys")
+ (version (git-version "0.8.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://go.googlesource.com/sys")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1p81niiin8dwyrjl2xsc95136w3vdw4kmj0w3mlh0vh5v134s4xq"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "golang.org/x/sys"
+ ;; Source-only package
+ #:tests? #f
+ #:phases
+ #~(modify-phases %standard-phases
+ ;; Source-only package
+ (delete 'build))))
+ (home-page "https://go.googlesource.com/sys")
+ (synopsis "Go support for low-level system interaction")
+ (description "This package provides supplemental libraries offering Go
+support for low-level interaction with the operating system.")
+ (license license:bsd-3))))
+
;;;
;;; Avoid adding new packages to the end of this file. To reduce the chances
;;; of a merge conflict, place them above by existing packages with similar
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 73e7077eac..373b57c5ad 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3712,37 +3712,6 @@ (define-public go-golang-org-x-sync
(home-page "https://go.googlesource.com/sync/")
(license license:bsd-3))))
-(define-public go-golang-org-x-sys
- (let ((commit "ca59edaa5a761e1d0ea91d6c07b063f85ef24f78")
- (revision "0"))
- (package
- (name "go-golang-org-x-sys")
- (version (git-version "0.8.0" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://go.googlesource.com/sys")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1p81niiin8dwyrjl2xsc95136w3vdw4kmj0w3mlh0vh5v134s4xq"))))
- (build-system go-build-system)
- (arguments
- (list
- #:import-path "golang.org/x/sys"
- ;; Source-only package
- #:tests? #f
- #:phases
- #~(modify-phases %standard-phases
- ;; Source-only package
- (delete 'build))))
- (synopsis "Go support for low-level system interaction")
- (description "This package provides supplemental libraries offering Go
-support for low-level interaction with the operating system.")
- (home-page "https://go.googlesource.com/sys")
- (license license:bsd-3))))
-
(define-public go-golang-org-x-text
(package
(name "go-golang-org-x-text")
diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm
index 3200ccc135..c211fa6595 100644
--- a/gnu/packages/irc.scm
+++ b/gnu/packages/irc.scm
@@ -67,6 +67,7 @@ (define-module (gnu packages irc)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-check)
#:use-module (gnu packages gtk)
#:use-module (gnu packages guile)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index b8b119e474..d798c44a8f 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -134,6 +134,7 @@ (define-module (gnu packages linux)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages gperf)
#:use-module (gnu packages graphviz)
#:use-module (gnu packages gstreamer)
diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm
index 6dc257dc0e..3a2bb410f2 100644
--- a/gnu/packages/password-utils.scm
+++ b/gnu/packages/password-utils.scm
@@ -91,6 +91,7 @@ (define-module (gnu packages password-utils)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-crypto)
#:use-module (gnu packages gtk)
#:use-module (gnu packages guile)
diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm
index c0270b87e5..dbca1e5e90 100644
--- a/gnu/packages/syncthing.scm
+++ b/gnu/packages/syncthing.scm
@@ -38,6 +38,7 @@ (define-module (gnu packages syncthing)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-compression)
#:use-module (gnu packages gtk)
#:use-module (gnu packages linux)
diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index be5cb15cb8..25de916fcb 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -67,6 +67,7 @@ (define-module (gnu packages textutils)
#:use-module (gnu packages gcc)
#:use-module (gnu packages gettext)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-check)
#:use-module (gnu packages golang-crypto)
#:use-module (gnu packages java)
diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
index 0070eaab6f..7823ef19eb 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -71,6 +71,7 @@ (define-module (gnu packages vpn)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages guile)
#:use-module (gnu packages libevent)
#:use-module (gnu packages linux)
diff --git a/gnu/packages/weather.scm b/gnu/packages/weather.scm
index 6ba656017f..5a58b97a30 100644
--- a/gnu/packages/weather.scm
+++ b/gnu/packages/weather.scm
@@ -22,7 +22,8 @@ (define-module (gnu packages weather)
#:use-module (guix git-download)
#:use-module (guix packages)
#:use-module (gnu packages)
- #:use-module (gnu packages golang))
+ #:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build))
(define-public wego
(package
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index a1039b9e0c..0c67e7d6e4 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -143,6 +143,7 @@ (define-module (gnu packages web)
#:use-module (gnu packages gnunet)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-web)
#:use-module (gnu packages gperf)
#:use-module (gnu packages graphviz)
--
2.41.0
^ permalink raw reply related [flat|nested] 64+ messages in thread* [bug#69042] [PATCH v2 07/30] gnu: go-github-com-mreiferson-go-svc: Move to golang-xyz.
2024-02-12 18:48 ` [bug#69042] [PATCH v2 01/30] gnu: Add (gnu packages golang-build) module Sharlatan Hellseher
` (4 preceding siblings ...)
2024-02-12 18:48 ` [bug#69042] [PATCH v2 06/30] gnu: go-golang-org-x-sys: Move to golang-build Sharlatan Hellseher
@ 2024-02-12 18:48 ` Sharlatan Hellseher
2024-02-12 18:48 ` [bug#69042] [PATCH v2 08/30] gnu: go-github-com-nsqio-go-nsq: " Sharlatan Hellseher
` (22 subsequent siblings)
28 siblings, 0 replies; 64+ messages in thread
From: Sharlatan Hellseher @ 2024-02-12 18:48 UTC (permalink / raw)
To: 69042; +Cc: Sharlatan Hellseher, Katherine Cox-Buday, Sharlatan Hellseher
* gnu/packages/golang.scm (go-github-com-mreiferson-go-svc): Move
from here ...
* gnu/packages/golang-xyz.scm: ... to here.
Change-Id: I21f1d5f651fb09a3716cbcdb48aaf7f8dd37384d
---
gnu/packages/golang-xyz.scm | 28 ++++++++++++++++++++++++++++
gnu/packages/golang.scm | 28 ----------------------------
2 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index ebcf333b13..aefe0e0d9c 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -170,6 +170,34 @@ (define-public go-github-com-mreiferson-go-options
command line flags, config files, and default struct values.")
(license license:expat)))
+(define-public go-github-com-mreiferson-go-svc
+ ;; NSQ specific fork of github.com/judwhite/go-svc, as Guix go build system
+ ;; does not support go.mod with `replace' statement.
+ (let ((commit "7a96e00010f68d9436e3de53a70c53f209a0c244")
+ (revision "0"))
+ (package
+ (name "go-github-com-mreiferson-go-svc")
+ (version (git-version "1.2.1" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/mreiferson/go-svc")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1acgb0n3svhnraqj1fz5qc5n3b4vc5ffwyk9vfi6gcfkibm0hgmd"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/judwhite/go-svc"))
+ (propagated-inputs (list go-golang-org-x-sys))
+ (home-page "https://github.com/mreiferson/go-svc")
+ (synopsis "Go Windows Service wrapper for GNU/Linux")
+ (description
+ "Go Windows Service wrapper compatible with GNU/Linux. Windows tests
+@url{https://github.com/judwhite/go-svc/raw/master/svc/svc_windows_test.go,here}.")
+ (license license:expat))))
+
(define-public go-github-com-nats-io-nats-go
(package
(name "go-github-com-nats-io-nats-go")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 373b57c5ad..5887d68630 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -5484,34 +5484,6 @@ (define-public go-github-com-mr-tron-base58
encoding and 8 times faster decoding.")
(license license:expat))))
-(define-public go-github-com-mreiferson-go-svc
- ;; NSQ specific fork of github.com/judwhite/go-svc, as Guix go build system
- ;; does not support go.mod with `replace' statement.
- (let ((commit "7a96e00010f68d9436e3de53a70c53f209a0c244")
- (revision "0"))
- (package
- (name "go-github-com-mreiferson-go-svc")
- (version (git-version "1.2.1" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/mreiferson/go-svc")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1acgb0n3svhnraqj1fz5qc5n3b4vc5ffwyk9vfi6gcfkibm0hgmd"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/judwhite/go-svc"))
- (propagated-inputs (list go-golang-org-x-sys))
- (home-page "https://github.com/mreiferson/go-svc")
- (synopsis "Go Windows Service wrapper for GNU/Linux")
- (description
- "Go Windows Service wrapper compatible with GNU/Linux. Windows tests
-@url{https://github.com/judwhite/go-svc/raw/master/svc/svc_windows_test.go,here}.")
- (license license:expat))))
-
(define-public go-github-com-spaolacci-murmur3
(package
(name "go-github-com-spaolacci-murmur3")
--
2.41.0
^ permalink raw reply related [flat|nested] 64+ messages in thread* [bug#69042] [PATCH v2 08/30] gnu: go-github-com-nsqio-go-nsq: Move to golang-xyz.
2024-02-12 18:48 ` [bug#69042] [PATCH v2 01/30] gnu: Add (gnu packages golang-build) module Sharlatan Hellseher
` (5 preceding siblings ...)
2024-02-12 18:48 ` [bug#69042] [PATCH v2 07/30] gnu: go-github-com-mreiferson-go-svc: Move to golang-xyz Sharlatan Hellseher
@ 2024-02-12 18:48 ` Sharlatan Hellseher
2024-02-12 18:48 ` [bug#69042] [PATCH v2 09/30] gnu: go-github-com-nsqio-go-diskqueue: " Sharlatan Hellseher
` (21 subsequent siblings)
28 siblings, 0 replies; 64+ messages in thread
From: Sharlatan Hellseher @ 2024-02-12 18:48 UTC (permalink / raw)
To: 69042; +Cc: Sharlatan Hellseher, Katherine Cox-Buday, Sharlatan Hellseher
* gnu/packages/golang.scm (go-github-com-nsqio-go-nsq): Move
from here ...
* gnu/packages/golang-xyz.scm: ... to here.
Change-Id: Ie718c9943dd527281b30c78ab4e23adc764289c1
---
gnu/packages/golang-xyz.scm | 27 +++++++++++++++++++++++++++
gnu/packages/golang.scm | 26 --------------------------
2 files changed, 27 insertions(+), 26 deletions(-)
diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index aefe0e0d9c..bbf72f1105 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -30,6 +30,7 @@ (define-module (gnu packages golang-xyz)
#:use-module (gnu packages golang)
#:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-check)
+ #:use-module (gnu packages golang-compression)
#:use-module (gnu packages golang-crypto))
;;; Commentary:
@@ -249,6 +250,32 @@ (define-public go-github-com-nats-io-nuid
very fast, and tries to be entropy pool friendly.")
(license license:asl2.0)))
+(define-public go-github-com-nsqio-go-nsq
+ (package
+ (name "go-github-com-nsqio-go-nsq")
+ (version "1.1.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/nsqio/go-nsq")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1h9z3z225sdgg7fl3l7x11xn5ch6lm5flgmcj046cdp453qj2qhf"))))
+ (build-system go-build-system)
+ (arguments
+ (list #:tests? #f ;tests require networking
+ #:import-path "github.com/nsqio/go-nsq"))
+ (propagated-inputs (list go-github-com-golang-snappy))
+ (home-page "https://github.com/nsqio/go-nsq")
+ (synopsis "Consumer/producer library for NSQ")
+ (description
+ "The @code{nsq} Go module provides a high-level @code{Consumer} and
+@code{Producer} types as well as low-level functions to communicate over the
+NSQ protocol @url{https://nsq.io/}.")
+ (license license:expat)))
+
(define-public go-go-uber-org-automaxprocs
(package
(name "go-go-uber-org-automaxprocs")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 5887d68630..b8b5a67613 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3098,32 +3098,6 @@ (define-public go-github-com-nsqio-go-diskqueue
queue.")
(license license:expat)))
-(define-public go-github-com-nsqio-go-nsq
- (package
- (name "go-github-com-nsqio-go-nsq")
- (version "1.1.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/nsqio/go-nsq")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1h9z3z225sdgg7fl3l7x11xn5ch6lm5flgmcj046cdp453qj2qhf"))))
- (build-system go-build-system)
- (arguments
- (list #:tests? #f ;tests require networking
- #:import-path "github.com/nsqio/go-nsq"))
- (propagated-inputs (list go-github-com-golang-snappy))
- (home-page "https://github.com/nsqio/go-nsq")
- (synopsis "Consumer/producer library for NSQ")
- (description
- "The @code{nsq} Go module provides a high-level @code{Consumer} and
-@code{Producer} types as well as low-level functions to communicate over the
-NSQ protocol @url{https://nsq.io/}.")
- (license license:expat)))
-
(define-public go-github-com-hebcal-gematriya
(let ((commit "fe3043f73e415eb82727701d10f2fb40f87675e9")
(revision "0"))
--
2.41.0
^ permalink raw reply related [flat|nested] 64+ messages in thread* [bug#69042] [PATCH v2 09/30] gnu: go-github-com-nsqio-go-diskqueue: Move to golang-xyz.
2024-02-12 18:48 ` [bug#69042] [PATCH v2 01/30] gnu: Add (gnu packages golang-build) module Sharlatan Hellseher
` (6 preceding siblings ...)
2024-02-12 18:48 ` [bug#69042] [PATCH v2 08/30] gnu: go-github-com-nsqio-go-nsq: " Sharlatan Hellseher
@ 2024-02-12 18:48 ` Sharlatan Hellseher
2024-02-12 18:48 ` [bug#69042] [PATCH v2 10/30] gnu: go-github-com-davecgh-go-spew: Move to golang-check Sharlatan Hellseher
` (20 subsequent siblings)
28 siblings, 0 replies; 64+ messages in thread
From: Sharlatan Hellseher @ 2024-02-12 18:48 UTC (permalink / raw)
To: 69042; +Cc: Sharlatan Hellseher, Katherine Cox-Buday, Sharlatan Hellseher
* gnu/packages/golang.scm (go-github-com-nsqio-go-diskqueue): Move
from here ...
* gnu/packages/golang-xyz.scm: ... to here.
Change-Id: I2051eb1f8a40eeab9c8cc96c540413f5818dd78e
---
gnu/packages/golang-xyz.scm | 23 +++++++++++++++++++++++
gnu/packages/golang.scm | 23 -----------------------
2 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index bbf72f1105..1999aab7fb 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -250,6 +250,29 @@ (define-public go-github-com-nats-io-nuid
very fast, and tries to be entropy pool friendly.")
(license license:asl2.0)))
+(define-public go-github-com-nsqio-go-diskqueue
+ (package
+ (name "go-github-com-nsqio-go-diskqueue")
+ (version "1.1.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/nsqio/go-diskqueue")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1hp66hkmfn0nyf3c53a40f94ah11a9rj01r5zp3jph9p54j8rany"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/nsqio/go-diskqueue"))
+ (home-page "https://github.com/nsqio/go-diskqueue")
+ (synopsis "Go package providing a file system backed FIFO queue")
+ (description
+ "The @code{diskqueue} Go package provides a file system backed FIFO
+queue.")
+ (license license:expat)))
+
(define-public go-github-com-nsqio-go-nsq
(package
(name "go-github-com-nsqio-go-nsq")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index b8b5a67613..599fdf9f2d 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3075,29 +3075,6 @@ (define-public go-github-com-nathan-osman-go-sunrise
sunset times from geographical coordinates and a date.")
(license license:expat))))
-(define-public go-github-com-nsqio-go-diskqueue
- (package
- (name "go-github-com-nsqio-go-diskqueue")
- (version "1.1.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/nsqio/go-diskqueue")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1hp66hkmfn0nyf3c53a40f94ah11a9rj01r5zp3jph9p54j8rany"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/nsqio/go-diskqueue"))
- (home-page "https://github.com/nsqio/go-diskqueue")
- (synopsis "Go package providing a file system backed FIFO queue")
- (description
- "The @code{diskqueue} Go package provides a file system backed FIFO
-queue.")
- (license license:expat)))
-
(define-public go-github-com-hebcal-gematriya
(let ((commit "fe3043f73e415eb82727701d10f2fb40f87675e9")
(revision "0"))
--
2.41.0
^ permalink raw reply related [flat|nested] 64+ messages in thread* [bug#69042] [PATCH v2 10/30] gnu: go-github-com-davecgh-go-spew: Move to golang-check.
2024-02-12 18:48 ` [bug#69042] [PATCH v2 01/30] gnu: Add (gnu packages golang-build) module Sharlatan Hellseher
` (7 preceding siblings ...)
2024-02-12 18:48 ` [bug#69042] [PATCH v2 09/30] gnu: go-github-com-nsqio-go-diskqueue: " Sharlatan Hellseher
@ 2024-02-12 18:48 ` Sharlatan Hellseher
2024-02-12 18:48 ` [bug#69042] [PATCH v2 11/30] gnu: go-github-com-burntsushi-toml: Move to golang-xyz Sharlatan Hellseher
` (19 subsequent siblings)
28 siblings, 0 replies; 64+ messages in thread
From: Sharlatan Hellseher @ 2024-02-12 18:48 UTC (permalink / raw)
To: 69042; +Cc: Sharlatan Hellseher, Katherine Cox-Buday, Sharlatan Hellseher
* gnu/packages/golang.scm (go-github-com-davecgh-go-spew): Move
from here ...
* gnu/packages/golang-check.scm: ... to here.
* gnu/packages/high-availability.scm: Add (gnu packages golang-check) module.
Change-Id: I935006c3656b7bf18b91e529296778672338f094
---
gnu/packages/golang-check.scm | 38 ++++++++++++++++++++++++++++++
gnu/packages/golang.scm | 38 ------------------------------
gnu/packages/high-availability.scm | 1 +
3 files changed, 39 insertions(+), 38 deletions(-)
diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm
index 2decd1f664..c5e30f7fe1 100644
--- a/gnu/packages/golang-check.scm
+++ b/gnu/packages/golang-check.scm
@@ -124,6 +124,44 @@ (define-public go-github-com-cheekybits-is
@end itemize\n")
(license license:expat))))
+(define-public go-github-com-davecgh-go-spew
+ (package
+ (name "go-github-com-davecgh-go-spew")
+ (version "1.1.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/davecgh/go-spew")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:unpack-path "github.com/davecgh/go-spew"
+ #:import-path "github.com/davecgh/go-spew/spew"))
+ (home-page "https://github.com/davecgh/go-spew")
+ (synopsis "Deep pretty printer for Go data structures to aid in debugging")
+ (description "Package @command{spew} implements a deep pretty printer
+for Go data structures to aid in debugging.
+
+A quick overview of the additional features spew provides over the built-in
+printing facilities for Go data types are as follows:
+
+@itemize
+@item Pointers are dereferenced and followed.
+@item Circular data structures are detected and handled properly.
+@item Custom Stringer/error interfaces are optionally invoked, including on
+unexported types.
+@item Custom types which only implement the Stringer/error interfaces via a
+pointer receiver are optionally invoked when passing non-pointer variables.
+@item Byte arrays and slices are dumped like the hexdump -C command which
+includes offsets, byte values in hex, and ASCII output (only when using Dump
+style).
+@end itemize")
+ (license license:isc)))
+
(define-public go-github-com-frankban-quicktest
(package
(name "go-github-com-frankban-quicktest")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 599fdf9f2d..903f2126c4 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -5344,44 +5344,6 @@ (define-public go-github-com-libp2p-go-flow-metrics
that's a lot faster (and only does simple bandwidth metrics).")
(license license:expat))))
-(define-public go-github-com-davecgh-go-spew
- (package
- (name "go-github-com-davecgh-go-spew")
- (version "1.1.1")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/davecgh/go-spew")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"))))
- (build-system go-build-system)
- (arguments
- '(#:unpack-path "github.com/davecgh/go-spew"
- #:import-path "github.com/davecgh/go-spew/spew"))
- (home-page "https://github.com/davecgh/go-spew")
- (synopsis "Deep pretty printer for Go data structures to aid in debugging")
- (description "Package @command{spew} implements a deep pretty printer
-for Go data structures to aid in debugging.
-
-A quick overview of the additional features spew provides over the built-in printing facilities for Go data types are as follows:
-
-@itemize
-@item Pointers are dereferenced and followed.
-@item Circular data structures are detected and handled properly.
-@item Custom Stringer/error interfaces are optionally invoked, including on
-unexported types.
-@item Custom types which only implement the Stringer/error interfaces via a
-pointer receiver are optionally invoked when passing non-pointer variables.
-@item Byte arrays and slices are dumped like the hexdump -C command which
-includes offsets, byte values in hex, and ASCII output (only when using Dump
-style).
-@end itemize\n")
- (license license:isc)))
-
(define-public go-github-com-btcsuite-btclog
(let ((commit "84c8d2346e9fc8c7b947e243b9c24e6df9fd206a")
(revision "0"))
diff --git a/gnu/packages/high-availability.scm b/gnu/packages/high-availability.scm
index ad18a39738..0678edaf4e 100644
--- a/gnu/packages/high-availability.scm
+++ b/gnu/packages/high-availability.scm
@@ -36,6 +36,7 @@ (define-module (gnu packages high-availability)
#:use-module (gnu packages gettext)
#:use-module (gnu packages glib)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-check)
#:use-module (gnu packages golang-compression)
#:use-module (gnu packages golang-crypto)
#:use-module (gnu packages golang-web)
--
2.41.0
^ permalink raw reply related [flat|nested] 64+ messages in thread* [bug#69042] [PATCH v2 11/30] gnu: go-github-com-burntsushi-toml: Move to golang-xyz.
2024-02-12 18:48 ` [bug#69042] [PATCH v2 01/30] gnu: Add (gnu packages golang-build) module Sharlatan Hellseher
` (8 preceding siblings ...)
2024-02-12 18:48 ` [bug#69042] [PATCH v2 10/30] gnu: go-github-com-davecgh-go-spew: Move to golang-check Sharlatan Hellseher
@ 2024-02-12 18:48 ` Sharlatan Hellseher
2024-02-12 18:48 ` [bug#69042] [PATCH v2 12/30] gnu: go-github-com-bmizerany-perks-quantile: " Sharlatan Hellseher
` (18 subsequent siblings)
28 siblings, 0 replies; 64+ messages in thread
From: Sharlatan Hellseher @ 2024-02-12 18:48 UTC (permalink / raw)
To: 69042; +Cc: Sharlatan Hellseher, Katherine Cox-Buday, Sharlatan Hellseher
* gnu/packages/golang.scm (go-github-com-burntsushi-toml): Move
from here ...
* gnu/packages/golang-xyz.scm: ... to here.
* gnu/packages/golang-check.scm: Add (gnu packages golang-xyz) module.
* gnu/packages/golang.scm: As above.
* gnu/packages/shellutils.scm: As above.
Change-Id: If8a645431a1fb17159681daae70db49fd21b37c1
---
gnu/packages/golang-check.scm | 3 ++-
gnu/packages/golang-xyz.scm | 26 ++++++++++++++++++++++++++
gnu/packages/golang.scm | 24 +-----------------------
gnu/packages/shellutils.scm | 1 +
4 files changed, 30 insertions(+), 24 deletions(-)
diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm
index c5e30f7fe1..8ce85421e9 100644
--- a/gnu/packages/golang-check.scm
+++ b/gnu/packages/golang-check.scm
@@ -42,7 +42,8 @@ (define-module (gnu packages golang-check)
#:use-module (guix git-download)
#:use-module (gnu packages)
#:use-module (gnu packages golang)
- #:use-module (gnu packages golang-build))
+ #:use-module (gnu packages golang-build)
+ #:use-module (gnu packages golang-xyz))
;;; Commentary:
;;;
diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 1999aab7fb..9d2b43b86c 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -1,5 +1,8 @@
;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
+;;; Copyright © 2019 Leo Famulari <leo@famulari.name>
;;; Copyright © 2023 Benjamin <benjamin@uvy.fr>
+;;; Copyright © 2023 Katherine Cox-Buday <cox.katherine.e@gmail.com>
;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com>
;;; Copyright © 2023 Thomas Ieong <th.ieong@free.fr>
;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
@@ -41,6 +44,29 @@ (define-module (gnu packages golang-xyz)
;;;
;;; Code:
\f
+(define-public go-github-com-burntsushi-toml
+ (package
+ (name "go-github-com-burntsushi-toml")
+ (version "1.2.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/BurntSushi/toml")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1v9czq4hsyvdz7yx70y6sgq77wmrgfmn09r9cj4w85z38jqnamv7"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/BurntSushi/toml"))
+ (home-page "https://github.com/BurntSushi/toml")
+ (synopsis "Toml parser and encoder for Go")
+ (description
+ "This package is toml parser and encoder for Go. The interface is
+similar to Go's standard library @code{json} and @code{xml} package.")
+ (license license:expat)))
+
(define-public go-github-com-djherbis-atime
(package
(name "go-github-com-djherbis-atime")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 903f2126c4..5f8a550b15 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -86,6 +86,7 @@ (define-module (gnu packages golang)
#:use-module (gnu packages golang-compression)
#:use-module (gnu packages golang-crypto)
#:use-module (gnu packages golang-web)
+ #:use-module (gnu packages golang-xyz)
#:use-module (gnu packages lua)
#:use-module (gnu packages mail)
#:use-module (gnu packages mp3)
@@ -3807,29 +3808,6 @@ (define-public go-golang-org-x-mod
loading algorithms.")
(license license:bsd-3))))
-(define-public go-github-com-burntsushi-toml
- (package
- (name "go-github-com-burntsushi-toml")
- (version "1.2.1")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/BurntSushi/toml")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1v9czq4hsyvdz7yx70y6sgq77wmrgfmn09r9cj4w85z38jqnamv7"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/BurntSushi/toml"))
- (home-page "https://github.com/BurntSushi/toml")
- (synopsis "Toml parser and encoder for Go")
- (description
- "This package is toml parser and encoder for Go. The interface
-is similar to Go's standard library @code{json} and @code{xml} package.")
- (license license:expat)))
-
(define-public go-github-com-hashicorp-go-uuid
(package
(name "go-github-com-hashicorp-go-uuid")
diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm
index 00352dc327..48c5250c8c 100644
--- a/gnu/packages/shellutils.scm
+++ b/gnu/packages/shellutils.scm
@@ -51,6 +51,7 @@ (define-module (gnu packages shellutils)
#:use-module (gnu packages check)
#:use-module (gnu packages flex)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-xyz)
#:use-module (gnu packages libunistring)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages pcre)
--
2.41.0
^ permalink raw reply related [flat|nested] 64+ messages in thread* [bug#69042] [PATCH v2 12/30] gnu: go-github-com-bmizerany-perks-quantile: Move to golang-xyz.
2024-02-12 18:48 ` [bug#69042] [PATCH v2 01/30] gnu: Add (gnu packages golang-build) module Sharlatan Hellseher
` (9 preceding siblings ...)
2024-02-12 18:48 ` [bug#69042] [PATCH v2 11/30] gnu: go-github-com-burntsushi-toml: Move to golang-xyz Sharlatan Hellseher
@ 2024-02-12 18:48 ` Sharlatan Hellseher
2024-02-12 18:48 ` [bug#69042] [PATCH v2 13/30] gnu: go-github-com-blang-semver: " Sharlatan Hellseher
` (17 subsequent siblings)
28 siblings, 0 replies; 64+ messages in thread
From: Sharlatan Hellseher @ 2024-02-12 18:48 UTC (permalink / raw)
To: 69042; +Cc: Sharlatan Hellseher, Katherine Cox-Buday, Sharlatan Hellseher
* gnu/packages/golang.scm (go-github-com-bmizerany-perks-quantile): Move
from here ...
* gnu/packages/golang-xyz.scm: ... to here.
Change-Id: I215d8f1f2710bd21ad9a251e4cb029064a0968f6
---
gnu/packages/golang-xyz.scm | 24 ++++++++++++++++++++++++
gnu/packages/golang.scm | 24 ------------------------
2 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 9d2b43b86c..741023c098 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -44,6 +44,30 @@ (define-module (gnu packages golang-xyz)
;;;
;;; Code:
\f
+(define-public go-github-com-bmizerany-perks-quantile
+ (package
+ (name "go-github-com-bmizerany-perks-quantile")
+ (version "0.0.0-20230307044200-03f9df79da1e")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/bmizerany/perks")
+ (commit (go-version->git-ref version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1f2a99v3618bz2mf61iwhdjm3xi1gam6v4apqgcrz71gj7ba9943"))))
+ (build-system go-build-system)
+ (arguments
+ (list #:unpack-path "github.com/bmizerany/perks"
+ #:import-path "github.com/bmizerany/perks/quantile"))
+ (home-page "https://github.com/bmizerany/perks")
+ (synopsis "Library for computing quantiles")
+ (description
+ "Perks contains the Go package @code{quantile} that computes approximate
+quantiles over an unbounded data stream within low memory and CPU bounds.")
+ (license license:bsd-2)))
+
(define-public go-github-com-burntsushi-toml
(package
(name "go-github-com-burntsushi-toml")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 5f8a550b15..60781f0172 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -7923,30 +7923,6 @@ (define-public go-github-com-bmatcuk-doublestar
matching and globbing with support for \"doublestar\" patterns.")
(license license:expat)))
-(define-public go-github-com-bmizerany-perks-quantile
- (package
- (name "go-github-com-bmizerany-perks-quantile")
- (version "0.0.0-20230307044200-03f9df79da1e")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/bmizerany/perks")
- (commit (go-version->git-ref version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1f2a99v3618bz2mf61iwhdjm3xi1gam6v4apqgcrz71gj7ba9943"))))
- (build-system go-build-system)
- (arguments
- (list #:unpack-path "github.com/bmizerany/perks"
- #:import-path "github.com/bmizerany/perks/quantile"))
- (home-page "https://github.com/bmizerany/perks")
- (synopsis "Library for computing quantiles")
- (description
- "Perks contains the Go package @code{quantile} that computes approximate
-quantiles over an unbounded data stream within low memory and CPU bounds.")
- (license license:bsd-2)))
-
(define-public go-github-com-dlclark-regexp2
(package
(name "go-github-com-dlclark-regexp2")
--
2.41.0
^ permalink raw reply related [flat|nested] 64+ messages in thread* [bug#69042] [PATCH v2 13/30] gnu: go-github-com-blang-semver: Move to golang-xyz.
2024-02-12 18:48 ` [bug#69042] [PATCH v2 01/30] gnu: Add (gnu packages golang-build) module Sharlatan Hellseher
` (10 preceding siblings ...)
2024-02-12 18:48 ` [bug#69042] [PATCH v2 12/30] gnu: go-github-com-bmizerany-perks-quantile: " Sharlatan Hellseher
@ 2024-02-12 18:48 ` Sharlatan Hellseher
2024-02-12 18:48 ` [bug#69042] [PATCH v2 14/30] gnu: go-github-com-bitly-timer-metrics: " Sharlatan Hellseher
` (16 subsequent siblings)
28 siblings, 0 replies; 64+ messages in thread
From: Sharlatan Hellseher @ 2024-02-12 18:48 UTC (permalink / raw)
To: 69042; +Cc: Sharlatan Hellseher, Katherine Cox-Buday, Sharlatan Hellseher
* gnu/packages/golang.scm (go-github-com-blang-semver): Move
from here ...
* gnu/packages/golang-xyz.scm: ... to here.
* gnu/packages/education.scm: Add (gnu packages golang-xyz) module.
* gnu/packages/ipfs.scm: As above.
Change-Id: I620543088661512bcc8135922a454c5f2dc73119
---
gnu/packages/education.scm | 1 +
gnu/packages/golang-xyz.scm | 25 +++++++++++++++++++++++++
gnu/packages/golang.scm | 24 ------------------------
gnu/packages/ipfs.scm | 1 +
4 files changed, 27 insertions(+), 24 deletions(-)
diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index 0f4a251bcc..c3009537e9 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -49,6 +49,7 @@ (define-module (gnu packages education)
#:use-module (gnu packages golang)
#:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-check)
+ #:use-module (gnu packages golang-xyz)
#:use-module (gnu packages gtk)
#:use-module (gnu packages gstreamer)
#:use-module (gnu packages image)
diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 741023c098..292ff10a47 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
;;; Copyright © 2019 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2023 Benjamin <benjamin@uvy.fr>
;;; Copyright © 2023 Katherine Cox-Buday <cox.katherine.e@gmail.com>
;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com>
@@ -44,6 +45,30 @@ (define-module (gnu packages golang-xyz)
;;;
;;; Code:
\f
+(define-public go-github-com-blang-semver
+ (let ((commit "60ec3488bfea7cca02b021d106d9911120d25fe9")
+ (revision "0"))
+ (package
+ (name "go-github-com-blang-semver")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/blang/semver")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "19pli07y5592g4dyjyj0jq5rn548vc3fz0qg3624vm1j5828p1c2"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/blang/semver"))
+ (home-page "https://github.com/blang/semver")
+ (synopsis "Semantic versioning library written in Go")
+ (description
+ "Semver is a library for Semantic versioning written in Go.")
+ (license license:expat))))
+
(define-public go-github-com-bmizerany-perks-quantile
(package
(name "go-github-com-bmizerany-perks-quantile")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 60781f0172..41adf51bfb 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -4020,30 +4020,6 @@ (define-public go-github-com-tomnomnom-gron
absolute \"path\" to it.")
(license license:expat)))
-(define-public go-github-com-blang-semver
- (let ((commit "60ec3488bfea7cca02b021d106d9911120d25fe9")
- (revision "0"))
- (package
- (name "go-github-com-blang-semver")
- (version (git-version "0.0.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/blang/semver")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "19pli07y5592g4dyjyj0jq5rn548vc3fz0qg3624vm1j5828p1c2"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/blang/semver"))
- (home-page "https://github.com/blang/semver")
- (synopsis "Semantic versioning library written in Go")
- (description "Semver is a library for Semantic versioning written in Go.")
- (license license:expat))))
-
(define-public go-github-com-google-cadvisor
(let ((commit "2ed7198f77395ee9a172878a0a7ab92ab59a2cfd")
(revision "0"))
diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm
index f09d0190dd..830e2ccd32 100644
--- a/gnu/packages/ipfs.scm
+++ b/gnu/packages/ipfs.scm
@@ -34,6 +34,7 @@ (define-module (gnu packages ipfs)
#:use-module (gnu packages golang-compression)
#:use-module (gnu packages golang-crypto)
#:use-module (gnu packages golang-web)
+ #:use-module (gnu packages golang-xyz)
#:use-module (gnu packages python)
#:use-module (gnu packages shells)
#:use-module (gnu packages syncthing))
--
2.41.0
^ permalink raw reply related [flat|nested] 64+ messages in thread* [bug#69042] [PATCH v2 14/30] gnu: go-github-com-bitly-timer-metrics: Move to golang-xyz.
2024-02-12 18:48 ` [bug#69042] [PATCH v2 01/30] gnu: Add (gnu packages golang-build) module Sharlatan Hellseher
` (11 preceding siblings ...)
2024-02-12 18:48 ` [bug#69042] [PATCH v2 13/30] gnu: go-github-com-blang-semver: " Sharlatan Hellseher
@ 2024-02-12 18:48 ` Sharlatan Hellseher
2024-02-12 18:48 ` [bug#69042] [PATCH v2 15/30] gnu: go-github-com-bitly-go-hostpool: " Sharlatan Hellseher
` (15 subsequent siblings)
28 siblings, 0 replies; 64+ messages in thread
From: Sharlatan Hellseher @ 2024-02-12 18:48 UTC (permalink / raw)
To: 69042; +Cc: Sharlatan Hellseher, Katherine Cox-Buday, Sharlatan Hellseher
* gnu/packages/golang.scm (go-github-com-bitly-timer-metrics): Move
from here ...
* gnu/packages/golang-xyz.scm: ... to here.
Change-Id: Id30d1add9ccbfbc05af114f6ccf82f353a7aa74b
---
gnu/packages/golang-xyz.scm | 22 ++++++++++++++++++++++
gnu/packages/golang.scm | 23 -----------------------
2 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 292ff10a47..a396057da9 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -45,6 +45,28 @@ (define-module (gnu packages golang-xyz)
;;;
;;; Code:
\f
+(define-public go-github-com-bitly-timer-metrics
+ (package
+ (name "go-github-com-bitly-timer-metrics")
+ (version "1.0.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/bitly/timer_metrics")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "02fhx8hx8126m2cgxw9fm8q2401r7zfann8b5zy5yyark1sgkrb4"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/bitly/timer_metrics"))
+ (home-page "https://github.com/bitly/timer_metrics")
+ (synopsis "Capture timings and enable periodic metrics every @var{n} events")
+ (description "This package provides an efficient way to capture timing
+information and periodically output metrics")
+ (license license:expat)))
+
(define-public go-github-com-blang-semver
(let ((commit "60ec3488bfea7cca02b021d106d9911120d25fe9")
(revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 41adf51bfb..d594759bdf 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -1906,29 +1906,6 @@ (define-public go-github-com-bitly-go-hostpool
robin or epsilon greedy mode, and unresponsive hosts are avoided.")
(license license:expat)))
-(define-public go-github-com-bitly-timer-metrics
- (package
- (name "go-github-com-bitly-timer-metrics")
- (version "1.0.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/bitly/timer_metrics")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "02fhx8hx8126m2cgxw9fm8q2401r7zfann8b5zy5yyark1sgkrb4"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/bitly/timer_metrics"))
- (home-page "https://github.com/bitly/timer_metrics")
- (synopsis "Capture timings and enable periodic metrics every @var{n} events")
- (description
- "This package provides an efficient way to capture timing information and
-periodically output metrics")
- (license license:expat)))
-
(define-public go-github-com-blanu-dust
(package
(name "go-github-com-blanu-dust")
--
2.41.0
^ permalink raw reply related [flat|nested] 64+ messages in thread* [bug#69042] [PATCH v2 15/30] gnu: go-github-com-bitly-go-hostpool: Move to golang-xyz.
2024-02-12 18:48 ` [bug#69042] [PATCH v2 01/30] gnu: Add (gnu packages golang-build) module Sharlatan Hellseher
` (12 preceding siblings ...)
2024-02-12 18:48 ` [bug#69042] [PATCH v2 14/30] gnu: go-github-com-bitly-timer-metrics: " Sharlatan Hellseher
@ 2024-02-12 18:48 ` Sharlatan Hellseher
2024-02-12 18:48 ` [bug#69042] [PATCH v2 16/30] gnu: go-golang-org-x-exp: Move to golang-build Sharlatan Hellseher
` (14 subsequent siblings)
28 siblings, 0 replies; 64+ messages in thread
From: Sharlatan Hellseher @ 2024-02-12 18:48 UTC (permalink / raw)
To: 69042; +Cc: Sharlatan Hellseher, Katherine Cox-Buday, Sharlatan Hellseher
* gnu/packages/golang.scm (go-github-com-bitly-go-hostpool): Move
from here ...
* gnu/packages/golang-xyz.scm: ... to here.
Change-Id: Ia314e6134f229c004f23d99a9c42dbd0adf105f8
---
gnu/packages/golang-xyz.scm | 25 +++++++++++++++++++++++++
gnu/packages/golang.scm | 25 -------------------------
gnu/packages/high-availability.scm | 1 +
3 files changed, 26 insertions(+), 25 deletions(-)
diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index a396057da9..f3087149e7 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -45,6 +45,31 @@ (define-module (gnu packages golang-xyz)
;;;
;;; Code:
\f
+(define-public go-github-com-bitly-go-hostpool
+ (package
+ (name "go-github-com-bitly-go-hostpool")
+ (version "0.1.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/bitly/go-hostpool")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1iibj7dwymczw7cknrh6glc6sdpp4yap2plnyr8qphynwrzlz73w"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/bitly/go-hostpool"))
+ (native-inputs (list go-github-com-stretchr-testify))
+ (home-page "https://github.com/bitly/go-hostpool")
+ (synopsis "Pool among multiple hosts from Golang")
+ (description
+ "This package provides a Go package to intelligently and flexibly pool among
+multiple hosts from your Go application. Host selection can operate in round
+robin or epsilon greedy mode, and unresponsive hosts are avoided.")
+ (license license:expat)))
+
(define-public go-github-com-bitly-timer-metrics
(package
(name "go-github-com-bitly-timer-metrics")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index d594759bdf..4a8e9dbc78 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -1881,31 +1881,6 @@ (define-public go-github-com-dhowett-go-plist
types.")
(license license:giftware))))
-(define-public go-github-com-bitly-go-hostpool
- (package
- (name "go-github-com-bitly-go-hostpool")
- (version "0.1.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/bitly/go-hostpool")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1iibj7dwymczw7cknrh6glc6sdpp4yap2plnyr8qphynwrzlz73w"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/bitly/go-hostpool"))
- (native-inputs (list go-github-com-stretchr-testify))
- (home-page "https://github.com/bitly/go-hostpool")
- (synopsis "Pool among multiple hosts from Golang")
- (description
- "This package provides a Go package to intelligently and flexibly pool among
-multiple hosts from your Go application. Host selection can operate in round
-robin or epsilon greedy mode, and unresponsive hosts are avoided.")
- (license license:expat)))
-
(define-public go-github-com-blanu-dust
(package
(name "go-github-com-blanu-dust")
diff --git a/gnu/packages/high-availability.scm b/gnu/packages/high-availability.scm
index 0678edaf4e..b0e6631389 100644
--- a/gnu/packages/high-availability.scm
+++ b/gnu/packages/high-availability.scm
@@ -36,6 +36,7 @@ (define-module (gnu packages high-availability)
#:use-module (gnu packages gettext)
#:use-module (gnu packages glib)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-check)
#:use-module (gnu packages golang-compression)
#:use-module (gnu packages golang-crypto)
--
2.41.0
^ permalink raw reply related [flat|nested] 64+ messages in thread* [bug#69042] [PATCH v2 16/30] gnu: go-golang-org-x-exp: Move to golang-build.
2024-02-12 18:48 ` [bug#69042] [PATCH v2 01/30] gnu: Add (gnu packages golang-build) module Sharlatan Hellseher
` (13 preceding siblings ...)
2024-02-12 18:48 ` [bug#69042] [PATCH v2 15/30] gnu: go-github-com-bitly-go-hostpool: " Sharlatan Hellseher
@ 2024-02-12 18:48 ` Sharlatan Hellseher
2024-02-12 18:48 ` [bug#69042] [PATCH v2 17/30] gnu: go-golang-org-x-mod: " Sharlatan Hellseher
` (13 subsequent siblings)
28 siblings, 0 replies; 64+ messages in thread
From: Sharlatan Hellseher @ 2024-02-12 18:48 UTC (permalink / raw)
To: 69042; +Cc: Sharlatan Hellseher, Katherine Cox-Buday, Sharlatan Hellseher
* gnu/packages/golang.scm (go-golang-org-x-exp): Move from here ...
* gnu/packages/golang-build.scm: ... to here.
Change-Id: I2253ac166a8830662360b14cec0fa301686dac22
---
gnu/packages/golang-build.scm | 27 +++++++++++++++++++++++++++
gnu/packages/golang.scm | 27 ---------------------------
2 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index eeab951f1e..ffedc946c2 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
;;; Copyright © 2023 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;; Copyright © 2023 Felix Lechner <felix.lechner@lease-up.com>
+;;; Copyright © 2023 Katherine Cox-Buday <cox.katherine.e@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -40,6 +41,32 @@ (define-module (gnu packages golang-build)
;;;
;;; Code:
\f
+(define-public go-golang-org-x-exp
+ (package
+ (name "go-golang-org-x-exp")
+ (version "0.0.0-20221004215720-b9f4876ce741")
+ (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 "030b929xyg8dpp6f4qbyg63msi6zgzj9sqmvnyphfcrjkqf7nr41"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "golang.org/x/exp"
+ ;; Source-only package
+ #:tests? #f
+ #:phases (modify-phases %standard-phases
+ (delete 'build))))
+ (home-page "https://golang.org/x/exp")
+ (synopsis "Experimental and deprecated Go packages")
+ (description "This subrepository holds experimental and deprecated (in the
+@code{old} directory) packages.")
+ (license license:bsd-3)))
+
(define-public go-golang-org-x-net
(let ((commit "8e0e7d8d38f2b6d21d742845570dde2902d06a1d")
(revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 4a8e9dbc78..dd0ac7e3e8 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3347,33 +3347,6 @@ (define-public go-github-com-hashicorp-hcl-v2
(home-page "https://github.com/hashicorp/hcl")
(license license:mpl2.0)))
-(define-public go-golang-org-x-exp
- (package
- (name "go-golang-org-x-exp")
- (version "0.0.0-20221004215720-b9f4876ce741")
- (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
- "030b929xyg8dpp6f4qbyg63msi6zgzj9sqmvnyphfcrjkqf7nr41"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "golang.org/x/exp"
- ;; Source-only package
- #:tests? #f
- #:phases (modify-phases %standard-phases
- (delete 'build))))
- (home-page "https://golang.org/x/exp")
- (synopsis "Experimental and deprecated Go packages")
- (description
- "This subrepository holds experimental and deprecated (in the @code{old}
-directory) packages.")
- (license license:bsd-3)))
-
(define-public go-golang-org-x-tools
(package
(name "go-golang-org-x-tools")
--
2.41.0
^ permalink raw reply related [flat|nested] 64+ messages in thread* [bug#69042] [PATCH v2 17/30] gnu: go-golang-org-x-mod: Move to golang-build.
2024-02-12 18:48 ` [bug#69042] [PATCH v2 01/30] gnu: Add (gnu packages golang-build) module Sharlatan Hellseher
` (14 preceding siblings ...)
2024-02-12 18:48 ` [bug#69042] [PATCH v2 16/30] gnu: go-golang-org-x-exp: Move to golang-build Sharlatan Hellseher
@ 2024-02-12 18:48 ` Sharlatan Hellseher
2024-02-12 18:48 ` [bug#69042] [PATCH v2 18/30] gnu: go-golang-org-x-xerrors: " Sharlatan Hellseher
` (12 subsequent siblings)
28 siblings, 0 replies; 64+ messages in thread
From: Sharlatan Hellseher @ 2024-02-12 18:48 UTC (permalink / raw)
To: 69042; +Cc: Sharlatan Hellseher, Katherine Cox-Buday, Sharlatan Hellseher
* gnu/packages/golang.scm (go-golang-org-x-mod): Move from here ...
* gnu/packages/golang-build.scm: ... to here.
* gnu/packages/shellutils.scm: Add (gnu packages golang-build) module.
Change-Id: I88ce7ac1e264cb545a272f9c8a485747e84f7c82
---
gnu/packages/golang-build.scm | 36 +++++++++++++++++++++++++++++++++++
gnu/packages/golang.scm | 34 ---------------------------------
gnu/packages/shellutils.scm | 1 +
3 files changed, 37 insertions(+), 34 deletions(-)
diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index ffedc946c2..a8e97e7acb 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -1,5 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2021 hackeryarn <artemchernyak@gmail.com>
;;; Copyright © 2023 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;; Copyright © 2023 Felix Lechner <felix.lechner@lease-up.com>
;;; Copyright © 2023 Katherine Cox-Buday <cox.katherine.e@gmail.com>
@@ -67,6 +69,40 @@ (define-public go-golang-org-x-exp
@code{old} directory) packages.")
(license license:bsd-3)))
+(define-public go-golang-org-x-mod
+ (let ((commit "7c05a442b7c1d1a107879b4a090bb5a38d3774a1")
+ (revision "0"))
+ (package
+ (name "go-golang-org-x-mod")
+ (version (git-version "0.7.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/golang/mod")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "14r24fq3kn84k2y2jvvg8hwpy52a3q429pimrdwl5zwknbr2awmh"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "golang.org/x/mod/"
+ #:tests? #f
+ #:phases (modify-phases %standard-phases
+ ;; Source-only package
+ (delete 'build))))
+ (home-page "https://golang.org/x/mod")
+ (synopsis "Tools to work directly with Go module mechanics")
+ (description
+ "This repository holds packages for writing tools that work directly
+with Go module mechanics. That is, it is for direct manipulation of Go
+modules themselves.
+
+The specific case of loading packages should still be done by invoking the
+@command{go} command, which remains the single point of truth for package
+loading algorithms.")
+ (license license:bsd-3))))
+
(define-public go-golang-org-x-net
(let ((commit "8e0e7d8d38f2b6d21d742845570dde2902d06a1d")
(revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index dd0ac7e3e8..e7b98028a5 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3699,40 +3699,6 @@ (define-public go-golang-org-x-xerrors
(home-page "https://godoc.org/golang.org/x/xerrors")
(license license:bsd-3))))
-(define-public go-golang-org-x-mod
- (let ((commit "7c05a442b7c1d1a107879b4a090bb5a38d3774a1")
- (revision "0"))
- (package
- (name "go-golang-org-x-mod")
- (version (git-version "0.7.0" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/golang/mod")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "14r24fq3kn84k2y2jvvg8hwpy52a3q429pimrdwl5zwknbr2awmh"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "golang.org/x/mod/"
- #:tests? #f
- #:phases (modify-phases %standard-phases
- ;; Source-only package
- (delete 'build))))
- (home-page "https://golang.org/x/mod")
- (synopsis "Tools to work directly with Go module mechanics")
- (description
- "This repository holds packages for writing tools that work directly
-with Go module mechanics. That is, it is for direct manipulation of Go modules
-themselves.
-
-The specific case of loading packages should still be done by invoking the
-@command{go} command, which remains the single point of truth for package
-loading algorithms.")
- (license license:bsd-3))))
-
(define-public go-github-com-hashicorp-go-uuid
(package
(name "go-github-com-hashicorp-go-uuid")
diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm
index 48c5250c8c..e58e9e61fc 100644
--- a/gnu/packages/shellutils.scm
+++ b/gnu/packages/shellutils.scm
@@ -51,6 +51,7 @@ (define-module (gnu packages shellutils)
#:use-module (gnu packages check)
#:use-module (gnu packages flex)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-xyz)
#:use-module (gnu packages libunistring)
#:use-module (gnu packages ncurses)
--
2.41.0
^ permalink raw reply related [flat|nested] 64+ messages in thread* [bug#69042] [PATCH v2 18/30] gnu: go-golang-org-x-xerrors: Move to golang-build.
2024-02-12 18:48 ` [bug#69042] [PATCH v2 01/30] gnu: Add (gnu packages golang-build) module Sharlatan Hellseher
` (15 preceding siblings ...)
2024-02-12 18:48 ` [bug#69042] [PATCH v2 17/30] gnu: go-golang-org-x-mod: " Sharlatan Hellseher
@ 2024-02-12 18:48 ` Sharlatan Hellseher
2024-02-12 18:48 ` [bug#69042] [PATCH v2 19/30] gnu: go-golang.org-x-sync-errgroup: " Sharlatan Hellseher
` (11 subsequent siblings)
28 siblings, 0 replies; 64+ messages in thread
From: Sharlatan Hellseher @ 2024-02-12 18:48 UTC (permalink / raw)
To: 69042; +Cc: Sharlatan Hellseher, Katherine Cox-Buday, Sharlatan Hellseher
* gnu/packages/golang.scm (go-golang-org-x-xerrors): Move from here ...
* gnu/packages/golang-build.scm: ... to here.
Change-Id: I68c9aa1607d71d08eb7ea4e5caf27121cdd0df4c
---
gnu/packages/golang-build.scm | 25 +++++++++++++++++++++++++
gnu/packages/golang.scm | 24 ------------------------
2 files changed, 25 insertions(+), 24 deletions(-)
diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index a8e97e7acb..fed606e8fb 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2021 hackeryarn <artemchernyak@gmail.com>
;;; Copyright © 2023 Artyom V. Poptsov <poptsov.artyom@gmail.com>
@@ -195,6 +196,30 @@ (define-public go-golang-org-x-sys
support for low-level interaction with the operating system.")
(license license:bsd-3))))
+(define-public go-golang-org-x-xerrors
+ (let ((commit "5ec99f83aff198f5fbd629d6c8d8eb38a04218ca")
+ (revision "0"))
+ (package
+ (name "go-golang-org-x-xerrors")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://go.googlesource.com/xerrors")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1dbzc3gmf2haazpv7cgmv97rq40g2xzwbglc17vas8dwhgwgwrzb"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "golang.org/x/xerrors"))
+ (home-page "https://godoc.org/golang.org/x/xerrors")
+ (synopsis "Go 1.13 error values")
+ (description "This package holds the transition packages for the new Go
+1.13 error values.")
+ (license license:bsd-3))))
+
;;;
;;; Avoid adding new packages to the end of this file. To reduce the chances
;;; of a merge conflict, place them above by existing packages with similar
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index e7b98028a5..68b905ff8b 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3675,30 +3675,6 @@ (define-public go-golang-org-x-oauth2
spec in Go.")
(license license:bsd-3))))
-(define-public go-golang-org-x-xerrors
- (let ((commit "5ec99f83aff198f5fbd629d6c8d8eb38a04218ca")
- (revision "0"))
- (package
- (name "go-golang-org-x-xerrors")
- (version (git-version "0.0.0" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://go.googlesource.com/xerrors")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1dbzc3gmf2haazpv7cgmv97rq40g2xzwbglc17vas8dwhgwgwrzb"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "golang.org/x/xerrors"))
- (synopsis "Go 1.13 error values")
- (description
- "This package holds the transition packages for the new Go 1.13 error values.")
- (home-page "https://godoc.org/golang.org/x/xerrors")
- (license license:bsd-3))))
-
(define-public go-github-com-hashicorp-go-uuid
(package
(name "go-github-com-hashicorp-go-uuid")
--
2.41.0
^ permalink raw reply related [flat|nested] 64+ messages in thread* [bug#69042] [PATCH v2 19/30] gnu: go-golang.org-x-sync-errgroup: Move to golang-build.
2024-02-12 18:48 ` [bug#69042] [PATCH v2 01/30] gnu: Add (gnu packages golang-build) module Sharlatan Hellseher
` (16 preceding siblings ...)
2024-02-12 18:48 ` [bug#69042] [PATCH v2 18/30] gnu: go-golang-org-x-xerrors: " Sharlatan Hellseher
@ 2024-02-12 18:48 ` Sharlatan Hellseher
2024-02-12 18:48 ` [bug#69042] [PATCH v2 20/30] gnu: go-golang-org-x-sync: " Sharlatan Hellseher
` (10 subsequent siblings)
28 siblings, 0 replies; 64+ messages in thread
From: Sharlatan Hellseher @ 2024-02-12 18:48 UTC (permalink / raw)
To: 69042; +Cc: Sharlatan Hellseher, Katherine Cox-Buday, Sharlatan Hellseher
* gnu/packages/golang.scm (go-golang.org-x-sync-errgroup,
go-golang.org-x-sync-semaphore): Move from here ...
* gnu/packages/golang-build.scm: ... to here.
* gnu/packages/check.scm: Add (gnu packages golang-build) module.
Change-Id: Ie886c0f44e0a70629e23371b447f5a35006ade21
---
gnu/packages/check.scm | 1 +
gnu/packages/golang-build.scm | 41 +++++++++++++++++++++++++++++++++++
gnu/packages/golang.scm | 38 --------------------------------
gnu/packages/terminals.scm | 1 +
4 files changed, 43 insertions(+), 38 deletions(-)
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 4f593cde8d..b520d6c58a 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -77,6 +77,7 @@ (define-module (gnu packages check)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages gtk)
#:use-module (gnu packages guile)
#:use-module (gnu packages guile-xyz)
diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index fed606e8fb..8e64571929 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -1,11 +1,14 @@
;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
+;;; Copyright © 2020 Vagrant Cascadian <vagrant@debian.org>
;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2021 hackeryarn <artemchernyak@gmail.com>
;;; Copyright © 2023 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;; Copyright © 2023 Felix Lechner <felix.lechner@lease-up.com>
;;; Copyright © 2023 Katherine Cox-Buday <cox.katherine.e@gmail.com>
+;;; Copyright © 2023 Timo Wilken <guix@twilken.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -165,6 +168,44 @@ (define-public go-golang-org-x-net-html
(description
"This package provides an HTML5-compliant tokenizer and parser.")))
+(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)
+ (name "go-golang.org-x-sync-semaphore")
+ (arguments
+ '(#:import-path "golang.org/x/sync/semaphore"
+ #:unpack-path "golang.org/x/sync"))
+ (home-page "https://godoc.org/golang.org/x/sync/semaphore")
+ (synopsis "Weighted semaphore implementation in Go")
+ (description "Weighted semaphore implementation in Go.")))
+
(define-public go-golang-org-x-sys
(let ((commit "ca59edaa5a761e1d0ea91d6c07b063f85ef24f78")
(revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 68b905ff8b..7e5626a303 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -7023,44 +7023,6 @@ (define-public go-github-com-google-renameio
create or replace a file or symbolic link.")
(license license:asl2.0)))
-(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"))
- (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.")
- (home-page "https://godoc.org/golang.org/x/sync/errgroup")
- (license license:bsd-3))))
-
-(define-public go-golang.org-x-sync-semaphore
- (package
- (inherit go-golang.org-x-sync-errgroup)
- (name "go-golang.org-x-sync-semaphore")
- (arguments
- '(#:import-path "golang.org/x/sync/semaphore"
- #:unpack-path "golang.org/x/sync"))
- (synopsis "Weighted semaphore implementation in Go")
- (description "Weighted semaphore implementation in Go.")
- (home-page "https://godoc.org/golang.org/x/sync/semaphore")))
-
(define (go-gotest-tools-source version sha256-base32-hash)
(origin
(method git-fetch)
diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index f609de8eff..37223d0d18 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -90,6 +90,7 @@ (define-module (gnu packages terminals)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages gtk)
#:use-module (gnu packages image)
#:use-module (gnu packages libcanberra)
--
2.41.0
^ permalink raw reply related [flat|nested] 64+ messages in thread* [bug#69042] [PATCH v2 20/30] gnu: go-golang-org-x-sync: Move to golang-build.
2024-02-12 18:48 ` [bug#69042] [PATCH v2 01/30] gnu: Add (gnu packages golang-build) module Sharlatan Hellseher
` (17 preceding siblings ...)
2024-02-12 18:48 ` [bug#69042] [PATCH v2 19/30] gnu: go-golang.org-x-sync-errgroup: " Sharlatan Hellseher
@ 2024-02-12 18:48 ` Sharlatan Hellseher
2024-02-12 18:48 ` [bug#69042] [PATCH v2 21/30] gnu: go-golang-org-x-term: " Sharlatan Hellseher
` (9 subsequent siblings)
28 siblings, 0 replies; 64+ messages in thread
From: Sharlatan Hellseher @ 2024-02-12 18:48 UTC (permalink / raw)
To: 69042; +Cc: Sharlatan Hellseher, Katherine Cox-Buday, Sharlatan Hellseher
* gnu/packages/golang.scm (go-golang-org-x-sync): Move from here ...
* gnu/packages/golang-build.scm: ... to here.
Change-Id: I28b72dc45116398512c0255ac9e06b9c539e9e7b
---
gnu/packages/golang-build.scm | 30 ++++++++++++++++++++++++++++++
gnu/packages/golang.scm | 30 ------------------------------
2 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index 8e64571929..7b8653960d 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org>
+;;; Copyright © 2020 HiPhish <hiphish@posteo.de>
;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
;;; Copyright © 2020 Vagrant Cascadian <vagrant@debian.org>
@@ -168,6 +169,35 @@ (define-public go-golang-org-x-net-html
(description
"This package provides an HTML5-compliant tokenizer and parser.")))
+(define-public go-golang-org-x-sync
+ (let ((commit "8fcdb60fdcc0539c5e357b2308249e4e752147f1")
+ (revision "1"))
+ (package
+ (name "go-golang-org-x-sync")
+ (version (git-version "0.1.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 "07qrhni6f5hh5p95k1yk6s4wsj341q663irvx6rllrxfsymj6a0z"))))
+ (build-system go-build-system)
+ (arguments
+ `(#:import-path "golang.org/x/sync"
+ #:tests? #f
+ ;; Source-only package
+ #:phases (modify-phases %standard-phases
+ (delete 'build))))
+ (home-page "https://go.googlesource.com/sync/")
+ (synopsis "Additional Go concurrency primitives")
+ (description "This package provides Go concurrency primitives in
+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"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 7e5626a303..8bfabb9da9 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3559,36 +3559,6 @@ (define-public go-golang-org-x-image
processing.")
(license license:bsd-3))))
-(define-public go-golang-org-x-sync
- (let ((commit "8fcdb60fdcc0539c5e357b2308249e4e752147f1")
- (revision "1"))
- (package
- (name "go-golang-org-x-sync")
- (version (git-version "0.1.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
- "07qrhni6f5hh5p95k1yk6s4wsj341q663irvx6rllrxfsymj6a0z"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "golang.org/x/sync"
- #:tests? #f
- ;; Source-only package
- #:phases (modify-phases %standard-phases
- (delete 'build))))
- (synopsis "Additional Go concurrency primitives")
- (description
- "This package provides Go concurrency primitives in addition
-to the ones provided by the language and “sync” and “sync/atomic”
-packages.")
- (home-page "https://go.googlesource.com/sync/")
- (license license:bsd-3))))
-
(define-public go-golang-org-x-text
(package
(name "go-golang-org-x-text")
--
2.41.0
^ permalink raw reply related [flat|nested] 64+ messages in thread* [bug#69042] [PATCH v2 21/30] gnu: go-golang-org-x-term: Move to golang-build.
2024-02-12 18:48 ` [bug#69042] [PATCH v2 01/30] gnu: Add (gnu packages golang-build) module Sharlatan Hellseher
` (18 preceding siblings ...)
2024-02-12 18:48 ` [bug#69042] [PATCH v2 20/30] gnu: go-golang-org-x-sync: " Sharlatan Hellseher
@ 2024-02-12 18:48 ` Sharlatan Hellseher
2024-02-12 18:48 ` [bug#69042] [PATCH v2 22/30] gnu: go-golang-org-x-time: " Sharlatan Hellseher
` (8 subsequent siblings)
28 siblings, 0 replies; 64+ messages in thread
From: Sharlatan Hellseher @ 2024-02-12 18:48 UTC (permalink / raw)
To: 69042; +Cc: Sharlatan Hellseher, Katherine Cox-Buday, Sharlatan Hellseher
* gnu/packages/golang.scm (go-golang-org-x-term): Move from here ...
* gnu/packages/golang-build.scm: ... to here.
* gnu/packages/disk.scm: Add (gnu packages golang-build) module.
* gnu/packages/image-viewers.scm: As above.
Change-Id: Ibdb637bb129437ef74a0270fd44edc8804bb3055
---
gnu/packages/disk.scm | 1 +
gnu/packages/golang-build.scm | 25 +++++++++++++++++++++++++
gnu/packages/golang.scm | 24 ------------------------
gnu/packages/image-viewers.scm | 1 +
4 files changed, 27 insertions(+), 24 deletions(-)
diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm
index 165f0a8a74..b0117d77ce 100644
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@@ -69,6 +69,7 @@ (define-module (gnu packages disk)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages graphics)
#:use-module (gnu packages gtk)
#:use-module (gnu packages guile)
diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index 7b8653960d..db94ad2c7b 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -4,11 +4,13 @@
;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
;;; Copyright © 2020 Vagrant Cascadian <vagrant@debian.org>
+;;; Copyright © 2021 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2021 hackeryarn <artemchernyak@gmail.com>
;;; Copyright © 2023 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;; Copyright © 2023 Felix Lechner <felix.lechner@lease-up.com>
;;; Copyright © 2023 Katherine Cox-Buday <cox.katherine.e@gmail.com>
+;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
;;; Copyright © 2023 Timo Wilken <guix@twilken.net>
;;;
;;; This file is part of GNU Guix.
@@ -267,6 +269,29 @@ (define-public go-golang-org-x-sys
support for low-level interaction with the operating system.")
(license license:bsd-3))))
+(define-public go-golang-org-x-term
+ (package
+ (name "go-golang-org-x-term")
+ (version "0.3.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://go.googlesource.com/term")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "16s3d62fgdhiqvcib61s5pwxp08hhrmzx8bdv5zk1w1krjizdarl"))))
+ (build-system go-build-system)
+ (arguments '(#:import-path "golang.org/x/term"))
+ (propagated-inputs
+ (list go-golang-org-x-sys))
+ (home-page "https://pkg.go.dev/golang.org/x/term")
+ (synopsis "Go terminal/console support")
+ (description "@code{term} provides support functions for dealing with
+terminals, as commonly found on Unix systems.")
+ (license license:bsd-3)))
+
(define-public go-golang-org-x-xerrors
(let ((commit "5ec99f83aff198f5fbd629d6c8d8eb38a04218ca")
(revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 8bfabb9da9..240c87c3ba 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9659,30 +9659,6 @@ (define-public go-github-com-dustin-go-humanize
back.")
(license license:expat)))
-(define-public go-golang-org-x-term
- (package
- (name "go-golang-org-x-term")
- (version "0.3.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://go.googlesource.com/term")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "16s3d62fgdhiqvcib61s5pwxp08hhrmzx8bdv5zk1w1krjizdarl"))))
- (build-system go-build-system)
- (arguments '(#:import-path "golang.org/x/term"))
- (propagated-inputs
- (list go-golang-org-x-sys))
- (home-page "https://pkg.go.dev/golang.org/x/term")
- (synopsis "Go terminal/console support")
- (description "@code{term} provides support functions for dealing with
-terminals, as commonly found on Unix systems.")
- (license license:bsd-3)))
-
(define-public go-github-com-klauspost-compress
(package
(name "go-github-com-klauspost-compress")
diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm
index 206b91c878..f2b87268f0 100644
--- a/gnu/packages/image-viewers.scm
+++ b/gnu/packages/image-viewers.scm
@@ -77,6 +77,7 @@ (define-module (gnu packages image-viewers)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages gtk)
#:use-module (gnu packages graphics)
#:use-module (gnu packages image)
--
2.41.0
^ permalink raw reply related [flat|nested] 64+ messages in thread* [bug#69042] [PATCH v2 22/30] gnu: go-golang-org-x-time: Move to golang-build.
2024-02-12 18:48 ` [bug#69042] [PATCH v2 01/30] gnu: Add (gnu packages golang-build) module Sharlatan Hellseher
` (19 preceding siblings ...)
2024-02-12 18:48 ` [bug#69042] [PATCH v2 21/30] gnu: go-golang-org-x-term: " Sharlatan Hellseher
@ 2024-02-12 18:48 ` Sharlatan Hellseher
2024-02-12 18:48 ` [bug#69042] [PATCH v2 23/30] gnu: go-golang-org-x-text: " Sharlatan Hellseher
` (7 subsequent siblings)
28 siblings, 0 replies; 64+ messages in thread
From: Sharlatan Hellseher @ 2024-02-12 18:48 UTC (permalink / raw)
To: 69042; +Cc: Sharlatan Hellseher, Katherine Cox-Buday, Sharlatan Hellseher
* gnu/packages/golang.scm (go-golang-org-x-time): Move from here ...
* gnu/packages/golang-build.scm: ... to here.
* gnu/packages/high-availability.scm: Add (gnu packages golang-build) module.
Change-Id: I2f2704501b19d991d153c6d8636e1f9fc4cf154b
---
gnu/packages/golang-build.scm | 30 ++++++++++++++++++++++++++++++
gnu/packages/golang.scm | 31 -------------------------------
2 files changed, 30 insertions(+), 31 deletions(-)
diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index db94ad2c7b..3885701078 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -292,6 +292,36 @@ (define-public go-golang-org-x-term
terminals, as commonly found on Unix systems.")
(license license:bsd-3)))
+(define-public go-golang-org-x-time
+ (let ((commit "9d24e82272b4f38b78bc8cff74fa936d31ccd8ef")
+ (revision "2"))
+ (package
+ (name "go-golang-org-x-time")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://go.googlesource.com/time")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1f5nkr4vys2vbd8wrwyiq2f5wcaahhpxmia85d1gshcbqjqf8dkb"))))
+ (build-system go-build-system)
+ (arguments
+ `(#:import-path "golang.org/x/time"
+ ;; Source-only package
+ #:tests? #f
+ #:phases
+ (modify-phases %standard-phases
+ ;; Source-only package
+ (delete 'build))))
+ (home-page "https://godoc.org/golang.org/x/time/rate")
+ (synopsis "Supplemental Go time libraries")
+ (description "This package provides supplemental Go libraries related to
+time.")
+ (license license:bsd-3))))
+
(define-public go-golang-org-x-xerrors
(let ((commit "5ec99f83aff198f5fbd629d6c8d8eb38a04218ca")
(revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 240c87c3ba..6c056e19a9 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3587,37 +3587,6 @@ (define-public go-golang-org-x-text
(home-page "https://go.googlesource.com/text")
(license license:bsd-3)))
-(define-public go-golang-org-x-time
- (let ((commit "9d24e82272b4f38b78bc8cff74fa936d31ccd8ef")
- (revision "2"))
- (package
- (name "go-golang-org-x-time")
- (version (git-version "0.0.0" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://go.googlesource.com/time")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1f5nkr4vys2vbd8wrwyiq2f5wcaahhpxmia85d1gshcbqjqf8dkb"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "golang.org/x/time"
- ; Source-only package
- #:tests? #f
- #:phases
- (modify-phases %standard-phases
- (delete 'build))))
-; (propagated-inputs
-; `(("go-golang-org-x-net" ,go-golang-org-x-net)))
- (synopsis "Supplemental Go time libraries")
- (description "This package provides supplemental Go libraries related to
-time.")
- (home-page "https://godoc.org/golang.org/x/time/rate")
- (license license:bsd-3))))
-
(define-public go-golang-org-x-oauth2
(let ((commit "0f29369cfe4552d0e4bcddc57cc75f4d7e672a33")
(revision "1"))
--
2.41.0
^ permalink raw reply related [flat|nested] 64+ messages in thread* [bug#69042] [PATCH v2 23/30] gnu: go-golang-org-x-text: Move to golang-build.
2024-02-12 18:48 ` [bug#69042] [PATCH v2 01/30] gnu: Add (gnu packages golang-build) module Sharlatan Hellseher
` (20 preceding siblings ...)
2024-02-12 18:48 ` [bug#69042] [PATCH v2 22/30] gnu: go-golang-org-x-time: " Sharlatan Hellseher
@ 2024-02-12 18:48 ` Sharlatan Hellseher
2024-02-12 18:48 ` [bug#69042] [PATCH v2 24/30] gnu: go-github-com-yuin-goldmark: " Sharlatan Hellseher
` (6 subsequent siblings)
28 siblings, 0 replies; 64+ messages in thread
From: Sharlatan Hellseher @ 2024-02-12 18:48 UTC (permalink / raw)
To: 69042; +Cc: Sharlatan Hellseher, Katherine Cox-Buday, Sharlatan Hellseher
* gnu/packages/golang.scm (go-golang-org-x-text): Move from here ...
* gnu/packages/golang-build.scm: ... to here.
* gnu/packages/admin.scm: Add (gnu packages golang-build) module.
* gnu/packages/bioinformatics.scm: As above.
* gnu/packages/mail.scm: As above.
Change-Id: Ifd15b35b460ae30c5c1d677551e95842b322b246
---
gnu/packages/admin.scm | 1 +
gnu/packages/bioinformatics.scm | 1 +
gnu/packages/golang-build.scm | 29 +++++++++++++++++++++++++++++
gnu/packages/golang.scm | 28 ----------------------------
gnu/packages/mail.scm | 1 +
5 files changed, 32 insertions(+), 28 deletions(-)
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 2dbb604fa9..c595e1270f 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -130,6 +130,7 @@ (define-module (gnu packages admin)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages groff)
#:use-module (gnu packages gtk)
#:use-module (gnu packages guile)
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 554df0b42f..08683bc8e9 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -93,6 +93,7 @@ (define-module (gnu packages bioinformatics)
#:use-module (gnu packages gcc)
#:use-module (gnu packages gd)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-check)
#:use-module (gnu packages glib)
#:use-module (gnu packages graph)
diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index 3885701078..325470ca4e 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -1,4 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2019 Brian Leung <bkleung89@gmail.com>
;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2020 HiPhish <hiphish@posteo.de>
;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
@@ -292,6 +293,34 @@ (define-public go-golang-org-x-term
terminals, as commonly found on Unix systems.")
(license license:bsd-3)))
+(define-public go-golang-org-x-text
+ (package
+ (name "go-golang-org-x-text")
+ (version "0.3.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://go.googlesource.com/text")
+ (commit (string-append "v" version))))
+ (file-name (string-append "go.googlesource.com-text-"
+ version "-checkout"))
+ (sha256
+ (base32 "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"))))
+ (build-system go-build-system)
+ (arguments
+ `(#:import-path "golang.org/x/text"
+ ;; Source-only package
+ #:tests? #f
+ #:phases
+ (modify-phases %standard-phases
+ (delete 'build))))
+ (home-page "https://go.googlesource.com/text")
+ (synopsis "Supplemental Go text processing libraries")
+ (description "This package provides supplemental Go libraries for text
+processing.")
+ (license license:bsd-3)))
+
(define-public go-golang-org-x-time
(let ((commit "9d24e82272b4f38b78bc8cff74fa936d31ccd8ef")
(revision "2"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 6c056e19a9..eb4740f91e 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3559,34 +3559,6 @@ (define-public go-golang-org-x-image
processing.")
(license license:bsd-3))))
-(define-public go-golang-org-x-text
- (package
- (name "go-golang-org-x-text")
- (version "0.3.2")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://go.googlesource.com/text")
- (commit (string-append "v" version))))
- (file-name (string-append "go.googlesource.com-text-"
- version "-checkout"))
- (sha256
- (base32
- "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "golang.org/x/text"
- ; Source-only package
- #:tests? #f
- #:phases
- (modify-phases %standard-phases
- (delete 'build))))
- (synopsis "Supplemental Go text processing libraries")
- (description "This package provides supplemental Go libraries for text
- processing.")
- (home-page "https://go.googlesource.com/text")
- (license license:bsd-3)))
-
(define-public go-golang-org-x-oauth2
(let ((commit "0f29369cfe4552d0e4bcddc57cc75f4d7e672a33")
(revision "1"))
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 76f379a710..4a439d2f8f 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -108,6 +108,7 @@ (define-module (gnu packages mail)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-check)
#:use-module (gnu packages golang-crypto)
#:use-module (gnu packages golang-web)
--
2.41.0
^ permalink raw reply related [flat|nested] 64+ messages in thread* [bug#69042] [PATCH v2 24/30] gnu: go-github-com-yuin-goldmark: Move to golang-build.
2024-02-12 18:48 ` [bug#69042] [PATCH v2 01/30] gnu: Add (gnu packages golang-build) module Sharlatan Hellseher
` (21 preceding siblings ...)
2024-02-12 18:48 ` [bug#69042] [PATCH v2 23/30] gnu: go-golang-org-x-text: " Sharlatan Hellseher
@ 2024-02-12 18:48 ` Sharlatan Hellseher
2024-02-12 18:48 ` [bug#69042] [PATCH v2 25/30] gnu: go-golang-org-x-tools: " Sharlatan Hellseher
` (5 subsequent siblings)
28 siblings, 0 replies; 64+ messages in thread
From: Sharlatan Hellseher @ 2024-02-12 18:48 UTC (permalink / raw)
To: 69042; +Cc: Sharlatan Hellseher, Katherine Cox-Buday, Sharlatan Hellseher
* gnu/packages/golang.scm (go-github-com-yuin-goldmark): Move from here ...
* gnu/packages/golang-build.scm: ... to here.
Change-Id: If553b4a00b288a913d1d54da8b5b52eab87bb277
---
gnu/packages/golang-build.scm | 22 ++++++++++++++++++++++
gnu/packages/golang.scm | 21 ---------------------
2 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index 325470ca4e..b2b2872907 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2020 HiPhish <hiphish@posteo.de>
;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
;;; Copyright © 2020 Vagrant Cascadian <vagrant@debian.org>
;;; Copyright © 2021 Arun Isaac <arunisaac@systemreboot.net>
@@ -51,6 +52,27 @@ (define-module (gnu packages golang-build)
;;;
;;; Code:
\f
+(define-public go-github-com-yuin-goldmark
+ (package
+ (name "go-github-com-yuin-goldmark")
+ (version "1.2.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/yuin/goldmark")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "12rsnsf65drcp0jfw2jl9w589vsn3pxdk1zh3v9q908iigngrcmy"))))
+ (build-system go-build-system)
+ (arguments
+ `(#:import-path "github.com/yuin/goldmark"))
+ (home-page "https://github.com/yuin/goldmark/")
+ (synopsis "Markdown parser")
+ (description "This package provides a markdown parser.")
+ (license license:expat)))
+
(define-public go-golang-org-x-exp
(package
(name "go-golang-org-x-exp")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index eb4740f91e..22a76daef4 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -7925,27 +7925,6 @@ (define-public go-github-com-olekukonko-ts
size of the terminal.")
(license license:expat))))
-(define-public go-github-com-yuin-goldmark
- (package
- (name "go-github-com-yuin-goldmark")
- (version "1.2.1")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/yuin/goldmark")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "12rsnsf65drcp0jfw2jl9w589vsn3pxdk1zh3v9q908iigngrcmy"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/yuin/goldmark"))
- (home-page "https://github.com/yuin/goldmark/")
- (synopsis "Markdown parser")
- (description "This package provides a markdown parser.")
- (license license:expat)))
-
(define-public go-github-com-charmbracelet-glamour
(package
(name "go-github-com-charmbracelet-glamour")
--
2.41.0
^ permalink raw reply related [flat|nested] 64+ messages in thread* [bug#69042] [PATCH v2 25/30] gnu: go-golang-org-x-tools: Move to golang-build.
2024-02-12 18:48 ` [bug#69042] [PATCH v2 01/30] gnu: Add (gnu packages golang-build) module Sharlatan Hellseher
` (22 preceding siblings ...)
2024-02-12 18:48 ` [bug#69042] [PATCH v2 24/30] gnu: go-github-com-yuin-goldmark: " Sharlatan Hellseher
@ 2024-02-12 18:48 ` Sharlatan Hellseher
2024-02-12 18:48 ` [bug#69042] [PATCH v2 26/30] gnu: go-golang-org-x-image: " Sharlatan Hellseher
` (4 subsequent siblings)
28 siblings, 0 replies; 64+ messages in thread
From: Sharlatan Hellseher @ 2024-02-12 18:48 UTC (permalink / raw)
To: 69042; +Cc: Sharlatan Hellseher, Katherine Cox-Buday, Sharlatan Hellseher
* gnu/packages/golang.scm (go-golang-org-x-tools): Move from here ...
* gnu/packages/golang-build.scm: ... to here.
Change-Id: Ib9a69a5dab73b6f9d935fd0216658f5e4f8cf1f8
---
gnu/packages/golang-build.scm | 39 +++++++++++++++++++++++++++++++++
gnu/packages/golang.scm | 41 -----------------------------------
2 files changed, 39 insertions(+), 41 deletions(-)
diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index b2b2872907..87f184fb14 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -373,6 +373,45 @@ (define-public go-golang-org-x-time
time.")
(license license:bsd-3))))
+(define-public go-golang-org-x-tools
+ (package
+ (name "go-golang-org-x-tools")
+ (version "0.5.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://go.googlesource.com/tools")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "08kx2nndq3sr6xai7403mbsqvz5shxmp2icylfr2fmwagr59cb2n"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; gopls versions are tagged separately, and it is a
+ ;; separate Guix package.
+ (delete-file-recursively "gopls")))))
+ (build-system go-build-system)
+ (arguments
+ `(#:import-path "golang.org/x/tools"
+ ;; Source-only package
+ #:tests? #f
+ #:phases
+ (modify-phases %standard-phases
+ ;; Source-only package
+ (delete 'build))))
+ (propagated-inputs
+ (list go-github-com-yuin-goldmark
+ go-golang-org-x-mod
+ go-golang-org-x-net
+ go-golang-org-x-sys))
+ (home-page "https://go.googlesource.com/tools/")
+ (synopsis "Tools that support the Go programming language")
+ (description "This package provides miscellaneous tools that support the
+Go programming language.")
+ (license license:bsd-3)))
+
(define-public go-golang-org-x-xerrors
(let ((commit "5ec99f83aff198f5fbd629d6c8d8eb38a04218ca")
(revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 22a76daef4..4c2781bf45 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3347,47 +3347,6 @@ (define-public go-github-com-hashicorp-hcl-v2
(home-page "https://github.com/hashicorp/hcl")
(license license:mpl2.0)))
-(define-public go-golang-org-x-tools
- (package
- (name "go-golang-org-x-tools")
- (version "0.5.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://go.googlesource.com/tools")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "08kx2nndq3sr6xai7403mbsqvz5shxmp2icylfr2fmwagr59cb2n"))
- (modules '((guix build utils)))
- (snippet
- '(begin
- ;; gopls versions are tagged separately, and it is a
- ;; separate Guix package.
- (delete-file-recursively "gopls")))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "golang.org/x/tools"
- ;; Source-only package
- #:tests? #f
- #:phases
- (modify-phases %standard-phases
- ;; Source-only package
- (delete 'build))))
- (propagated-inputs
- (list
- go-github-com-yuin-goldmark
- go-golang-org-x-mod
- go-golang-org-x-net
- go-golang-org-x-sys))
- (synopsis "Tools that support the Go programming language")
- (description "This package provides miscellaneous tools that support the
-Go programming language.")
- (home-page "https://go.googlesource.com/tools/")
- (license license:bsd-3)))
-
(define-public go-golang-org-x-crypto
(package
(name "go-golang-org-x-crypto")
--
2.41.0
^ permalink raw reply related [flat|nested] 64+ messages in thread* [bug#69042] [PATCH v2 26/30] gnu: go-golang-org-x-image: Move to golang-build.
2024-02-12 18:48 ` [bug#69042] [PATCH v2 01/30] gnu: Add (gnu packages golang-build) module Sharlatan Hellseher
` (23 preceding siblings ...)
2024-02-12 18:48 ` [bug#69042] [PATCH v2 25/30] gnu: go-golang-org-x-tools: " Sharlatan Hellseher
@ 2024-02-12 18:48 ` Sharlatan Hellseher
2024-02-12 18:48 ` [bug#69042] [PATCH v2 27/30] gnu: go-golang-org-x-crypto: " Sharlatan Hellseher
` (3 subsequent siblings)
28 siblings, 0 replies; 64+ messages in thread
From: Sharlatan Hellseher @ 2024-02-12 18:48 UTC (permalink / raw)
To: 69042
Cc: Sharlatan Hellseher, Katherine Cox-Buday, Liliana Marie Prikler,
Sharlatan Hellseher, 宋文武
* gnu/packages/golang.scm (go-golang-org-x-image): Move from here ...
* gnu/packages/golang-build.scm: ... to here.
* gnu/packages/game.scm: Add (gnu packages golang-build) module.
Change-Id: Icd0b303d8f7544f6eae10ac30d7bd01779abaede
---
gnu/packages/games.scm | 1 +
gnu/packages/golang-build.scm | 31 +++++++++++++++++++++++++++++++
gnu/packages/golang.scm | 30 ------------------------------
3 files changed, 32 insertions(+), 30 deletions(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index f95681fbb7..c257a2cfe8 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -150,6 +150,7 @@ (define-module (gnu packages games)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages gnuzilla)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages gperf)
#:use-module (gnu packages graphics)
#:use-module (gnu packages graphviz)
diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index 87f184fb14..b717c3ad27 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019 Brian Leung <bkleung89@gmail.com>
;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org>
+;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2020 HiPhish <hiphish@posteo.de>
;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
@@ -99,6 +100,36 @@ (define-public go-golang-org-x-exp
@code{old} directory) packages.")
(license license:bsd-3)))
+(define-public go-golang-org-x-image
+ (let ((commit "58c23975cae11f062d4b3b0c143fe248faac195d")
+ (revision "1"))
+ (package
+ (name "go-golang-org-x-image")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://go.googlesource.com/image")
+ (commit commit)))
+ (file-name (string-append "go.googlesource.com-image-"
+ version "-checkout"))
+ (sha256
+ (base32 "0i2p2girc1sfcic6xs6vrq0fp3szfx057xppksb67kliywjjrm5x"))))
+ (build-system go-build-system)
+ (arguments
+ `(#:import-path "golang.org/x/image"
+ ;; Source-only package
+ #:tests? #f
+ #:phases
+ (modify-phases %standard-phases
+ (delete 'build))))
+ (home-page "https://go.googlesource.com/image")
+ (synopsis "Supplemental Go image libraries")
+ (description "This package provides supplemental Go libraries for image
+processing.")
+ (license license:bsd-3))))
+
(define-public go-golang-org-x-mod
(let ((commit "7c05a442b7c1d1a107879b4a090bb5a38d3774a1")
(revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 4c2781bf45..0437b4e83d 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3488,36 +3488,6 @@ (define-public gopls
editor.")
(license license:bsd-3)))
-(define-public go-golang-org-x-image
- (let ((commit "58c23975cae11f062d4b3b0c143fe248faac195d")
- (revision "1"))
- (package
- (name "go-golang-org-x-image")
- (version (git-version "0.0.0" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://go.googlesource.com/image")
- (commit commit)))
- (file-name (string-append "go.googlesource.com-image-"
- version "-checkout"))
- (sha256
- (base32
- "0i2p2girc1sfcic6xs6vrq0fp3szfx057xppksb67kliywjjrm5x"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "golang.org/x/image"
- ; Source-only package
- #:tests? #f
- #:phases
- (modify-phases %standard-phases
- (delete 'build))))
- (home-page "https://go.googlesource.com/image")
- (synopsis "Supplemental Go image libraries")
- (description "This package provides supplemental Go libraries for image
-processing.")
- (license license:bsd-3))))
-
(define-public go-golang-org-x-oauth2
(let ((commit "0f29369cfe4552d0e4bcddc57cc75f4d7e672a33")
(revision "1"))
--
2.41.0
^ permalink raw reply related [flat|nested] 64+ messages in thread* [bug#69042] [PATCH v2 27/30] gnu: go-golang-org-x-crypto: Move to golang-build.
2024-02-12 18:48 ` [bug#69042] [PATCH v2 01/30] gnu: Add (gnu packages golang-build) module Sharlatan Hellseher
` (24 preceding siblings ...)
2024-02-12 18:48 ` [bug#69042] [PATCH v2 26/30] gnu: go-golang-org-x-image: " Sharlatan Hellseher
@ 2024-02-12 18:48 ` Sharlatan Hellseher
2024-02-12 18:48 ` [bug#69042] [PATCH v2 28/30] gnu: go-github-com-klauspost-compress: Move to golang-compression Sharlatan Hellseher
` (2 subsequent siblings)
28 siblings, 0 replies; 64+ messages in thread
From: Sharlatan Hellseher @ 2024-02-12 18:48 UTC (permalink / raw)
To: 69042; +Cc: Sharlatan Hellseher, Katherine Cox-Buday, Sharlatan Hellseher
* gnu/packages/golang.scm (go-golang-org-x-crypto): Move from here ...
* gnu/packages/golang-build.scm: ... to here.
* gnu/packages/backup.scm: Add (gnu packages golang-build) module.
* gnu/packages/crypto.scm: As above.
Change-Id: I5daad7fe90e1507958fe73c04fc043ebbc006395
---
gnu/packages/backup.scm | 1 +
gnu/packages/crypto.scm | 1 +
gnu/packages/golang-build.scm | 34 +++++++++++++++++++++++++++++++++-
gnu/packages/golang.scm | 31 -------------------------------
4 files changed, 35 insertions(+), 32 deletions(-)
diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index f160efd37d..3b3b9d332a 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -71,6 +71,7 @@ (define-module (gnu packages backup)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-crypto)
#:use-module (gnu packages golang-web)
#:use-module (gnu packages gperf)
diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm
index c7145bcb0c..6857ea2075 100644
--- a/gnu/packages/crypto.scm
+++ b/gnu/packages/crypto.scm
@@ -60,6 +60,7 @@ (define-module (gnu packages crypto)
#:use-module (gnu packages gettext)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-build)
#:use-module (gnu packages graphviz)
#:use-module (gnu packages image)
#:use-module (gnu packages kerberos)
diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index b717c3ad27..8b7dca46a6 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -1,14 +1,15 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019 Brian Leung <bkleung89@gmail.com>
+;;; Copyright © 2019, 2020 Leo Famulari <leo@famulari.name>
;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2020 HiPhish <hiphish@posteo.de>
-;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
;;; Copyright © 2020 Vagrant Cascadian <vagrant@debian.org>
;;; Copyright © 2021 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2021 hackeryarn <artemchernyak@gmail.com>
;;; Copyright © 2023 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;; Copyright © 2023 Felix Lechner <felix.lechner@lease-up.com>
@@ -74,6 +75,37 @@ (define-public go-github-com-yuin-goldmark
(description "This package provides a markdown parser.")
(license license:expat)))
+(define-public go-golang-org-x-crypto
+ (package
+ (name "go-golang-org-x-crypto")
+ (version "0.4.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://go.googlesource.com/crypto")
+ (commit (string-append "v" version))))
+ (file-name (string-append "go.googlesource.com-crypto-"
+ version "-checkout"))
+ (sha256
+ (base32 "13i0yz4hvc4qdr438nmzilvl5ns73v3910bakcddny3jbzq72i2m"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "golang.org/x/crypto"
+ ;; Source-only package
+ #:tests? #f
+ #:phases
+ (modify-phases %standard-phases
+ ;; Source-only package
+ (delete 'build))))
+ (propagated-inputs
+ (list go-golang-org-x-sys))
+ (home-page "https://go.googlesource.com/crypto/")
+ (synopsis "Supplementary cryptographic libraries in Go")
+ (description "This package provides supplementary cryptographic libraries
+for the Go language.")
+ (license license:bsd-3)))
+
(define-public go-golang-org-x-exp
(package
(name "go-golang-org-x-exp")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 0437b4e83d..e473c0880b 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3347,37 +3347,6 @@ (define-public go-github-com-hashicorp-hcl-v2
(home-page "https://github.com/hashicorp/hcl")
(license license:mpl2.0)))
-(define-public go-golang-org-x-crypto
- (package
- (name "go-golang-org-x-crypto")
- (version "0.4.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://go.googlesource.com/crypto")
- (commit (string-append "v" version))))
- (file-name (string-append "go.googlesource.com-crypto-"
- version "-checkout"))
- (sha256
- (base32
- "13i0yz4hvc4qdr438nmzilvl5ns73v3910bakcddny3jbzq72i2m"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "golang.org/x/crypto"
- ;; Source-only package
- #:tests? #f
- #:phases
- (modify-phases %standard-phases
- ;; Source-only package
- (delete 'build))))
- (propagated-inputs
- (list go-golang-org-x-sys))
- (synopsis "Supplementary cryptographic libraries in Go")
- (description "This package provides supplementary cryptographic libraries
-for the Go language.")
- (home-page "https://go.googlesource.com/crypto/")
- (license license:bsd-3)))
-
(define-public govulncheck
(package
(name "govulncheck")
--
2.41.0
^ permalink raw reply related [flat|nested] 64+ messages in thread* [bug#69042] [PATCH v2 28/30] gnu: go-github-com-klauspost-compress: Move to golang-compression.
2024-02-12 18:48 ` [bug#69042] [PATCH v2 01/30] gnu: Add (gnu packages golang-build) module Sharlatan Hellseher
` (25 preceding siblings ...)
2024-02-12 18:48 ` [bug#69042] [PATCH v2 27/30] gnu: go-golang-org-x-crypto: " Sharlatan Hellseher
@ 2024-02-12 18:48 ` Sharlatan Hellseher
2024-02-12 18:48 ` [bug#69042] [PATCH v2 29/30] gnu: go-github-com-andybalholm-brotli: " Sharlatan Hellseher
2024-02-12 18:48 ` [bug#69042] [PATCH v2 30/30] gnu: go-github.com-ulikunitz-xz: " Sharlatan Hellseher
28 siblings, 0 replies; 64+ messages in thread
From: Sharlatan Hellseher @ 2024-02-12 18:48 UTC (permalink / raw)
To: 69042; +Cc: Sharlatan Hellseher, Katherine Cox-Buday, Sharlatan Hellseher
* gnu/packages/golang.scm (go-github-com-klauspost-compress): Move from here ...
* gnu/packages/golang-compression.scm: ... to here.
* gnu/packages/golang-compression.scm: Add (gnu packages
golang-compression) module.
* gnu/packages/golang-crypto.scm: As above.
* gnu/packages/golang-web.scm: As above.
* gnu/packages/uucp.scm: As above.
Change-Id: Ia99f1e6aae7f75940fc150eb02862c0b3e9f3325
---
gnu/packages/golang-compression.scm | 31 ++++++++++++++++++++++++++++
gnu/packages/golang-crypto.scm | 3 ++-
gnu/packages/golang-web.scm | 1 +
gnu/packages/golang.scm | 32 -----------------------------
gnu/packages/uucp.scm | 1 +
5 files changed, 35 insertions(+), 33 deletions(-)
diff --git a/gnu/packages/golang-compression.scm b/gnu/packages/golang-compression.scm
index 670572ea90..5aacc34a66 100644
--- a/gnu/packages/golang-compression.scm
+++ b/gnu/packages/golang-compression.scm
@@ -56,6 +56,37 @@ (define-public go-github-com-golang-snappy
compression format.")
(license license:bsd-3)))
+(define-public go-github-com-klauspost-compress
+ (package
+ (name "go-github-com-klauspost-compress")
+ (version "1.13.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/klauspost/compress")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0ydnf9rizlhm8rilh14674qqx272sbwbkjx06xn9pqvy6mmn2r3r"))))
+ (build-system go-build-system)
+ (arguments
+ `(#:import-path "github.com/klauspost/compress"
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'reset-gzip-timestamps 'fix-permissions
+ (lambda* (#:key outputs #:allow-other-keys)
+ ;; Provide write permissions on gzip files so that
+ ;; reset-gzip-timestamps has sufficient permissions.
+ (for-each make-file-writable
+ (find-files (assoc-ref outputs "out") ".gz$")))))))
+ (propagated-inputs
+ (list go-github-com-golang-snappy))
+ (home-page "https://github.com/klauspost/compress")
+ (synopsis "Go compression library")
+ (description "@code{compress} provides various compression algorithms.")
+ (license license:bsd-3)))
+
;;;
;;; Avoid adding new packages to the end of this file. To reduce the chances
;;; of a merge conflict, place them above by existing packages with similar
diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm
index 39e7412558..58fd9cb250 100644
--- a/gnu/packages/golang-crypto.scm
+++ b/gnu/packages/golang-crypto.scm
@@ -45,7 +45,8 @@ (define-module (gnu packages golang-crypto)
#:use-module (gnu packages)
#:use-module (gnu packages golang)
#:use-module (gnu packages golang-build)
- #:use-module (gnu packages golang-check))
+ #:use-module (gnu packages golang-check)
+ #:use-module (gnu packages golang-compression))
;;; Commentary:
;;;
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index d7fb7dd366..28a9fad113 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -50,6 +50,7 @@ (define-module (gnu packages golang-web)
#:use-module (gnu packages golang)
#:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-check)
+ #:use-module (gnu packages golang-compression)
#:use-module (gnu packages golang-crypto)
#:use-module (gnu packages golang-xyz)
#:use-module (gnu packages tls)
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index e473c0880b..24ca39fc58 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9477,38 +9477,6 @@ (define-public go-github-com-dustin-go-humanize
back.")
(license license:expat)))
-(define-public go-github-com-klauspost-compress
- (package
- (name "go-github-com-klauspost-compress")
- (version "1.13.1")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/klauspost/compress")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0ydnf9rizlhm8rilh14674qqx272sbwbkjx06xn9pqvy6mmn2r3r"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/klauspost/compress"
- #:phases
- (modify-phases %standard-phases
- (add-before 'reset-gzip-timestamps 'fix-permissions
- (lambda* (#:key outputs #:allow-other-keys)
- ;; Provide write permissions on gzip files so that
- ;; reset-gzip-timestamps has sufficient permissions.
- (for-each make-file-writable
- (find-files (assoc-ref outputs "out") ".gz$")))))))
- (propagated-inputs
- (list go-github-com-golang-snappy))
- (home-page "https://github.com/klauspost/compress")
- (synopsis "Go compression library")
- (description "@code{compress} provides various compression algorithms.")
- (license license:bsd-3)))
-
(define-public go-github-com-oneofone-xxhash
(package
(name "go-github-com-oneofone-xxhash")
diff --git a/gnu/packages/uucp.scm b/gnu/packages/uucp.scm
index 8f1759556e..8e47834fef 100644
--- a/gnu/packages/uucp.scm
+++ b/gnu/packages/uucp.scm
@@ -20,6 +20,7 @@
(define-module (gnu packages uucp)
#:use-module (gnu packages golang)
#:use-module (gnu packages golang-build)
+ #:use-module (gnu packages golang-compression)
#:use-module (gnu packages golang-crypto)
#:use-module (gnu packages golang-web)
#:use-module (gnu packages texinfo)
--
2.41.0
^ permalink raw reply related [flat|nested] 64+ messages in thread* [bug#69042] [PATCH v2 29/30] gnu: go-github-com-andybalholm-brotli: Move to golang-compression.
2024-02-12 18:48 ` [bug#69042] [PATCH v2 01/30] gnu: Add (gnu packages golang-build) module Sharlatan Hellseher
` (26 preceding siblings ...)
2024-02-12 18:48 ` [bug#69042] [PATCH v2 28/30] gnu: go-github-com-klauspost-compress: Move to golang-compression Sharlatan Hellseher
@ 2024-02-12 18:48 ` Sharlatan Hellseher
2024-02-12 18:48 ` [bug#69042] [PATCH v2 30/30] gnu: go-github.com-ulikunitz-xz: " Sharlatan Hellseher
28 siblings, 0 replies; 64+ messages in thread
From: Sharlatan Hellseher @ 2024-02-12 18:48 UTC (permalink / raw)
To: 69042; +Cc: Sharlatan Hellseher, Katherine Cox-Buday, Sharlatan Hellseher
* gnu/packages/golang.scm (go-github-com-andybalholm-brotli): Move from here ...
* gnu/packages/golang-compression.scm: ... to here.
Change-Id: I820b0211b1fe4d90643e82fc32a99d8e8b6a9b0f
---
gnu/packages/golang-compression.scm | 27 +++++++++++++++++++++++++++
gnu/packages/golang.scm | 26 --------------------------
2 files changed, 27 insertions(+), 26 deletions(-)
diff --git a/gnu/packages/golang-compression.scm b/gnu/packages/golang-compression.scm
index 5aacc34a66..6a556daa25 100644
--- a/gnu/packages/golang-compression.scm
+++ b/gnu/packages/golang-compression.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2021 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2022 Sharlatan Hellseher <sharlatanus@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -33,6 +34,32 @@ (define-module (gnu packages golang-compression)
;;;
;;; Code:
\f
+(define-public go-github-com-andybalholm-brotli
+ (package
+ (name "go-github-com-andybalholm-brotli")
+ (version "1.0.4")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/andybalholm/brotli")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1zvmj7gbnkq9xwv1bvcxk9acxl06y902148qwbd2kqwgs52wy2c0"))))
+ (build-system go-build-system)
+ (arguments
+ `(#:import-path "github.com/andybalholm/brotli"))
+ (home-page "https://github.com/andybalholm/brotli")
+ (synopsis "Pure Go Brotli encoder and decoder")
+ (description
+ "This package is a brotli compressor and decompressor implemented in Go.
+It was translated from the reference implementation
+(@url{https://github.com/google/brotli,https://github.com/google/brotli}) with
+the @code{c2go} tool at
+@url{https://github.com/andybalholm/c2go,https://github.com/andybalholm/c2go}.")
+ (license license:expat)))
+
(define-public go-github-com-golang-snappy
(package
(name "go-github-com-golang-snappy")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 24ca39fc58..644121a761 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3722,32 +3722,6 @@ (define-public go-github-com-google-cadvisor
containers.")
(license license:asl2.0))))
-(define-public go-github-com-andybalholm-brotli
- (package
- (name "go-github-com-andybalholm-brotli")
- (version "1.0.4")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/andybalholm/brotli")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "1zvmj7gbnkq9xwv1bvcxk9acxl06y902148qwbd2kqwgs52wy2c0"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/andybalholm/brotli"))
- (home-page "https://github.com/andybalholm/brotli")
- (synopsis "Pure Go Brotli encoder and decoder")
- (description
- "This package is a brotli compressor and decompressor implemented in Go.
-It was translated from the reference implementation
-(@url{https://github.com/google/brotli,https://github.com/google/brotli}) with
-the @code{c2go} tool at
-@url{https://github.com/andybalholm/c2go,https://github.com/andybalholm/c2go}.")
- (license license:expat)))
-
(define-public go-github-com-jonboulle-clockwork
(let ((commit "e3653ace2d63753697e0e5b07b9393971c0bba9d")
(revision "0"))
--
2.41.0
^ permalink raw reply related [flat|nested] 64+ messages in thread* [bug#69042] [PATCH v2 30/30] gnu: go-github.com-ulikunitz-xz: Move to golang-compression.
2024-02-12 18:48 ` [bug#69042] [PATCH v2 01/30] gnu: Add (gnu packages golang-build) module Sharlatan Hellseher
` (27 preceding siblings ...)
2024-02-12 18:48 ` [bug#69042] [PATCH v2 29/30] gnu: go-github-com-andybalholm-brotli: " Sharlatan Hellseher
@ 2024-02-12 18:48 ` Sharlatan Hellseher
28 siblings, 0 replies; 64+ messages in thread
From: Sharlatan Hellseher @ 2024-02-12 18:48 UTC (permalink / raw)
To: 69042; +Cc: Sharlatan Hellseher, Katherine Cox-Buday, Sharlatan Hellseher
* gnu/packages/golang.scm (go-github.com-ulikunitz-xz): Move from here ...
* gnu/packages/golang-compression.scm: ... to here.
* gnu/packages/admin.scm: Add (gnu packages golang-compression) module.
* gnu/packages/bioinformatics.scm: As above.
Change-Id: I1901e67ac4336efd356085332572b3f09de90f7a
---
gnu/packages/admin.scm | 1 +
gnu/packages/bioinformatics.scm | 1 +
gnu/packages/golang-compression.scm | 23 +++++++++++++++++++++++
gnu/packages/golang.scm | 22 ----------------------
4 files changed, 25 insertions(+), 22 deletions(-)
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index c595e1270f..11f69e57a4 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -131,6 +131,7 @@ (define-module (gnu packages admin)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang)
#:use-module (gnu packages golang-build)
+ #:use-module (gnu packages golang-compression)
#:use-module (gnu packages groff)
#:use-module (gnu packages gtk)
#:use-module (gnu packages guile)
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 08683bc8e9..bcfe3c2656 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -95,6 +95,7 @@ (define-module (gnu packages bioinformatics)
#:use-module (gnu packages golang)
#:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-check)
+ #:use-module (gnu packages golang-compression)
#:use-module (gnu packages glib)
#:use-module (gnu packages graph)
#:use-module (gnu packages graphics)
diff --git a/gnu/packages/golang-compression.scm b/gnu/packages/golang-compression.scm
index 6a556daa25..568fdd12b9 100644
--- a/gnu/packages/golang-compression.scm
+++ b/gnu/packages/golang-compression.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2021 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2022 Sharlatan Hellseher <sharlatanus@gmail.com>
@@ -114,6 +115,28 @@ (define-public go-github-com-klauspost-compress
(description "@code{compress} provides various compression algorithms.")
(license license:bsd-3)))
+(define-public go-github.com-ulikunitz-xz
+ (package
+ (name "go-github.com-ulikunitz-xz")
+ (version "0.5.8")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/ulikunitz/xz.git")
+ (commit (string-append "v" version))))
+ (file-name (string-append name "-" version "-checkout"))
+ (sha256
+ (base32 "1xnsymi5fmmm734bi4c6z57p5cvnyxlpi29yxs4v21w5k763aypd"))))
+ (build-system go-build-system)
+ (arguments
+ `(#:import-path "github.com/ulikunitz/xz"))
+ (home-page "https://github.com/ulikunitz/xz")
+ (synopsis "Read and write xz compressed streams in Go")
+ (description "This package provides a library to read and write xz
+compressed streams in Go.")
+ (license license:bsd-3)))
+
;;;
;;; Avoid adding new packages to the end of this file. To reduce the chances
;;; of a merge conflict, place them above by existing packages with similar
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 644121a761..7d1ae9699b 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -8968,28 +8968,6 @@ (define-public go-github-com-tekwizely-go-parsing
parsers, and related tools.")
(license license:expat))))
-(define-public go-github.com-ulikunitz-xz
- (package
- (name "go-github.com-ulikunitz-xz")
- (version "0.5.8")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/ulikunitz/xz.git")
- (commit (string-append "v" version))))
- (file-name (string-append name "-" version "-checkout"))
- (sha256
- (base32
- "1xnsymi5fmmm734bi4c6z57p5cvnyxlpi29yxs4v21w5k763aypd"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/ulikunitz/xz"))
- (synopsis "Read and write xz compressed streams in Go")
- (description "This package provides a library to read and write xz
-compressed streams in Go.")
- (home-page "https://github.com/ulikunitz/xz")
- (license license:bsd-3)))
-
(define-public go-github-com-songmu-gitconfig
(package
(name "go-github-com-songmu-gitconfig")
--
2.41.0
^ permalink raw reply related [flat|nested] 64+ messages in thread
* bug#69042: [PATCH 00/30] Split (gnu packages golang) part IV.
2024-02-11 10:36 [bug#69042] [PATCH 00/30] Split (gnu packages golang) part IV Sharlatan Hellseher
` (31 preceding siblings ...)
2024-02-12 18:48 ` [bug#69042] [PATCH v2 01/30] gnu: Add (gnu packages golang-build) module Sharlatan Hellseher
@ 2024-02-13 14:48 ` Sharlatan Hellseher
32 siblings, 0 replies; 64+ messages in thread
From: Sharlatan Hellseher @ 2024-02-13 14:48 UTC (permalink / raw)
To: 69042-done
[-- Attachment #1: Type: text/plain, Size: 54 bytes --]
Pushed as 5a77f2ee54..c185c51e14 to master.
--
Oleg
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply [flat|nested] 64+ messages in thread