From a4aac98bbb6e6475ba7e35ad0eb82d861e483709 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 7 Feb 2024 20:53:56 +0000 Subject: [PATCH] gnu: go-golang-org-x-sys: Move to golang-build. * 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 0fb83a7a124d5f1128d4aee1268f2f081b9149b9..02a602a66d7a11ce2506b34c637e1a369d1c2830 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -49,6 +49,7 @@ #: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 903088ed4b30c125fabe3590ba6132f86d1c433d..dc4a91f14dc1152f38c7859f246e642aba202466 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -107,6 +107,7 @@ #: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 fbe8edeef0965a0e136b12414b3f3d9b4c0f6f62..0fe1f2c1c77f89fb48e9c4ca5797dfdd9efa5892 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -42,6 +42,7 @@ #: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 2601dec27ade0100b978d45211706e4f6ccfdcf4..eeab951f1e8699b1a70cc62c22a2c5f5d597a6f0 100644 --- a/gnu/packages/golang-build.scm +++ b/gnu/packages/golang-build.scm @@ -101,6 +101,37 @@ (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 fc134134205be5d2cf6cf0cdb2ec872b3a4b1bb8..4eb20e13f193f105d7f841c400a419959aea7ad4 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3713,37 +3713,6 @@ packages.") (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 3200ccc13532b944f3b3c9ae55092d69dac88977..c211fa659566ffae22afdf49eb501e56a954b022 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -67,6 +67,7 @@ #: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 b8b119e47470d65b3e5cd2eb1758f4e33f5b3813..d798c44a8f3f77eb9806624c33e01b6759ee80e0 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -134,6 +134,7 @@ #: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 1547acf1be74574209f0559d6cc82b9c6b378aac..b79fdfc6a0f322acda12eb905654cbf0a35920b8 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -91,6 +91,7 @@ #: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 d26e8bc028b40fd70fd7ce6c28f201bc12037637..d09b03bcdb9e68b0219a4362b4c768694f188928 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -38,6 +38,7 @@ #: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 be5cb15cb8877303b9f01635c1b7e6c0baaf75fb..25de916fcb17833ce33b79941def7c5729b38188 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -67,6 +67,7 @@ #: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 0070eaab6f8d309ba9de5a226228ae014d42c5af..7823ef19eb0ef4bb7b8a9c590a9ee1e4642c1756 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -71,6 +71,7 @@ #: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 6ba656017f453b8059d5341b653506d29067f053..5a58b97a303251656e5e34526dd7bb16f8526075 100644 --- a/gnu/packages/weather.scm +++ b/gnu/packages/weather.scm @@ -22,7 +22,8 @@ #: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 a1039b9e0cbe87ff75d5b448f4f08577f96dc91b..0c67e7d6e48c8dbc12397921aa2018c49e8b4da6 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -143,6 +143,7 @@ #: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)