From 0493c9cb199497bb750ab319710646b8546c539a Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Tue, 16 Jan 2024 22:09:05 +0000 Subject: gnu: go-github-com-pquerna-cachecontrol: Move to (gnu packages golang-web). * /gnu/packages/golang.scm (go-github-com-pquerna-cachecontrol): Move from here ... * /gnu/packages/golang-web.scm: ... to here. Change-Id: I0f25ffcdf142a3676e0e1fa61408cb9411326fb6 --- gnu/packages/golang-web.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages/golang-web.scm') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 3e60bfaf33..07b77ee673 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -1119,6 +1119,31 @@ (define-public go-github-com-opentracing-opentracing-go (description "OpenTracing-Go is a Go implementation of the OpenTracing API.") (license license:asl2.0))) +(define-public go-github-com-pquerna-cachecontrol + (package + (name "go-github-com-pquerna-cachecontrol") + (version "0.2.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pquerna/cachecontrol") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0d5zgv2w0sinh9m41pw3n015zzyabk7awgwwga7nmhjz452c9r5n")))) + (build-system go-build-system) + (arguments + (list #:import-path "github.com/pquerna/cachecontrol")) + (native-inputs + (list go-github-com-stretchr-testify)) + (home-page "https://github.com/pquerna/cachecontrol") + (synopsis "Golang HTTP Cache-Control Parser and Interpretation") + (description + "This package implements RFC 7234 Hypertext Transfer Protocol (HTTP/1.1): +Caching.") + (license license:asl2.0))) + (define-public go-github-com-puerkitobio-goquery (package (name "go-github-com-puerkitobio-goquery") -- cgit v1.2.3 From f7ca047b6dd6f7d43a927f1b189be7a3a4e04581 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Tue, 16 Jan 2024 23:27:45 +0000 Subject: gnu: go-github-com-jcmturner-aescts-v2: Move to (gnu packages golang-crypto). * gnu/packages/golang.scm (go-github-com-jcmturner-aescts-v2): Move from here ... * gnu/packages/golang-crypto.scm: ... to here. * gnu/packages/golang-web.scm: Add (gnu packages golang-crypto) to used modules. Change-Id: Ie8f74e09ae50db4e4b0c9292d049cc46c033d6a6 --- gnu/packages/golang-crypto.scm | 25 ++++++++++++++++++++++++- gnu/packages/golang-web.scm | 1 + gnu/packages/golang.scm | 24 ------------------------ 3 files changed, 25 insertions(+), 25 deletions(-) (limited to 'gnu/packages/golang-web.scm') diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm index eac4fc8139..860ee82727 100644 --- a/gnu/packages/golang-crypto.scm +++ b/gnu/packages/golang-crypto.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2019, 2020 Leo Famulari ;;; Copyright © 2021 Raghav Gururajan -;;; Copyright © 2022 Nicolas Graves +;;; Copyright © 2022, 2023 Nicolas Graves ;;; Copyright © 2023 Artyom V. Poptsov ;;; Copyright © 2023 Clément Lassieur ;;; @@ -115,6 +115,29 @@ (define-public go-github-com-gaukas-godicttls for values.") (license license:bsd-3))) +(define-public go-github-com-jcmturner-aescts-v2 + (package + (name "go-github-com-jcmturner-aescts-v2") + (version "2.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jcmturner/aescts") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0yrdiisdhcqfs8jpicc30dfmbqzxhkmbayn902xrgwkndky8w7l1")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/jcmturner/aescts/v2")) + (propagated-inputs (list go-github-com-stretchr-testify)) + (home-page "https://github.com/jcmturner/aescts") + (synopsis "Encrypt and decrypt data in Go using AES CipherText Stealing") + (description "This package provides AES Cipher Block Chaining CipherText +Stealing encryption and decryption methods.") + (license license:asl2.0))) + (define-public go-github-com-libp2p-go-libp2p-crypto (let ((commit "7240b40a3ddc47c4d17c15baabcbe45e5219171b") (revision "0")) diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 07b77ee673..dfa1f862dc 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -47,6 +47,7 @@ (define-module (gnu packages golang-web) #:use-module (gnu packages) #:use-module (gnu packages golang) #:use-module (gnu packages golang-check) + #:use-module (gnu packages golang-crypto) #:use-module (gnu packages tls) #:use-module (gnu packages web)) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index d2e2a07b74..a44427e5d4 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -1477,30 +1477,6 @@ (define-public go-github-com-jacobsa-reqtrace "Package reqtrace contains a very simple request tracing framework.") (license license:asl2.0)))) -(define-public go-github-com-jcmturner-aescts-v2 - (package - (name "go-github-com-jcmturner-aescts-v2") - (version "2.0.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/jcmturner/aescts") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0yrdiisdhcqfs8jpicc30dfmbqzxhkmbayn902xrgwkndky8w7l1")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/jcmturner/aescts/v2")) - (propagated-inputs (list go-github-com-stretchr-testify)) - (home-page "https://github.com/jcmturner/aescts") - (synopsis "Encrypt and decrypt data in Go using AES CipherText Stealing") - (description - "This package provides AES Cipher Block Chaining CipherText Stealing -encryption and decryption methods.") - (license license:asl2.0))) - (define-public go-github-com-jcmturner-gofork (package (name "go-github-com-jcmturner-gofork") -- cgit v1.2.3 From fb2b72a5f35e134ee641c8d1fa1e48bd7696ef43 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Tue, 30 Jan 2024 21:20:04 +0000 Subject: gnu: go-github-com-go-jose-go-jose-v3: Move to (gnu packages golang-web). Drop inheritance from go-gopkg-in-square-go-jose-v2 as it's archived by the owner on Feb 27, 2023. * gnu/packages/golang.scm (go-github-com-go-jose-go-jose-v3): Move from here ... * gnu/packages/golang-web.scm: ... to here. Change-Id: I67838e18a43d93e5ae3b62e9645b7d22cf474103 --- gnu/packages/golang-web.scm | 29 +++++++++++++++++++++++++++++ gnu/packages/golang.scm | 17 ----------------- 2 files changed, 29 insertions(+), 17 deletions(-) (limited to 'gnu/packages/golang-web.scm') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index dfa1f862dc..dd84962110 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -577,6 +577,35 @@ (define-public go-github-com-go-chi-chi-v5 decompose request handling into many smaller layers.") (license license:expat))) +(define-public go-github-com-go-jose-go-jose-v3 + (package + (name "go-github-com-go-jose-go-jose-v3") + (version "3.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/go-jose/go-jose") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1fnw0p49wc9gmd2xcji2x9jf97dgg9igagd5m6bmq3nw9jjfqdc5")))) + (build-system go-build-system) + (arguments + '( #:import-path "github.com/go-jose/go-jose/v3")) + (propagated-inputs + (list go-golang-org-x-crypto)) + (native-inputs + (list go-github-com-google-go-cmp-cmp + go-github-com-stretchr-testify)) + (home-page "https://github.com/go-jose/go-jose") + (synopsis "Implementation of JOSE standards (JWE, JWS, JWT) in Go") + (description + "This package provides a Golang implementation of the Javascript Object +Signing and Encryption set of standards. This includes support for JSON Web +Encryption, JSON Web Signature, and JSON Web Token standards.") + (license license:asl2.0))) + (define-public go-github-com-go-telegram-bot-api-telegram-bot-api (package (name "go-github-com-go-telegram-bot-api-telegram-bot-api") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 64f7981a7d..a8f55df915 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3223,23 +3223,6 @@ (define-public go-github-com-hebcal-hebcal-go and anniversaries.") (license license:gpl2+)))) -(define-public go-github-com-go-jose-go-jose-v3 - (package - (inherit go-gopkg-in-square-go-jose-v2) - (name "go-github-com-go-jose-go-jose-v3") - (version "3.0.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/go-jose/go-jose") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1fnw0p49wc9gmd2xcji2x9jf97dgg9igagd5m6bmq3nw9jjfqdc5")))) - (arguments - (list #:import-path "github.com/go-jose/go-jose/v3")))) - (define-public go-gopkg.in-tomb.v2 (let ((commit "d5d1b5820637886def9eef33e03a27a9f166942c") (revision "0")) -- cgit v1.2.3 From df65af45b5f2cc76ce813ca91fab9054fd807bba Mon Sep 17 00:00:00 2001 From: Thomas Ieong Date: Thu, 1 Feb 2024 20:36:04 +0000 Subject: gnu: Add go-minify. * gnu/packages/golang-web.scm (go-minify): New variable. Co-authored-by: Sharlatan Hellseher Co-authored-by: Hilton Chain Signed-off-by: Sharlatan Hellseher Change-Id: Ic9b1c12ea477aa5ad194482f2ade58da029cadc4 --- gnu/packages/golang-web.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages/golang-web.scm') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index dd84962110..41626c9856 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -21,6 +21,7 @@ ;;; Copyright © 2023 Hilton Chain ;;; Copyright © 2023 Katherine Cox-Buday ;;; Copyright © 2023 Nicolas Graves +;;; Copyright © 2023 Thomas Ieong ;;; Copyright © 2023 Artyom V. Poptsov ;;; ;;; This file is part of GNU Guix. @@ -44,10 +45,12 @@ (define-module (gnu packages golang-web) #:use-module (guix build-system go) #:use-module (guix gexp) #:use-module (guix git-download) + #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages golang) #:use-module (gnu packages golang-check) #:use-module (gnu packages golang-crypto) + #:use-module (gnu packages golang-xyz) #:use-module (gnu packages tls) #:use-module (gnu packages web)) @@ -1515,6 +1518,25 @@ (define-public go-gopkg-in-square-go-jose-v2 Encryption, JSON Web Signature, and JSON Web Token standards.") (license license:asl2.0))) +(define-public go-minify + (package + (inherit go-github-com-tdewolff-minify-v2) + (name "go-minify") + (arguments + (substitute-keyword-arguments + (package-arguments go-github-com-tdewolff-minify-v2) + ((#:install-source? _ #t) #f) + ((#:import-path _ "github.com/tdewolff/minify/v2") + "github.com/tdewolff/minify/cmd/minify"))) + (inputs + (list go-github-com-djherbis-atime + go-github-com-dustin-go-humanize + go-github-com-fsnotify-fsnotify + go-github-com-matryer-try + go-github-com-spf13-pflag)) + (description "This package provides a CLI binary executible built from +go-github-com-tdewolff-minify-v2 source."))) + ;;; ;;; 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 -- cgit v1.2.3 From 560b4687e534836943f50ba5d56d779ddc1adeb0 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 1 Feb 2024 20:41:34 +0000 Subject: gnu: golang-web: Adjust module commentary. Follow up . * gnu/packages/golang-web.scm: Mention sections for library and executable to reduce cross module inheritance. Change-Id: I9775d5681b380063dc43e6bd38aa94cec4f0db81 --- gnu/packages/golang-web.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'gnu/packages/golang-web.scm') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 41626c9856..f11e59ce48 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -57,12 +57,18 @@ (define-module (gnu packages golang-web) ;;; Commentary: ;;; ;;; Golang modules (libraries) related to HTML, CSS, SCSS, JavaScript, JSON, -;;; Web-framework, REST-API or similar functionality. +;;; Web-framework, REST-API or similar functionality. They may provide +;;; executables and libraries, for which there are marked sections. + ;;; ;;; Please: Try to add new module packages in alphabetic order. ;;; ;;; Code: +;;; +;;; Libraries: +;;; + (define-public go-cloud-google-com-go-compute-metadata (package (name "go-cloud-google-com-go-compute-metadata") @@ -1518,6 +1524,10 @@ (define-public go-gopkg-in-square-go-jose-v2 Encryption, JSON Web Signature, and JSON Web Token standards.") (license license:asl2.0))) +;;; +;;; Executables: +;;; + (define-public go-minify (package (inherit go-github-com-tdewolff-minify-v2) -- cgit v1.2.3 From 34e8a40dadc1169d4810fa5111a9eaaadedeb66f Mon Sep 17 00:00:00 2001 From: "Artyom V. Poptsov" Date: Wed, 17 Jan 2024 00:07:42 +0300 Subject: gnu: Add go-github-com-gregjones-httpcache. * gnu/packages/golang-web.scm (go-github-com-gregjones-httpcache): New variable. Change-Id: I2ba0196fd1de63f26a814dc96ff64a6fb5379043 Signed-off-by: Sharlatan Hellseher --- gnu/packages/golang-web.scm | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) (limited to 'gnu/packages/golang-web.scm') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index f11e59ce48..c66b93cb84 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -22,7 +22,7 @@ ;;; Copyright © 2023 Katherine Cox-Buday ;;; Copyright © 2023 Nicolas Graves ;;; Copyright © 2023 Thomas Ieong -;;; Copyright © 2023 Artyom V. Poptsov +;;; Copyright © 2023, 2024 Artyom V. Poptsov ;;; ;;; This file is part of GNU Guix. ;;; @@ -907,6 +907,34 @@ (define-public go-github-com-gorilla-websocket protocol.") (license license:bsd-2))) +(define-public go-github-com-gregjones-httpcache + (let ((commit "901d90724c7919163f472a9812253fb26761123d") + (revision "0")) + (package + (name "go-github-com-gregjones-httpcache") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gregjones/httpcache") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "05r0xq51vfb55di11m7iv19341d73f7in33vq1ihcqs1nffdwiq0")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/gregjones/httpcache")) + (home-page "https://github.com/gregjones/httpcache") + (synopsis "Transport for @code{http.Client} that will cache responses") + (description + "Package @code{httpcache} provides a @code{http.RoundTripper} +implementation that works as a mostly @url{https://tools.ietf.org/html/rfc7234, RFC 7234} +compliant cache for HTTP responses. It is only suitable for use as a +\"private\" cache (i.e. for a web-browser or an API-client and not for a +shared proxy).") + (license license:expat)))) + (define-public go-github-com-hjson-hjson-go (package (name "go-github-com-hjson-hjson-go") -- cgit v1.2.3 From 067fa9448f892cad9c22e054b7f53d97a9a9368c Mon Sep 17 00:00:00 2001 From: Troy Figiel Date: Fri, 2 Feb 2024 21:57:49 +0100 Subject: gnu: go-github-com-jmespath-go-jmespath: Add missing input. * gnu/packages/golang-web.scm (go-github-com-jmespath-go-jmespath) [native-inputs]: Add go-github-com-stretchr-objx. Signed-off-by: Sharlatan Hellseher Change-Id: I98f2bf971b2edf41c6f36ed118bbe33727f0267b --- gnu/packages/golang-web.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/golang-web.scm') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index c66b93cb84..719cb5dfeb 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -1081,6 +1081,7 @@ (define-public go-github-com-jmespath-go-jmespath (native-inputs (list go-github-com-davecgh-go-spew go-github-com-pmezard-go-difflib + go-github-com-stretchr-objx go-gopkg-in-yaml-v2)) (home-page "https://github.com/jmespath/go-jmespath") (synopsis "Golang implementation of JMESPath") -- cgit v1.2.3 From 8b3daeca5545b97556b7f7f196bda6ca84e3dfa3 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Mon, 5 Feb 2024 20:57:31 +0000 Subject: 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 --- 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(-) (limited to 'gnu/packages/golang-web.scm') 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 +;;; Copyright © 2023 Artyom V. Poptsov +;;; Copyright © 2023 Felix Lechner ;;; ;;; 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 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 4eb52d427d..a75ae4c066 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 (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 4e46c70d81..cd15d7debc 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) @@ -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")) diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm index 7c87caa39c..c2d721dc0b 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 aecb4faeb8..9b472500bc 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -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) 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) -- cgit v1.2.3 From d8f69addc2e6a3045e4ed9e91a6ac2b5829e6068 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 10 Feb 2024 22:06:15 +0000 Subject: gnu: go-github-com-klauspost-compress: Move to golang-compression. * 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(-) (limited to 'gnu/packages/golang-web.scm') 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 a2073b5c5f..69205badbe 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -9498,38 +9498,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) -- cgit v1.2.3 From 5854bec5814d94e7061b2e929e202666a0e48361 Mon Sep 17 00:00:00 2001 From: Troy Figiel Date: Sun, 11 Feb 2024 14:55:01 +0100 Subject: gnu: go-github-com-goccy-go-json: Remove benchmarks. * gnu/packages/golang-web.scm (go-github-com-goccy-go-json) [source]: Remove benchmarks. Signed-off-by: Sharlatan Hellseher Change-Id: I5560cbb4ff0672e93d3d4daccb7a4078d35fd967 --- gnu/packages/golang-web.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu/packages/golang-web.scm') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 28a9fad113..673d2c2587 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -23,6 +23,7 @@ ;;; Copyright © 2023 Nicolas Graves ;;; Copyright © 2023 Thomas Ieong ;;; Copyright © 2023, 2024 Artyom V. Poptsov +;;; Copyright © 2024 Troy Figiel ;;; ;;; This file is part of GNU Guix. ;;; @@ -654,7 +655,9 @@ (define-public go-github-com-goccy-go-json (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1bg8p4c6r8r0kixdxv2m8xmdsmb1zl5sd8czswpccldjk3c358wp")))) + (base32 "1bg8p4c6r8r0kixdxv2m8xmdsmb1zl5sd8czswpccldjk3c358wp")) + (modules '((guix build utils))) + (snippet '(delete-file-recursively "benchmarks")))) (build-system go-build-system) (arguments '(#:import-path "github.com/goccy/go-json")) -- cgit v1.2.3 From d86c93c9cbe522a20eca671f7991d7ade10b6331 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Sat, 29 Jul 2023 01:19:57 +0800 Subject: gnu: go-github-com-goccy-go-json: Update to 0.10.2. * gnu/packages/golang-web.scm (go-github-com-goccy-go-json): Update to 0.10.2. Signed-off-by: Sharlatan Hellseher --- gnu/packages/golang-web.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'gnu/packages/golang-web.scm') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 673d2c2587..c97d775fff 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -646,7 +646,7 @@ (define-public go-github-com-go-telegram-bot-api-telegram-bot-api (define-public go-github-com-goccy-go-json (package (name "go-github-com-goccy-go-json") - (version "0.9.10") + (version "0.10.2") (source (origin (method git-fetch) @@ -655,15 +655,14 @@ (define-public go-github-com-goccy-go-json (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1bg8p4c6r8r0kixdxv2m8xmdsmb1zl5sd8czswpccldjk3c358wp")) - (modules '((guix build utils))) - (snippet '(delete-file-recursively "benchmarks")))) + (base32 "1krid2hlvs808jl9zmv7m6zx92samc60gymhwr2mwwykicwbnks8")))) (build-system go-build-system) (arguments '(#:import-path "github.com/goccy/go-json")) (home-page "https://github.com/goccy/go-json") (synopsis "JSON encoder/decoder in Go") - (description "Fast JSON encoder/decoder compatible with encoding/json for Go.") + (description + "Fast JSON encoder/decoder compatible with encoding/json for Go.") (license license:expat))) (define-public go-github-com-google-go-github -- cgit v1.2.3 From a72487a9ea621f2d9f926a1d50e3d68228f93896 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 18 Feb 2024 21:53:19 +0000 Subject: gnu: go-github-com-goccy-go-json: Revert source snippet Reported by Hilton Chain in . Introduced in commit d86c93c9cbe5. * gnu/packages/golang-web.scm (go-github-com-goccy-go-json) [source]: Add snippet deleting benchmarks files. Change-Id: I86d878bd9cd5a24fb71c1cbbd698527a40e84f05 --- gnu/packages/golang-web.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages/golang-web.scm') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index c97d775fff..210d17b997 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -655,7 +655,9 @@ (define-public go-github-com-goccy-go-json (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1krid2hlvs808jl9zmv7m6zx92samc60gymhwr2mwwykicwbnks8")))) + (base32 "1krid2hlvs808jl9zmv7m6zx92samc60gymhwr2mwwykicwbnks8")) + (modules '((guix build utils))) + (snippet '(delete-file-recursively "benchmarks")))) (build-system go-build-system) (arguments '(#:import-path "github.com/goccy/go-json")) -- cgit v1.2.3 From e9f30ad0a0815cfb3cdc46459fbc9accc0bf3c0b Mon Sep 17 00:00:00 2001 From: Troy Figiel Date: Tue, 13 Feb 2024 22:14:09 +0100 Subject: gnu: go-github-com-valyala-fasthttp: Add missing input. * gnu/packages/golang-web.scm (go-github-com-valyala-fasthttp): Add missing input. [propagated-inputs]: Add go-golang-org-x-text. Signed-off-by: Sharlatan Hellseher --- gnu/packages/golang-web.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/golang-web.scm') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 210d17b997..bc191c97f9 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -1403,7 +1403,8 @@ (define-public go-github-com-valyala-fasthttp go-github-com-valyala-tcplisten go-golang-org-x-crypto go-golang-org-x-net - go-golang-org-x-sys)) + go-golang-org-x-sys + go-golang-org-x-text)) (home-page "https://github.com/valyala/fasthttp") (synopsis "Provides fast HTTP server and client API") (description -- cgit v1.2.3 From 963e2e9bb6a9b88b9e123864ef4800d2456dd669 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 14 Feb 2024 20:45:58 +0000 Subject: gnu: Add go-github-com-google-go-github-v33. * gnu/packages/golang-web.scm (go-github-com-google-go-github-v33): New variable. Change-Id: Ifafa71ea78b2b430f5f907912038bb03333126cf --- gnu/packages/golang-web.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages/golang-web.scm') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index bc191c97f9..4f2c6f8c1a 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -693,6 +693,29 @@ (define-public go-github-com-google-go-github GitHub API v3.") (license license:bsd-3))) +;; For chezmoi-1.8.10 +(define-public go-github-com-google-go-github-v33 + (package + (inherit go-github-com-google-go-github) + (name "go-github-com-google-go-github-v33") + (version "33.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/google/go-github") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1nzwgvaa9k1ky3sfynib6nhalam9dx66h5lxff334m9kk3rf5nn0")))) + (arguments + (substitute-keyword-arguments + (package-arguments go-github-com-google-go-github) + ((#:unpack-path _ "github.com/google/go-github/v26") + "github.com/google/go-github/v33") + ((#:import-path _ "github.com/google/go-github/v26/github") + "github.com/google/go-github/v33/github"))))) + (define-public go-github-com-google-safehtml (package (name "go-github-com-google-safehtml") -- cgit v1.2.3