gnu: go-golang-org-x-net: Move to golang-build.

* 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
This commit is contained in:
Sharlatan Hellseher 2024-02-05 20:57:31 +00:00
parent 1996575a7e
commit 8b3daeca55
No known key found for this signature in database
GPG key ID: 76D727BFF62CD2B5
14 changed files with 78 additions and 60 deletions

View file

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

View file

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

View file

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

View file

@ -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:
(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

View file

@ -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:
;;;

View file

@ -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:

View file

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

View file

@ -30,6 +30,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))

View file

@ -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)
@ -3651,65 +3652,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"))

View file

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

View file

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

View file

@ -127,6 +127,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-check)
#:use-module (gnu packages golang-crypto)
#:use-module (gnu packages golang-web)

View file

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

View file

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