From 96d3f5240b0a4bf40c3acc6eb05f18dc30dd1efb Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Mon, 15 Jul 2024 15:50:03 +0100 Subject: gnu: go-golang-org-x-oauth2: Update to 0.21.0. * gnu/packages/golang.scm (go-golang-org-x-oauth2): Update to 0.21.0. [propagated-inputs]: Remove go-golang-org-x-net; add go-github-com-google-go-cmp-cmp. Change-Id: I8213829fbd012c4ab8246a4a6fe794f6371ef65b --- gnu/packages/golang.scm | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 1298a8c58b..acf16071ff 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3263,32 +3263,29 @@ (define-public gopls (license license:bsd-3))) (define-public go-golang-org-x-oauth2 - (let ((commit "0f29369cfe4552d0e4bcddc57cc75f4d7e672a33") - (revision "1")) (package (name "go-golang-org-x-oauth2") - (version (git-version "0.0.0" revision commit)) + (version "0.21.0") (source (origin (method git-fetch) (uri (git-reference (url "https://go.googlesource.com/oauth2") - (commit commit))) - (file-name (string-append "go.googlesource.com-oauth2-" - version "-checkout")) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "06jwpvx0x2gjn2y959drbcir5kd7vg87k0r1216abk6rrdzzrzi2")))) + "0pzpa9jqrfxxhxi1w7n5ljnvr9qfw42hzavz62fc9i6z9vk2466k")))) (build-system go-build-system) (arguments `(#:import-path "golang.org/x/oauth2")) (propagated-inputs (list go-cloud-google-com-go-compute-metadata - go-golang-org-x-net)) + go-github-com-google-go-cmp-cmp)) (home-page "https://go.googlesource.com/oauth2") (synopsis "Client implementation of the OAuth 2.0 spec") (description "This package contains a client implementation for OAuth 2.0 spec in Go.") - (license license:bsd-3)))) + (license license:bsd-3))) (define-public go-github-com-jpillora-backoff (let ((commit -- cgit v1.2.3 From 162f716d74c53ce6b7ea885895bfb884dde5b48d Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Mon, 15 Jul 2024 15:51:08 +0100 Subject: gnu: go-golang-org-x-oauth2: Improve package style. * gnu/packages/golang.scm (go-golang-org-x-oauth2): Fix indentation, apply new package style. Change-Id: I36e7a9d159928b5ef5d83fec9d57b005cc2c5ad4 --- gnu/packages/golang.scm | 46 ++++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 22 deletions(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index acf16071ff..4426fc4721 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3263,29 +3263,31 @@ (define-public gopls (license license:bsd-3))) (define-public go-golang-org-x-oauth2 - (package - (name "go-golang-org-x-oauth2") - (version "0.21.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://go.googlesource.com/oauth2") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0pzpa9jqrfxxhxi1w7n5ljnvr9qfw42hzavz62fc9i6z9vk2466k")))) - (build-system go-build-system) - (arguments - `(#:import-path "golang.org/x/oauth2")) - (propagated-inputs - (list go-cloud-google-com-go-compute-metadata - go-github-com-google-go-cmp-cmp)) - (home-page "https://go.googlesource.com/oauth2") - (synopsis "Client implementation of the OAuth 2.0 spec") - (description "This package contains a client implementation for OAuth 2.0 + (package + (name "go-golang-org-x-oauth2") + (version "0.21.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/oauth2") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0pzpa9jqrfxxhxi1w7n5ljnvr9qfw42hzavz62fc9i6z9vk2466k")))) + (build-system go-build-system) + (arguments + (list + #:import-path "golang.org/x/oauth2")) + (propagated-inputs + (list go-cloud-google-com-go-compute-metadata + go-github-com-google-go-cmp-cmp)) + (home-page "https://go.googlesource.com/oauth2") + (synopsis "Client implementation of the OAuth 2.0 spec") + (description + "This package contains a client implementation for OAuth 2.0 spec in Go.") - (license license:bsd-3))) + (license license:bsd-3))) (define-public go-github-com-jpillora-backoff (let ((commit -- cgit v1.2.3 From 04af4f6646ec4949b716240e3a8b8153b2e1cb42 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 25 Jul 2024 10:47:42 +0100 Subject: gnu: go-golang-org-x-oauth2: Move to golang-web. * gnu/packages/golang.scm (go-golang-org-x-oauth2): Move from here ... * gnu/packages/golang-web.scm: ... to here. Change-Id: I60fd46f5c373ccdb00c78c978a840acfe9f489b1 --- gnu/packages/golang-web.scm | 29 ++++++++++++++++++++++++++++- gnu/packages/golang.scm | 27 --------------------------- 2 files changed, 28 insertions(+), 28 deletions(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index a9658cfbac..a9213f1be8 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -3,9 +3,9 @@ ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2019 Vagrant Cascadian +;;; Copyright © 2019, 2020 Martin Becze ;;; Copyright © 2020 Jack Hill ;;; Copyright © 2020 Joseph LaFreniere -;;; Copyright © 2020 Martin Becze ;;; Copyright © 2020 Nicolas Goaziou ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020 Ryan Prior @@ -3224,6 +3224,33 @@ (define-public go-github-com-xeipuuv-gojsonschema programming language, which supports draft-04, draft-06 and draft-07.") (license license:asl2.0)))) +(define-public go-golang-org-x-oauth2 + (package + (name "go-golang-org-x-oauth2") + (version "0.21.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/oauth2") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0pzpa9jqrfxxhxi1w7n5ljnvr9qfw42hzavz62fc9i6z9vk2466k")))) + (build-system go-build-system) + (arguments + (list + #:import-path "golang.org/x/oauth2")) + (propagated-inputs + (list go-cloud-google-com-go-compute-metadata + go-github-com-google-go-cmp)) + (home-page "https://go.googlesource.com/oauth2") + (synopsis "Client implementation of the OAuth 2.0 spec") + (description + "This package contains a client implementation for OAuth 2.0 + spec in Go.") + (license license:bsd-3))) + ;; XXX: This repository has been archived by the owner on Feb 27, 2023. It is ;; now read-only and it is DEPRECATED. (define-public go-gopkg-in-square-go-jose-v2 diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 4426fc4721..60a2b4de40 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3262,33 +3262,6 @@ (define-public gopls editor.") (license license:bsd-3))) -(define-public go-golang-org-x-oauth2 - (package - (name "go-golang-org-x-oauth2") - (version "0.21.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://go.googlesource.com/oauth2") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0pzpa9jqrfxxhxi1w7n5ljnvr9qfw42hzavz62fc9i6z9vk2466k")))) - (build-system go-build-system) - (arguments - (list - #:import-path "golang.org/x/oauth2")) - (propagated-inputs - (list go-cloud-google-com-go-compute-metadata - go-github-com-google-go-cmp-cmp)) - (home-page "https://go.googlesource.com/oauth2") - (synopsis "Client implementation of the OAuth 2.0 spec") - (description - "This package contains a client implementation for OAuth 2.0 - spec in Go.") - (license license:bsd-3))) - (define-public go-github-com-jpillora-backoff (let ((commit "06c7a16c845dc8e0bf575fafeeca0f5462f5eb4d") -- cgit v1.2.3 From 1775f91de29e8c7e0531c6ee05fc832fdb919a21 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 19 Jul 2024 21:44:47 +0100 Subject: gnu: go-github-com-google-go-cmp-cmp: Update to 0.6.0. * gnu/packages/golang.scm (go-github-com-google-go-cmp-cmp): Update to 0.6.0. Change-Id: I351367d34d02ae6459a83e29c40fcfd14945fb8d --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 60a2b4de40..4cecefc5a3 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -5932,7 +5932,7 @@ (define-public go-github-com-emersion-go-mbox (define-public go-github-com-google-go-cmp-cmp (package (name "go-github-com-google-go-cmp-cmp") - (version "0.5.9") + (version "0.6.0") (source (origin (method git-fetch) (uri (git-reference @@ -5941,7 +5941,7 @@ (define-public go-github-com-google-go-cmp-cmp (file-name (git-file-name name version)) (sha256 (base32 - "0a13m7l1jrysa7mrlmra8y7n83zcnb23yjyg3a609p8i9lxkh1wm")))) + "1n1j4hi50bl05pyys4i7y417k9g6k1blslj27z327qny7kkdl2ma")))) (build-system go-build-system) (arguments '(#:import-path "github.com/google/go-cmp/cmp" -- cgit v1.2.3 From 770a66850530df05c967b8ce47109843cd343a64 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 19 Jul 2024 21:46:03 +0100 Subject: gnu: go-github-com-google-go-cmp-cmp: Improve package style. * gnu/packages/golang.scm (go-github-com-google-go-cmp-cmp): Adjust indentation. [arguments]: Apply new package list style and G-expressions. [home-page]: Move after [synopsis]. Change-Id: I14a8dfcbe8a17c98df7f880823cd9c35522f013b --- gnu/packages/golang.scm | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 4cecefc5a3..a5d199df2c 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -5933,33 +5933,34 @@ (define-public go-github-com-google-go-cmp-cmp (package (name "go-github-com-google-go-cmp-cmp") (version "0.6.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/google/go-cmp") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1n1j4hi50bl05pyys4i7y417k9g6k1blslj27z327qny7kkdl2ma")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/google/go-cmp") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1n1j4hi50bl05pyys4i7y417k9g6k1blslj27z327qny7kkdl2ma")))) (build-system go-build-system) (arguments - '(#:import-path "github.com/google/go-cmp/cmp" - #:unpack-path "github.com/google/go-cmp" - #:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key inputs #:allow-other-keys #:rest args) - (unless - ;; The tests fail when run with gccgo. - (false-if-exception (search-input-file inputs "/bin/gccgo")) - (apply (assoc-ref %standard-phases 'check) args))))))) + (list + #:import-path "github.com/google/go-cmp/cmp" + #:unpack-path "github.com/google/go-cmp" + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs #:allow-other-keys #:rest args) + (unless + ;; The tests fail when run with gccgo. + (false-if-exception (search-input-file inputs "/bin/gccgo")) + (apply (assoc-ref %standard-phases 'check) args))))))) (synopsis "Determine equality of values in Go") + (home-page "https://github.com/google/go-cmp") (description "This package is intended to be a more powerful and safer -alternative to @@code{reflect.DeepEqual} for comparing whether two values are +alternative to @code{reflect.DeepEqual} for comparing whether two values are semantically equal.") - (home-page "https://github.com/google/go-cmp") (license license:bsd-3))) (define-public go-github-com-google-uuid -- cgit v1.2.3 From bdff9d26423a62f246882a46c5440c144c54910c Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 19 Jul 2024 22:18:22 +0100 Subject: gnu: go-github-com-google-go-cmp-cmp: Enable all tests. * gnu/packages/golang.scm (go-github-com-google-go-cmp-cmp) [arguments]: <#:phases>: Adjust custom 'check phase to run all available tests inside each submodule and respect "tests?' parameter. Change-Id: I85eacbb4c3221d34a2e7cf6a9f6cfde363ded71c --- gnu/packages/golang.scm | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index a5d199df2c..6bc9b3a6d5 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -5950,11 +5950,17 @@ (define-public go-github-com-google-go-cmp-cmp #:phases #~(modify-phases %standard-phases (replace 'check - (lambda* (#:key inputs #:allow-other-keys #:rest args) - (unless - ;; The tests fail when run with gccgo. - (false-if-exception (search-input-file inputs "/bin/gccgo")) - (apply (assoc-ref %standard-phases 'check) args))))))) + (lambda* (#:key tests? import-path inputs #:allow-other-keys) + (when tests? + ;; The tests fail when run with gccgo. + (let ((gccgo? (false-if-exception + (search-input-file inputs "/bin/gccgo")))) + (if gccgo? + (format #t "skipping tests with gccgo compiler~%") + ;; XXX: Workaround for go-build-system's lack of Go + ;; modules support. + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" "./...")))))))))) (synopsis "Determine equality of values in Go") (home-page "https://github.com/google/go-cmp") (description -- cgit v1.2.3 From 058e0cc75a2cb7dc81386b994084f162e75cb552 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 19 Jul 2024 22:24:25 +0100 Subject: gnu: go-github-com-google-go-cmp-cmp: Rename variable. * gnu/packages/golang.scm (go-github-com-google-go-cmp-cmp): Rename variable to go-github-com-google-go-cmp, which reflects go.mod import path and improves importer performance. (go-github-com-zclconf-go-cty, go-golang-org-x-vuln, go-google-golang-org-protobuf, go-gotest-tools-assert, go-gotest-tools-internal-source, go-gotest-tools-internal-format, gofumpt, gopls, gotestsum): Swap go-github-com-google-go-cmp-cmp to go-github-com-google-go-cmp in inputs, propagated-inputs or native-inputs. * gnu/packages/golang-check.scm (go-github-com-frankban-quicktest, go-github-com-google-go-cmdtest): Likewise. * gnu/packages/golang-web.scm (go-github-com-aws-aws-sdk-go-v2, go-github-com-aws-aws-sdk-go-v2-config, go-github-com-aws-smithy-go, go-github-com-go-jose-go-jose-v3, go-github-com-makeworld-the-better-one-go-gemini, go-golang-org-x-oauth2, go-gopkg-in-square-go-jose-v2): Likewise. * gnu/packages/golang-xyz.scm (go-github-com-goccy-go-yaml): Likewise. * gnu/packages/check.scm (actionlint): Likewise. * gnu/packages/databases.scm (sqls): Likewise. * gnu/packages/ipfs.scm (go-github-com-ipld-go-ipld-prime, go-github-com-whyrusleeping-cbor-gen): Likewise. * gnu/packages/web.scm (go-github-com-itchyny-gojq): Likewise. Change-Id: Ie6eeba936f7da404d70fbbaad34f5b43aec4e05b --- gnu/packages/check.scm | 2 +- gnu/packages/databases.scm | 2 +- gnu/packages/golang-check.scm | 4 ++-- gnu/packages/golang-web.scm | 12 ++++++------ gnu/packages/golang-xyz.scm | 2 +- gnu/packages/golang.scm | 24 ++++++++++++------------ gnu/packages/ipfs.scm | 4 ++-- gnu/packages/web.scm | 2 +- 8 files changed, 26 insertions(+), 26 deletions(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 412b94569c..4faa8102fd 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1144,7 +1144,7 @@ (define-public actionlint go-golang-org-x-sync go-golang-org-x-sync go-gopkg-in-yaml-v3)) - (native-inputs (list go-github-com-google-go-cmp-cmp)) + (native-inputs (list go-github-com-google-go-cmp)) (home-page "https://rhysd.github.io/actionlint/") (synopsis "Static checker for GitHub Actions workflow files") (description diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 96a59e8024..2532586bc5 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -5506,7 +5506,7 @@ (define-public sqls #:install-source? #f #:import-path "github.com/lighttiger2505/sqls")) (native-inputs - (list go-github-com-google-go-cmp-cmp + (list go-github-com-google-go-cmp go-github-com-go-sql-driver-mysql go-github-com-k0kubun-pp go-github-com-lib-pq diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm index 0822338943..4323a6c557 100644 --- a/gnu/packages/golang-check.scm +++ b/gnu/packages/golang-check.scm @@ -301,7 +301,7 @@ (define-public go-github-com-frankban-quicktest (arguments '(#:import-path "github.com/frankban/quicktest")) (propagated-inputs - (list go-github-com-google-go-cmp-cmp go-github-com-kr-pretty)) + (list go-github-com-google-go-cmp go-github-com-kr-pretty)) (home-page "https://github.com/frankban/quicktest") (synopsis "Quick helpers for testing Go applications") (description @@ -376,7 +376,7 @@ (define-public go-github-com-google-go-cmdtest (arguments '(#:import-path "github.com/google/go-cmdtest")) (propagated-inputs - (list go-github-com-google-renameio go-github-com-google-go-cmp-cmp)) + (list go-github-com-google-renameio go-github-com-google-go-cmp)) (home-page "https://github.com/google/go-cmdtest") (synopsis "Testing for your CLI") (description diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index a21339adb2..f8862ddd10 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -300,7 +300,7 @@ (define-public go-github-com-aws-aws-sdk-go-v2 '(#:import-path "github.com/aws/aws-sdk-go-v2")) (propagated-inputs (list go-github-com-aws-smithy-go - go-github-com-google-go-cmp-cmp + go-github-com-google-go-cmp go-github-com-jmespath-go-jmespath)) (home-page "https://github.com/aws/aws-sdk-go-v2") (synopsis "AWS SDK for Go v2") @@ -317,7 +317,7 @@ (define-public go-github-com-aws-aws-sdk-go-v2-config '(#:import-path "github.com/aws/aws-sdk-go-v2/config" #:unpack-path "github.com/aws/aws-sdk-go-v2")) (propagated-inputs - (list go-github-com-google-go-cmp-cmp + (list go-github-com-google-go-cmp go-github-com-aws-smithy-go)))) (define-public go-github-com-aws-aws-sdk-go-v2-feature-s3-manager @@ -402,7 +402,7 @@ (define-public go-github-com-aws-smithy-go (arguments '(#:import-path "github.com/aws/smithy-go")) (propagated-inputs - (list go-github-com-jmespath-go-jmespath go-github-com-google-go-cmp-cmp)) + (list go-github-com-jmespath-go-jmespath go-github-com-google-go-cmp)) (home-page "https://github.com/aws/smithy-go") (synopsis "@url{https://smithy.io/2.0/index.html,Smithy} code generators for Go") @@ -812,7 +812,7 @@ (define-public go-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 + (list go-github-com-google-go-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") @@ -1673,7 +1673,7 @@ (define-public go-github-com-makeworld-the-better-one-go-gemini (base32 "196rxfg7w8s3zn87gra1mxh1l8iav6kdmg909gkbnc9cxip65zc0")))) (build-system go-build-system) (propagated-inputs - (list go-github-com-google-go-cmp-cmp + (list go-github-com-google-go-cmp go-golang-org-x-net go-golang-org-x-text)) (arguments @@ -3287,7 +3287,7 @@ (define-public go-gopkg-in-square-go-jose-v2 (propagated-inputs (list go-golang-org-x-crypto)) (native-inputs - (list go-github-com-google-go-cmp-cmp + (list go-github-com-google-go-cmp go-github-com-stretchr-testify)) (home-page "https://gopkg.in/square/go-jose.v2") (synopsis "Implementation of JOSE standards (JWE, JWS, JWT) in Go") diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index 6560f43578..ebce00f117 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -2154,7 +2154,7 @@ (define-public go-github-com-goccy-go-yaml (invoke "go" "test" "-v" "./...")))))))) (native-inputs (list go-github-com-go-playground-validator-v10 - go-github-com-google-go-cmp-cmp)) + go-github-com-google-go-cmp)) (propagated-inputs (list go-github-com-fatih-color go-golang-org-x-xerrors)) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 6bc9b3a6d5..ac626aee16 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3188,7 +3188,7 @@ (define-public go-golang-org-x-vuln "./scan/...")))))))) (propagated-inputs (list go-github-com-google-go-cmdtest - go-github-com-google-go-cmp-cmp + go-github-com-google-go-cmp go-golang-org-x-exp go-golang-org-x-mod go-golang-org-x-sync @@ -3240,7 +3240,7 @@ (define-public gopls (lambda _ (delete-file-recursively "src/golang.org/x/tools")))))) (native-inputs - (list go-github-com-google-go-cmp-cmp + (list go-github-com-google-go-cmp go-github-com-jba-printsrc go-github-com-jba-templatecheck go-github-com-sergi-go-diff @@ -5929,9 +5929,9 @@ (define-public go-github-com-emersion-go-mbox @code{mbox} files.") (license license:expat))) -(define-public go-github-com-google-go-cmp-cmp +(define-public go-github-com-google-go-cmp (package - (name "go-github-com-google-go-cmp-cmp") + (name "go-github-com-google-go-cmp") (version "0.6.0") (source (origin @@ -6118,7 +6118,7 @@ (define (go-gotest-tools-package suffix) (define-public go-gotest-tools-internal-format (package (inherit (go-gotest-tools-package "internal/format")) (native-inputs - (list go-github-com-pkg-errors go-github-com-google-go-cmp-cmp)) + (list go-github-com-pkg-errors go-github-com-google-go-cmp)) (synopsis "Formats messages for use with gotest-tools") (description "This package provides a way to format messages for use with gotest-tools."))) @@ -6143,7 +6143,7 @@ (define-public go-gotest-tools-internal-source (false-if-exception (search-input-file inputs "/bin/gccgo")) (apply (assoc-ref %standard-phases 'check) args)))))))) (native-inputs - (list go-github-com-pkg-errors go-github-com-google-go-cmp-cmp)) + (list go-github-com-pkg-errors go-github-com-google-go-cmp)) (synopsis "Source code AST formatters for gotest-tools") (description "This package provides source code AST formatters for gotest-tools."))) @@ -6156,7 +6156,7 @@ (define-public go-gotest-tools-assert #:import-path "gotest.tools/assert" #:unpack-path "gotest.tools")) (propagated-inputs - (list go-github-com-google-go-cmp-cmp + (list go-github-com-google-go-cmp go-github-com-pkg-errors go-github-com-spf13-pflag go-golang-org-x-tools)) @@ -6191,14 +6191,14 @@ (define-public gotestsum go-github-com-jonboulle-clockwork go-golang-org-x-crypto go-gotest-tools-assert - go-github-com-google-go-cmp-cmp + go-github-com-google-go-cmp ;; TODO: This would be better as a propagated-input of ;; go-gotest-tools-assert, but that does not work for ;; some reason. go-gotest-tools-internal-format go-gotest-tools-internal-difflib go-gotest-tools-internal-source - go-github-com-google-go-cmp-cmp)) + go-github-com-google-go-cmp)) (synopsis "Go test runner with output optimized for humans") (description "This package provides a @code{go test} runner with output optimized for humans, JUnit XML for CI integration, and a summary of the @@ -6278,7 +6278,7 @@ (define-public go-google-golang-org-protobuf (when tests? (with-directory-excursion (string-append "src/" import-path) (invoke "go" "test" "-v" "./...")))))))) - (propagated-inputs (list go-github-com-google-go-cmp-cmp)) + (propagated-inputs (list go-github-com-google-go-cmp)) (home-page "https://google.golang.org/protobuf") (synopsis "Go library for Protocol Buffers") (description @@ -7632,7 +7632,7 @@ (define-public go-github-com-zclconf-go-cty '(#:unpack-path "github.com/zclconf/go-cty" #:import-path "github.com/zclconf/go-cty/cty")) (native-inputs - (list go-github-com-google-go-cmp-cmp)) + (list go-github-com-google-go-cmp)) (propagated-inputs (list go-golang-org-x-text go-github-com-vmihailenco-msgpack-v4 @@ -8032,7 +8032,7 @@ (define-public gofumpt go-golang-org-x-sync go-golang-org-x-mod go-github-com-rogpeppe-go-internal - go-github-com-google-go-cmp-cmp + go-github-com-google-go-cmp go-github-com-frankban-quicktest)) (home-page "https://mvdan.cc/gofumpt/") (synopsis "Formats Go files with a stricter ruleset than gofmt") diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm index 55c10724c4..887654ec28 100644 --- a/gnu/packages/ipfs.scm +++ b/gnu/packages/ipfs.scm @@ -606,7 +606,7 @@ (define-public go-github-com-ipld-go-ipld-prime go-github-com-warpfork-go-testmark specification-ipld)) (propagated-inputs - (list go-github-com-google-go-cmp-cmp + (list go-github-com-google-go-cmp go-github-com-ipfs-go-block-format go-github-com-ipfs-go-cid go-github-com-multiformats-go-multicodec @@ -799,7 +799,7 @@ (define-public go-github-com-whyrusleeping-cbor-gen #:import-path "github.com/whyrusleeping/cbor-gen")) (propagated-inputs (list go-github-com-ipfs-go-cid - go-github-com-google-go-cmp-cmp + go-github-com-google-go-cmp go-golang-org-x-xerrors)) (home-page "https://github.com/whyrusleeping/cbor-gen") (synopsis "Codegen for CBOR codecs on the specified types") diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index e406e6e968..eb6699c3a1 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5531,7 +5531,7 @@ (define-public go-github-com-itchyny-gojq (base32 "1dqmnxnipi497nx9x10ifack09w41579svryss5q2w5wxy0pg764")))) (build-system go-build-system) (inputs - (list go-github-com-google-go-cmp-cmp + (list go-github-com-google-go-cmp go-github-com-itchyny-timefmt-go go-github-com-mattn-go-isatty go-github-com-mattn-go-runewidth -- cgit v1.2.3 From 1bf612376574baa8771d6cc88285e30fa877aeaa Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 20 Jul 2024 00:19:46 +0100 Subject: gnu: go-github-com-google-go-cmp: Move to golang-build. * gnu/packages/golang.scm (go-github-com-google-go-cmp): Move from here ... * gnu/packages/golang-build.scm: ... to here. Change-Id: I2577d39074676f1e8552c8817d6e6843f9dd0727 --- gnu/packages/golang-build.scm | 42 +++++++++++++++++++++++++++++++++++++++++- gnu/packages/golang.scm | 40 ---------------------------------------- 2 files changed, 41 insertions(+), 41 deletions(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm index d2ee54f021..88665490bb 100644 --- a/gnu/packages/golang-build.scm +++ b/gnu/packages/golang-build.scm @@ -2,11 +2,11 @@ ;;; Copyright © 2019 Brian Leung ;;; Copyright © 2019, 2020 Leo Famulari ;;; Copyright © 2020 Danny Milosavljevic -;;; Copyright © 2020, 2024 Efraim Flashner ;;; Copyright © 2020 HiPhish ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020 Ryan Prior ;;; Copyright © 2020 Vagrant Cascadian +;;; Copyright © 2020, 2023, 2024 Efraim Flashner ;;; Copyright © 2021 Arun Isaac ;;; Copyright © 2021 Ludovic Courtès ;;; Copyright © 2021 Sarah Morgensen @@ -56,6 +56,46 @@ (define-module (gnu packages golang-build) ;;; ;;; Code: +(define-public go-github-com-google-go-cmp + (package + (name "go-github-com-google-go-cmp") + (version "0.6.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/google/go-cmp") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1n1j4hi50bl05pyys4i7y417k9g6k1blslj27z327qny7kkdl2ma")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/google/go-cmp/cmp" + #:unpack-path "github.com/google/go-cmp" + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? import-path inputs #:allow-other-keys) + (when tests? + ;; The tests fail when run with gccgo. + (let ((gccgo? (false-if-exception + (search-input-file inputs "/bin/gccgo")))) + (if gccgo? + (format #t "skipping tests with gccgo compiler~%") + ;; XXX: Workaround for go-build-system's lack of Go + ;; modules support. + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" "./...")))))))))) + (synopsis "Determine equality of values in Go") + (home-page "https://github.com/google/go-cmp") + (description + "This package is intended to be a more powerful and safer +alternative to @code{reflect.DeepEqual} for comparing whether two values are +semantically equal.") + (license license:bsd-3))) + (define-public go-github-com-yuin-goldmark (package (name "go-github-com-yuin-goldmark") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index ac626aee16..3e30cdf53f 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -5929,46 +5929,6 @@ (define-public go-github-com-emersion-go-mbox @code{mbox} files.") (license license:expat))) -(define-public go-github-com-google-go-cmp - (package - (name "go-github-com-google-go-cmp") - (version "0.6.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/google/go-cmp") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1n1j4hi50bl05pyys4i7y417k9g6k1blslj27z327qny7kkdl2ma")))) - (build-system go-build-system) - (arguments - (list - #:import-path "github.com/google/go-cmp/cmp" - #:unpack-path "github.com/google/go-cmp" - #:phases - #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? import-path inputs #:allow-other-keys) - (when tests? - ;; The tests fail when run with gccgo. - (let ((gccgo? (false-if-exception - (search-input-file inputs "/bin/gccgo")))) - (if gccgo? - (format #t "skipping tests with gccgo compiler~%") - ;; XXX: Workaround for go-build-system's lack of Go - ;; modules support. - (with-directory-excursion (string-append "src/" import-path) - (invoke "go" "test" "-v" "./...")))))))))) - (synopsis "Determine equality of values in Go") - (home-page "https://github.com/google/go-cmp") - (description - "This package is intended to be a more powerful and safer -alternative to @code{reflect.DeepEqual} for comparing whether two values are -semantically equal.") - (license license:bsd-3))) - (define-public go-github-com-google-uuid (package (name "go-github-com-google-uuid") -- cgit v1.2.3 From 3750e11a8dfb0ae9f34db348e4d7cd7ce1e16e26 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 21 Jul 2024 12:05:58 +0100 Subject: gnu: go-google-golang-org-protobuf: Move to golang-build. * gnu/packages/golang.scm (go-google-golang-org-protobuf): Move from here ... * gnu/packages/golang-build.scm: ... to here. Change-Id: Icf7676ac6288391631e83dc172a82529f1105cb2 --- gnu/packages/golang-build.scm | 51 +++++++++++++++++++++++++++++++++++++++++++ gnu/packages/golang.scm | 50 ------------------------------------------ 2 files changed, 51 insertions(+), 50 deletions(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm index a8f4cbeb20..f66fe16bd0 100644 --- a/gnu/packages/golang-build.scm +++ b/gnu/packages/golang-build.scm @@ -11,11 +11,13 @@ ;;; Copyright © 2021 Ludovic Courtès ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2021 hackeryarn +;;; Copyright © 2022 (unmatched-parenthesis ;;; Copyright © 2023 Artyom V. Poptsov ;;; Copyright © 2023 Felix Lechner ;;; Copyright © 2023 Katherine Cox-Buday ;;; Copyright © 2023 Nicolas Graves ;;; Copyright © 2023 Timo Wilken +;;; Copyright © 2024 Hilton Chain ;;; Copyright © 2024 Troy Figiel ;;; ;;; This file is part of GNU Guix. @@ -765,6 +767,55 @@ (define-public go-golang-org-x-xerrors 1.13 error values.") (license license:bsd-3)))) +(define-public go-google-golang-org-protobuf + (package + (name "go-google-golang-org-protobuf") + (version "1.31.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/protobuf") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1xf18kzz96hgfy1vlbnydrizzpxkqj2iamfdbj3dx5a1zz5mi8n0")))) + (build-system go-build-system) + (arguments + (list + #:import-path "google.golang.org/protobuf" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'disable-failing-tests + (lambda* (#:key tests? unpack-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" unpack-path) + (substitute* (find-files "." "\\_test.go$") + ;; XXX Failing on i686-linux: + ;; panic: unaligned 64-bit atomic operation + (("TestDynamicTypesExtensionNotFound") + "OffTestDynamicTypesExtensionNotFound") + (("TestDynamicTypesFilesChangeAfterCreation") + "OffTestDynamicTypesFilesChangeAfterCreation") + (("TestDynamicTypesFindExtensionByNameOrNumber") + "OffTestDynamicTypesFindExtensionByNameOrNumber"))))) + ;; XXX: Workaround for go-build-system's lack of Go modules + ;; support. + (delete 'build) + (replace 'check + (lambda* (#:key tests? import-path #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" "./...")))))))) + (propagated-inputs (list go-github-com-google-go-cmp)) + (home-page "https://google.golang.org/protobuf") + (synopsis "Go library for Protocol Buffers") + (description + "The protobuf package provides a Go implementation of Protocol Buffers, a +language and platform neutral, extensible mechanism for serializing structured +data. It is a successor to @code{go-github-com-golang-protobuf} with an +improved and cleaner API.") + (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 3e30cdf53f..4ca8c87cb2 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -6200,56 +6200,6 @@ (define-public go-github-com-golang-protobuf (home-page "https://github.com/golang/protobuf") (license license:bsd-3))) -(define-public go-google-golang-org-protobuf - (package - (name "go-google-golang-org-protobuf") - (version "1.31.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://go.googlesource.com/protobuf") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1xf18kzz96hgfy1vlbnydrizzpxkqj2iamfdbj3dx5a1zz5mi8n0")))) - (build-system go-build-system) - (arguments - (list #:import-path "google.golang.org/protobuf" - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'disable-failing-tests - (lambda* (#:key tests? unpack-path #:allow-other-keys) - (with-directory-excursion (string-append "src/" unpack-path) - (substitute* (find-files "." "\\_test.go$") - ;; XXX Failing on i686-linux: - ;; panic: unaligned 64-bit atomic operation - (("TestDynamicTypesExtensionNotFound") - "OffTestDynamicTypesExtensionNotFound") - (("TestDynamicTypesFilesChangeAfterCreation") - "OffTestDynamicTypesFilesChangeAfterCreation") - (("TestDynamicTypesFindExtensionByNameOrNumber") - "OffTestDynamicTypesFindExtensionByNameOrNumber"))))) - ;; XXX: Workaround for go-build-system's lack of Go modules - ;; support. - (delete 'build) - (replace 'check - (lambda* (#:key tests? import-path #:allow-other-keys) - (when tests? - (with-directory-excursion (string-append "src/" import-path) - (invoke "go" "test" "-v" "./...")))))))) - (propagated-inputs (list go-github-com-google-go-cmp)) - (home-page "https://google.golang.org/protobuf") - (synopsis "Go library for Protocol Buffers") - (description - "The protobuf package provides a Go implementation of Protocol Buffers, a -language and platform neutral, extensible mechanism for serializing structured -data. - -This package is a successor to @code{go-github-com-golang-protobuf} with an -improved and cleaner API.") - (license license:bsd-3))) - (define-public go-github-com-macronut-go-tproxy (package (name "go-github-com-macronut-go-tproxy") -- cgit v1.2.3 From d43795cd208161495391104054e36abb94ea0a89 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 21 Jul 2024 12:52:32 +0100 Subject: gnu: go-github-com-golang-protobuf: Move to golang-build. * gnu/packages/golang.scm (go-github-com-golang-protobuf): Move from here ... * gnu/packages/golang-build.scm: ... to here. Change-Id: I1682e199e6acd6b8362deff47fa7a26cbfe9c9ea --- gnu/packages/golang-build.scm | 38 +++++++++++++++++++++++++++++++++++++- gnu/packages/golang.scm | 34 ---------------------------------- 2 files changed, 37 insertions(+), 35 deletions(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm index f66fe16bd0..bc3625c399 100644 --- a/gnu/packages/golang-build.scm +++ b/gnu/packages/golang-build.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2018, 2019, 2020 Leo Famulari ;;; Copyright © 2019 Brian Leung -;;; Copyright © 2019, 2020 Leo Famulari ;;; Copyright © 2020 Danny Milosavljevic ;;; Copyright © 2020 HiPhish ;;; Copyright © 2020 Oleg Pykhalov @@ -58,6 +58,42 @@ (define-module (gnu packages golang-build) ;;; ;;; Code: +(define-public go-github-com-golang-protobuf + (package + (name "go-github-com-golang-protobuf") + (version "1.5.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/golang/protobuf") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "03f1w2cd4s8a3xhl61x7yjx81kbzlrjpvnnwmbhqnz814yi7h43i")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/golang/protobuf" + #:phases + #~(modify-phases %standard-phases + ;; XXX: Workaround for go-build-system's lack of Go modules + ;; support. + (delete 'build) + (replace 'check + (lambda* (#:key tests? import-path #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" "./...")))))))) + (propagated-inputs + (list go-google-golang-org-protobuf)) + (home-page "https://github.com/golang/protobuf") + (synopsis "Go support for Protocol Buffers") + (description + "This package provides Go support for the Protocol Buffers data +serialization format.") + (license license:bsd-3))) + (define-public go-github-com-google-go-cmp (package (name "go-github-com-google-go-cmp") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 4ca8c87cb2..92c0d0edbd 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -6166,40 +6166,6 @@ (define-public gotestsum (home-page "https://github.com/gotestyourself/gotestsum") (license license:asl2.0))) -(define-public go-github-com-golang-protobuf - (package - (name "go-github-com-golang-protobuf") - (version "1.5.3") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/golang/protobuf") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "03f1w2cd4s8a3xhl61x7yjx81kbzlrjpvnnwmbhqnz814yi7h43i")))) - (build-system go-build-system) - (arguments - (list #:import-path "github.com/golang/protobuf" - #:phases - #~(modify-phases %standard-phases - ;; XXX: Workaround for go-build-system's lack of Go modules - ;; support. - (delete 'build) - (replace 'check - (lambda* (#:key tests? import-path #:allow-other-keys) - (when tests? - (with-directory-excursion (string-append "src/" import-path) - (invoke "go" "test" "-v" "./...")))))))) - (propagated-inputs - (list go-google-golang-org-protobuf)) - (synopsis "Go support for Protocol Buffers") - (description "This package provides Go support for the Protocol Buffers -data serialization format.") - (home-page "https://github.com/golang/protobuf") - (license license:bsd-3))) - (define-public go-github-com-macronut-go-tproxy (package (name "go-github-com-macronut-go-tproxy") -- cgit v1.2.3 From 1036a78fa2a51d22063e6c66e237b48eecd33e7a Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 20 Jul 2024 18:29:01 +0100 Subject: gnu: go-github.com-jtolds-gls: Rename variable. * gnu/packages/golang.scm (go-github.com-jtolds-gls): Rename variable to go-github-com-jtolds-gls to follow importer style. * gnu/packages/golang-check.scm (go-github.com-smartystreets-goconvey): [propagated-inputs]: Remove go-github.com-jtolds-gls; add go-github-com-jtolds-gls. Change-Id: I5a3e1e77e646ff37421bdb8f7aab8d881a646999 --- gnu/packages/golang-check.scm | 2 +- gnu/packages/golang.scm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm index b4e85349fb..8aaad3967c 100644 --- a/gnu/packages/golang-check.scm +++ b/gnu/packages/golang-check.scm @@ -996,7 +996,7 @@ (define-public go-github.com-smartystreets-goconvey (arguments '(#:import-path "github.com/smartystreets/goconvey")) (propagated-inputs - (list go-github.com-jtolds-gls go-github.com-smartystreets-assertions)) + (list go-github-com-jtolds-gls go-github.com-smartystreets-assertions)) (home-page "https://github.com/smartystreets/goconvey") (synopsis "Go testing tool with both a web and terminal user interface") (description "GoConvey is a testing tool for Go. It integrates with go diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 92c0d0edbd..f83e62b44c 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3048,9 +3048,9 @@ (define-public go-gopkg-in-tomb-v1 "t.Fatalf(`Killf(\"BO%%s"))))))) (home-page "https://gopkg.in/tomb.v1"))) -(define-public go-github.com-jtolds-gls +(define-public go-github-com-jtolds-gls (package - (name "go-github.com-jtolds-gls") + (name "go-github-com-jtolds-gls") (version "4.20") (source (origin (method git-fetch) -- cgit v1.2.3 From 9b8d1003c1fa73a5e33cc0d6eb2babc82af29970 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 21 Jul 2024 13:28:45 +0100 Subject: gnu: go-github-com-prometheus-client-model: Move to prometheus. * gnu/packages/golang-xyz.scm (go-github-com-prometheus-client-model): Move from here ... * gnu/packages/prometheus.scm: ... to here. * gnu/packages/golang.scm: Add (gnu packages prometheus) module. * gnu/packages/networking.scm: Likewise. Change-Id: Ibbfc4100dfe33f9524eee99a461e7760f06a8eb3 --- gnu/packages/golang-xyz.scm | 28 ---------------------------- gnu/packages/golang.scm | 1 + gnu/packages/networking.scm | 1 + gnu/packages/prometheus.scm | 35 ++++++++++++++++++++++++++++++++++- 4 files changed, 36 insertions(+), 29 deletions(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index 4749fd5698..f007542b8a 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -4232,34 +4232,6 @@ (define-public go-github-com-polydawn-refmt "@code{refmt} is a serialization and object-mapping library.") (license license:expat))) -(define-public go-github-com-prometheus-client-model - (package - (name "go-github-com-prometheus-client-model") - (version "0.6.1") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/prometheus/client_model") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0g1q2szzwp4rwkvayi2mnq2nwj6hj4ja7j43vwyi1iaz6d9z505c")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/prometheus/client_model" - #:tests? #f - #:phases - (modify-phases %standard-phases - ;; Source-only package - (delete 'build)))) - (propagated-inputs - (list go-github-com-golang-protobuf)) - (synopsis "Data model artifacts for Prometheus") - (description "This package provides data model artifacts for Prometheus.") - (home-page "https://github.com/prometheus/client_model") - (license license:asl2.0))) - (define-public go-github-com-pterm-pterm (package (name "go-github-com-pterm-pterm") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index f83e62b44c..3b84e98b03 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -96,6 +96,7 @@ (define-module (gnu packages golang) #:use-module (gnu packages pcre) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages prometheus) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages ruby) #:use-module (gnu packages terminals) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 8b93aaf443..64587ed3e1 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -161,6 +161,7 @@ (define-module (gnu packages networking) #:use-module (gnu packages pkg-config) #:use-module (gnu packages polkit) #:use-module (gnu packages pretty-print) + #:use-module (gnu packages prometheus) #:use-module (gnu packages protobuf) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) diff --git a/gnu/packages/prometheus.scm b/gnu/packages/prometheus.scm index e898602ea0..6ab034c20a 100644 --- a/gnu/packages/prometheus.scm +++ b/gnu/packages/prometheus.scm @@ -1,4 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2018, 2019, 2020 Leo Famulari +;;; Copyright © 2024 Jesse Eisses ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,7 +23,8 @@ (define-module (gnu packages prometheus) #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix packages) - #:use-module (gnu packages)) + #:use-module (gnu packages) + #:use-module (gnu packages golang-build)) ;;; Commentary: ;;; @@ -36,6 +39,36 @@ (define-module (gnu packages prometheus) ;;; Libraries: ;;; +(define-public go-github-com-prometheus-client-model + (package + (name "go-github-com-prometheus-client-model") + (version "0.6.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/prometheus/client_model") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0g1q2szzwp4rwkvayi2mnq2nwj6hj4ja7j43vwyi1iaz6d9z505c")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/prometheus/client_model" + #:tests? #f + #:phases + #~(modify-phases %standard-phases + ;; Source-only package + (delete 'build)))) + (propagated-inputs + (list go-github-com-golang-protobuf)) + (home-page "https://github.com/prometheus/client_model") + (synopsis "Data model artifacts for Prometheus") + (description + "This package provides data model artifacts for Prometheus.") + (license license:asl2.0))) + ;;; ;;; Executables: ;;; -- cgit v1.2.3 From 19b22408e694ac9de48d42b16cc4d115b736a77f Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 24 Jul 2024 16:17:45 +0100 Subject: gnu: go-github-com-jpillora-backoff: Move to golang-xyz. * gnu/packages/golang.scm (go-github-com-jpillora-backoff): Move from here ... * gnu/packages/golang-xyz.scm: ... to here. Change-Id: I3e5a6018118bf2717ad5d364579e2c960da68415 --- gnu/packages/golang-xyz.scm | 26 ++++++++++++++++++++++++++ gnu/packages/golang.scm | 26 -------------------------- 2 files changed, 26 insertions(+), 26 deletions(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index f007542b8a..171ad06462 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -2765,6 +2765,32 @@ (define-public go-github-com-josharian-intern called concurrently with themselves and each other.") (license license:expat))) +(define-public go-github-com-jpillora-backoff + (let ((commit + "06c7a16c845dc8e0bf575fafeeca0f5462f5eb4d") + (revision "0")) + (package + (name "go-github-com-jpillora-backoff") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jpillora/backoff") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0xhvxr7bm47czdc5hy3kl508z3y4j91i2jm7vg774i52zych6k4l")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/jpillora/backoff")) + (home-page "https://github.com/jpillora/backoff") + (synopsis "Simple exponential backoff counter in Go") + (description + "This package is a simple exponential backoff counter in Go.") + (license license:expat)))) + (define-public go-github-com-k0kubun-go-ansi (package (name "go-github-com-k0kubun-go-ansi") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 3b84e98b03..2bf4da8eba 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3263,32 +3263,6 @@ (define-public gopls editor.") (license license:bsd-3))) -(define-public go-github-com-jpillora-backoff - (let ((commit - "06c7a16c845dc8e0bf575fafeeca0f5462f5eb4d") - (revision "0")) - (package - (name "go-github-com-jpillora-backoff") - (version (git-version "0.0.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/jpillora/backoff") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0xhvxr7bm47czdc5hy3kl508z3y4j91i2jm7vg774i52zych6k4l")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/jpillora/backoff")) - (home-page "https://github.com/jpillora/backoff") - (synopsis "Simple exponential backoff counter in Go") - (description "This package is a simple exponential backoff counter in -Go.") - (license license:expat)))) - (define-public go-github-com-stretchr-objx (package (name "go-github-com-stretchr-objx") -- cgit v1.2.3 From a1cf6f78fd511609f192660945e24538b58a460c Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 24 Jul 2024 20:51:21 +0100 Subject: gnu: go-github-com-prometheus-common: Remove submodules. Removing Golang submodules which need to be packed as separate packages. Each of them has it's own dependencies defined in go.mod and causing cycling with other packages if distributed with go-github-com-prometheus-common. * gnu/packages/golang.scm (go-github-com-prometheus-common) [snippet]: Remove submodules. Change-Id: Ic586cb6b653fd932dad402d700a0c3addd542d99 --- gnu/packages/golang.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 2bf4da8eba..518bda7299 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7361,7 +7361,17 @@ (define-public go-github-com-prometheus-common (file-name (git-file-name name version)) (sha256 (base32 - "006y6mlxglr2xzmdqxl5bwh899whfx1prcgjai7qhhs5ys5dspy5")))) + "006y6mlxglr2xzmdqxl5bwh899whfx1prcgjai7qhhs5ys5dspy5")) + (modules '((guix build utils))) + (snippet + #~(begin + ;; Submodules with their own go.mod files and packed as + ;; separated packages: + ;; + ;; - github.com/prometheus/common/assets + ;; - github.com/prometheus/common/sigv4 + (for-each delete-file-recursively + (list "assets" "sigv4")))))) (build-system go-build-system) (arguments '(#:import-path "github.com/prometheus/common" -- cgit v1.2.3 From 27a387a1522ce35a4f863982c9dfa369f84fff43 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 24 Jul 2024 21:17:36 +0100 Subject: gnu: go-github-com-prometheus-common: Update to 0.55.0. * gnu/packages/golang.scm (go-github-com-prometheus-common): Update to 0.55.0. [propagated-inputs]: Remove go-github-com-golang-protobuf and go-github-com-matttproud-golang-protobuf-extensions-v2; add go-github-com-alecthomas-kingpin-v2, go-github-com-go-kit-log, go-github-com-google-go-cmp, go-github-com-julienschmidt-httprouter, go-github-com-munnerz-goautoneg, go-github-com-mwitkow-go-conntrack, go-golang-org-x-net, go-golang-org-x-oauth2, go-google-golang-org-protobuf, and go-gopkg-in-yaml-v2. [native-inputs]: Add go-github-com-stretchr-testify. Change-Id: Ia4550bffb8f49a764e058e4f98a91d9e7dc96021 --- gnu/packages/golang.scm | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 518bda7299..d60ae45722 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7352,7 +7352,7 @@ (define-public go-github-com-delthas-go-localeinfo (define-public go-github-com-prometheus-common (package (name "go-github-com-prometheus-common") - (version "0.45.0") + (version "0.55.0") (source (origin (method git-fetch) (uri (git-reference @@ -7361,7 +7361,7 @@ (define-public go-github-com-prometheus-common (file-name (git-file-name name version)) (sha256 (base32 - "006y6mlxglr2xzmdqxl5bwh899whfx1prcgjai7qhhs5ys5dspy5")) + "0bsbxil7qz8rhckhv0844nmn38g7i7347cjv5m6na47hbdpi0rqh")) (modules '((guix build utils))) (snippet #~(begin @@ -7380,10 +7380,20 @@ (define-public go-github-com-prometheus-common (modify-phases %standard-phases ;; Source-only package (delete 'build)))) + (native-inputs + (list go-github-com-stretchr-testify)) (propagated-inputs - (list go-github-com-golang-protobuf - go-github-com-matttproud-golang-protobuf-extensions-v2 - go-github-com-prometheus-client-model)) + (list go-github-com-alecthomas-kingpin-v2 + go-github-com-go-kit-log + go-github-com-google-go-cmp + go-github-com-julienschmidt-httprouter + go-github-com-munnerz-goautoneg + go-github-com-mwitkow-go-conntrack + go-github-com-prometheus-client-model + go-golang-org-x-net + go-golang-org-x-oauth2 + go-google-golang-org-protobuf + go-gopkg-in-yaml-v2)) (synopsis "Prometheus metrics") (description "This package provides tools for reading and writing Prometheus metrics.") -- cgit v1.2.3 From 9d637f7fdbfa5910fd176cac01a4491fd833f480 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 24 Jul 2024 21:29:01 +0100 Subject: gnu: go-github-com-prometheus-common: Enable tests. * gnu/packages/golang.scm (go-github-com-prometheus-common): Enable the most of the tests. [arguments]: <#:phases>: Use custom 'check phase. Change-Id: I4190be63393cbba4d2e132bab21d40625a022141 --- gnu/packages/golang.scm | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index d60ae45722..57b15435df 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7374,12 +7374,26 @@ (define-public go-github-com-prometheus-common (list "assets" "sigv4")))))) (build-system go-build-system) (arguments - '(#:import-path "github.com/prometheus/common" - #:tests? #f - #:phases - (modify-phases %standard-phases - ;; Source-only package - (delete 'build)))) + (list + #:import-path "github.com/prometheus/common" + #:phases + #~(modify-phases %standard-phases + ;; XXX: Workaround for go-build-system's lack of Go modules support. + (delete 'build) + (replace 'check + (lambda* (#:key tests? import-path #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" + ;; "./config/..." requries + ;; , + ;; which introduce cycle. + "./expfmt/..." + "./helpers/..." + "./model/..." + "./promlog/..." + "./route/..." + "./server/...")))))))) (native-inputs (list go-github-com-stretchr-testify)) (propagated-inputs -- cgit v1.2.3 From 392b0f2dd53caf3f35cdacd6f3ce8e6541954c95 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 24 Jul 2024 21:41:54 +0100 Subject: gnu: go-github-com-prometheus-common: Move to prometheus. * gnu/packages/golang.scm (go-github-com-prometheus-common): Move from here ... * gnu/packages/prometheus.scm: ... to here. Change-Id: I344f9b5b62569b3a0fde6ed96621f409bb7350a9 --- gnu/packages/golang.scm | 65 ------------------------------------------- gnu/packages/prometheus.scm | 68 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 65 deletions(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 57b15435df..3c19f5abb1 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7349,71 +7349,6 @@ (define-public go-github-com-delthas-go-localeinfo formatting information, rather than the current locale name.") (license license:expat)))) -(define-public go-github-com-prometheus-common - (package - (name "go-github-com-prometheus-common") - (version "0.55.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/prometheus/common") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0bsbxil7qz8rhckhv0844nmn38g7i7347cjv5m6na47hbdpi0rqh")) - (modules '((guix build utils))) - (snippet - #~(begin - ;; Submodules with their own go.mod files and packed as - ;; separated packages: - ;; - ;; - github.com/prometheus/common/assets - ;; - github.com/prometheus/common/sigv4 - (for-each delete-file-recursively - (list "assets" "sigv4")))))) - (build-system go-build-system) - (arguments - (list - #:import-path "github.com/prometheus/common" - #:phases - #~(modify-phases %standard-phases - ;; XXX: Workaround for go-build-system's lack of Go modules support. - (delete 'build) - (replace 'check - (lambda* (#:key tests? import-path #:allow-other-keys) - (when tests? - (with-directory-excursion (string-append "src/" import-path) - (invoke "go" "test" "-v" - ;; "./config/..." requries - ;; , - ;; which introduce cycle. - "./expfmt/..." - "./helpers/..." - "./model/..." - "./promlog/..." - "./route/..." - "./server/...")))))))) - (native-inputs - (list go-github-com-stretchr-testify)) - (propagated-inputs - (list go-github-com-alecthomas-kingpin-v2 - go-github-com-go-kit-log - go-github-com-google-go-cmp - go-github-com-julienschmidt-httprouter - go-github-com-munnerz-goautoneg - go-github-com-mwitkow-go-conntrack - go-github-com-prometheus-client-model - go-golang-org-x-net - go-golang-org-x-oauth2 - go-google-golang-org-protobuf - go-gopkg-in-yaml-v2)) - (synopsis "Prometheus metrics") - (description "This package provides tools for reading and writing -Prometheus metrics.") - (home-page "https://github.com/prometheus/common") - (license license:asl2.0))) - (define-public go-github-com-prometheus-procfs (package (name "go-github-com-prometheus-procfs") diff --git a/gnu/packages/prometheus.scm b/gnu/packages/prometheus.scm index 997cf4e503..843d5fa604 100644 --- a/gnu/packages/prometheus.scm +++ b/gnu/packages/prometheus.scm @@ -1,5 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2018, 2019, 2020 Leo Famulari +;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2024 Jesse Eisses ;;; ;;; This file is part of GNU Guix. @@ -115,6 +117,72 @@ (define-public go-github-com-prometheus-client-model "This package provides data model artifacts for Prometheus.") (license license:asl2.0))) +(define-public go-github-com-prometheus-common + (package + (name "go-github-com-prometheus-common") + (version "0.55.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/prometheus/common") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0bsbxil7qz8rhckhv0844nmn38g7i7347cjv5m6na47hbdpi0rqh")) + (modules '((guix build utils))) + (snippet + #~(begin + ;; Submodules with their own go.mod files and packed as + ;; separated packages: + ;; + ;; - github.com/prometheus/common/assets + ;; - github.com/prometheus/common/sigv4 + (for-each delete-file-recursively + (list "assets" "sigv4")))))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/prometheus/common" + #:phases + #~(modify-phases %standard-phases + ;; XXX: Workaround for go-build-system's lack of Go modules support. + (delete 'build) + (replace 'check + (lambda* (#:key tests? import-path #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" + ;; "./config/..." requries + ;; , + ;; which introduce cycle. + "./expfmt/..." + "./helpers/..." + "./model/..." + "./promlog/..." + "./route/..." + "./server/...")))))))) + (native-inputs + (list go-github-com-stretchr-testify)) + (propagated-inputs + (list go-github-com-alecthomas-kingpin-v2 + go-github-com-go-kit-log + go-github-com-google-go-cmp + go-github-com-julienschmidt-httprouter + go-github-com-munnerz-goautoneg + go-github-com-mwitkow-go-conntrack + go-github-com-prometheus-client-model + go-golang-org-x-net + go-golang-org-x-oauth2 + go-google-golang-org-protobuf + go-gopkg-in-yaml-v2)) + (home-page "https://github.com/prometheus/common") + (synopsis "Prometheus metrics") + (description + "This package provides tools for reading and writing Prometheus +metrics.") + (license license:asl2.0))) + ;;; ;;; Executables: ;;; -- cgit v1.2.3 From da5d887f6fd9240f504f02bb42c10183b4d85ab2 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 25 Jul 2024 12:42:53 +0100 Subject: gnu: go-github-com-oneofone-xxhash: Move to golang-crypto. * gnu/packages/golang.scm (go-github-com-oneofone-xxhash): Move from here ... * gnu/packages/golang-crypto.scm: ... to here. Change-Id: I3cd79794512c92819771d1a639864c8218c1bdbc --- gnu/packages/golang-crypto.scm | 32 ++++++++++++++++++++++++++++++++ gnu/packages/golang.scm | 30 ------------------------------ 2 files changed, 32 insertions(+), 30 deletions(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm index 3fbeac703b..e89c486bcc 100644 --- a/gnu/packages/golang-crypto.scm +++ b/gnu/packages/golang-crypto.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020, 2022 Efraim Flashner ;;; Copyright © 2021 Arun Isaac +;;; Copyright © 2021 BonfaceKilz ;;; Copyright © 2021 Collin J. Doering ;;; Copyright © 2021 LibreMiami ;;; Copyright © 2021 Raghav Gururajan @@ -1068,6 +1069,37 @@ (define-public go-github-com-multiformats-go-multihash (description "Multihash implementation in Go.") (license license:expat))) +(define-public go-github-com-oneofone-xxhash + (package + (name "go-github-com-oneofone-xxhash") + (version "1.2.8") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/OneOfOne/xxhash") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0f98qk83l2fhpclvrgyxsa9b8m4pipf11fah85bnjl01wy4lvybw")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/OneOfOne/xxhash" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'remove-benchmarks + (lambda* (#:key import-path #:allow-other-keys) + (delete-file-recursively + (string-append "src/" import-path "/benchmarks"))))))) + (home-page "https://github.com/OneOfOne/xxhash") + (synopsis "Go implementation of xxHash") + (description + "This is a native Go implementation of the +@url{https://github.com/Cyan4973/xxHash, xxHash} algorithm, an extremely fast +non-cryptographic hash algorithm, working at speeds close to RAM limits.") + (license license:asl2.0))) + (define-public go-github-com-operatorfoundation-ed25519 (let ((commit "b22b4bd3ddef042eec45f3ee135cd40281fde2b4") (revision "0")) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 3c19f5abb1..2c5f496b2e 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -8013,36 +8013,6 @@ (define-public go-github-com-dustin-go-humanize back.") (license license:expat))) -(define-public go-github-com-oneofone-xxhash - (package - (name "go-github-com-oneofone-xxhash") - (version "1.2.8") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/OneOfOne/xxhash") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0f98qk83l2fhpclvrgyxsa9b8m4pipf11fah85bnjl01wy4lvybw")))) - (build-system go-build-system) - (arguments - (list - #:import-path "github.com/OneOfOne/xxhash" - #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'remove-benchmarks - (lambda* (#:key import-path #:allow-other-keys) - (delete-file-recursively - (string-append "src/" import-path "/benchmarks"))))))) - (home-page "https://github.com/OneOfOne/xxhash") - (synopsis "Go implementation of xxHash") - (description "This is a native Go implementation of the -@url{https://github.com/Cyan4973/xxHash, xxHash} algorithm, an extremely fast -non-cryptographic hash algorithm, working at speeds close to RAM limits.") - (license license:asl2.0))) - (define-public go-gopkg-in-djherbis-times-v1 (package (name "go-gopkg-in-djherbis-times-v1") -- cgit v1.2.3 From 818a854b3b42334b5172c60c5340f7be29abdb9d Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 24 Jul 2024 23:13:28 +0100 Subject: gnu: go-github-com-prometheus-client-golang: Update to 1.19.1. * gnu/packages/golang.scm (go-github-com-prometheus-client-golang): Update to 1.19.1. [propagated-inputs]: Remove go-github-com-beorn7-perks-quantile, go-github-com-cespare-xxhash; add go-github-com-beorn7-perks, go-github-com-cespare-xxhash-v2, go-github-com-davecgh-go-spew, go-github-com-json-iterator-go, and go-golang-org-x-sys. Change-Id: I037e8a05ab572c91153badd8673ed6772474010c --- gnu/packages/golang.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 2c5f496b2e..34585a68c5 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7378,7 +7378,7 @@ (define-public go-github-com-prometheus-procfs (define-public go-github-com-prometheus-client-golang (package (name "go-github-com-prometheus-client-golang") - (version "1.17.0") + (version "1.19.1") (source (origin (method git-fetch) (uri (git-reference @@ -7387,7 +7387,7 @@ (define-public go-github-com-prometheus-client-golang (file-name (git-file-name name version)) (sha256 (base32 - "1v8vdvi9wlpf18nxi62diysfnh9gc3c3cqq6hvx378snsvvl6n82")))) + "0mx5q221pbkx081ycf1lp8sxz513220ya8qczkkvab943cwlcarv")))) (build-system go-build-system) (arguments '(#:tests? #f @@ -7397,12 +7397,15 @@ (define-public go-github-com-prometheus-client-golang ;; Source-only package (delete 'build)))) (propagated-inputs - (list go-github-com-beorn7-perks-quantile - go-github-com-golang-protobuf + (list go-github-com-beorn7-perks + go-github-com-cespare-xxhash-v2 + go-github-com-davecgh-go-spew + go-github-com-json-iterator-go go-github-com-prometheus-client-model go-github-com-prometheus-common go-github-com-prometheus-procfs - go-github-com-cespare-xxhash)) + go-golang-org-x-sys + go-google-golang-org-protobuf)) (synopsis "HTTP server and client tools for Prometheus") (description "This package @code{promhttp} provides HTTP client and server tools for Prometheus metrics.") -- cgit v1.2.3 From 10b868c0a7d5fdb9edc68b0d56b64723e664af14 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 25 Jul 2024 07:41:56 +0100 Subject: gnu: go-github-com-prometheus-client-golang: Enable tests. * gnu/packages/golang.scm (go-github-com-prometheus-client-golang): Enable tests. [arguments]: <#:phases>: Add 'remove-examples-and-tutorials and use custom 'check phase. Change-Id: I70de72754188b558b730b92d7561d88690b02f7c --- gnu/packages/golang.scm | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 34585a68c5..56e6c6a627 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7390,12 +7390,24 @@ (define-public go-github-com-prometheus-client-golang "0mx5q221pbkx081ycf1lp8sxz513220ya8qczkkvab943cwlcarv")))) (build-system go-build-system) (arguments - '(#:tests? #f - #:import-path "github.com/prometheus/client_golang" - #:phases - (modify-phases %standard-phases - ;; Source-only package - (delete 'build)))) + (list + #:import-path "github.com/prometheus/client_golang" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'remove-examples-and-tutorials + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (for-each delete-file-recursively + (list "api/prometheus/v1/example_test.go" + "examples" + "tutorial"))))) + ;; XXX: Workaround for go-build-system's lack of Go modules support. + (delete 'build) + (replace 'check + (lambda* (#:key tests? import-path #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" "./...")))))))) (propagated-inputs (list go-github-com-beorn7-perks go-github-com-cespare-xxhash-v2 -- cgit v1.2.3 From 7053ef0aaebcf1bc7a4205baccea973807ddae6f Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 25 Jul 2024 10:24:15 +0100 Subject: gnu: go-github-com-prometheus-client-golang: Move to prometheus. * gnu/packages/golang.scm (go-github-com-prometheus-client-golang): Move from here ... * gnu/packages/prometheus.scm: ... to here. * gnu/packages/backup.scm: Add (gnu packages prometheus) module. * gnu/packages/golang-xyz.scm: Likewise. * gnu/packages/ipfs.scm: Likewise. * gnu/packages/irc.scm: Likewise. * gnu/packages/web.scm: Likewise. Change-Id: If3d78d31b1491f8a95616e59f50371c2914242d9 --- gnu/packages/backup.scm | 1 + gnu/packages/golang-xyz.scm | 1 + gnu/packages/golang.scm | 49 ------------------------------------------- gnu/packages/ipfs.scm | 1 + gnu/packages/irc.scm | 1 + gnu/packages/prometheus.scm | 51 +++++++++++++++++++++++++++++++++++++++++++++ gnu/packages/web.scm | 1 + 7 files changed, 56 insertions(+), 49 deletions(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index c5bee744dd..1d484b3f51 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -88,6 +88,7 @@ (define-module (gnu packages backup) #:use-module (gnu packages pcre) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages prometheus) #:use-module (gnu packages protobuf) #:use-module (gnu packages python) #:use-module (gnu packages python-build) diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index 8324a2f568..7d6b3a1c1d 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -72,6 +72,7 @@ (define-module (gnu packages golang-xyz) #:use-module (gnu packages golang-maths) #:use-module (gnu packages golang-web) #:use-module (gnu packages linux) + #:use-module (gnu packages prometheus) ; for go-github-com-nbrownus-go-metrics-prometheus #:use-module (gnu packages specifications)) ;;; Commentary: diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 56e6c6a627..ab00edc877 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7375,55 +7375,6 @@ (define-public go-github-com-prometheus-procfs (home-page "https://github.com/prometheus/procfs") (license license:asl2.0))) -(define-public go-github-com-prometheus-client-golang - (package - (name "go-github-com-prometheus-client-golang") - (version "1.19.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/prometheus/client_golang") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0mx5q221pbkx081ycf1lp8sxz513220ya8qczkkvab943cwlcarv")))) - (build-system go-build-system) - (arguments - (list - #:import-path "github.com/prometheus/client_golang" - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'remove-examples-and-tutorials - (lambda* (#:key import-path #:allow-other-keys) - (with-directory-excursion (string-append "src/" import-path) - (for-each delete-file-recursively - (list "api/prometheus/v1/example_test.go" - "examples" - "tutorial"))))) - ;; XXX: Workaround for go-build-system's lack of Go modules support. - (delete 'build) - (replace 'check - (lambda* (#:key tests? import-path #:allow-other-keys) - (when tests? - (with-directory-excursion (string-append "src/" import-path) - (invoke "go" "test" "-v" "./...")))))))) - (propagated-inputs - (list go-github-com-beorn7-perks - go-github-com-cespare-xxhash-v2 - go-github-com-davecgh-go-spew - go-github-com-json-iterator-go - go-github-com-prometheus-client-model - go-github-com-prometheus-common - go-github-com-prometheus-procfs - go-golang-org-x-sys - go-google-golang-org-protobuf)) - (synopsis "HTTP server and client tools for Prometheus") - (description "This package @code{promhttp} provides HTTP client and -server tools for Prometheus metrics.") - (home-page "https://github.com/prometheus/client_golang") - (license license:asl2.0))) - (define-public go-github-com-zalando-go-keyring (package (name "go-github-com-zalando-go-keyring") diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm index ea3514afa9..ccf5728e4f 100644 --- a/gnu/packages/ipfs.scm +++ b/gnu/packages/ipfs.scm @@ -37,6 +37,7 @@ (define-module (gnu packages ipfs) #:use-module (gnu packages golang-crypto) #:use-module (gnu packages golang-web) #:use-module (gnu packages golang-xyz) + #:use-module (gnu packages prometheus) #:use-module (gnu packages python) #:use-module (gnu packages shells) #:use-module (gnu packages specifications)) diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index aa4c9b8b53..e1cccb6d1f 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -90,6 +90,7 @@ (define-module (gnu packages irc) #:use-module (gnu packages pcre) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages prometheus) #:use-module (gnu packages python) #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-xyz) diff --git a/gnu/packages/prometheus.scm b/gnu/packages/prometheus.scm index 5ec4fe0b12..860bb74017 100644 --- a/gnu/packages/prometheus.scm +++ b/gnu/packages/prometheus.scm @@ -29,6 +29,7 @@ (define-module (gnu packages prometheus) #: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) #:use-module (gnu packages golang-xyz)) @@ -87,6 +88,56 @@ (define-public go-github-com-mwitkow-go-conntrack (@@code{net.Listener}) and outbound (@@code{net.Dialer}).") (license license:asl2.0))) +(define-public go-github-com-prometheus-client-golang + (package + (name "go-github-com-prometheus-client-golang") + (version "1.19.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/prometheus/client_golang") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0mx5q221pbkx081ycf1lp8sxz513220ya8qczkkvab943cwlcarv")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/prometheus/client_golang" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'remove-examples-and-tutorials + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (for-each delete-file-recursively + (list "api/prometheus/v1/example_test.go" + "examples" + "tutorial"))))) + ;; XXX: Workaround for go-build-system's lack of Go modules support. + (delete 'build) + (replace 'check + (lambda* (#:key tests? import-path #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" "./...")))))))) + (propagated-inputs + (list go-github-com-beorn7-perks + go-github-com-cespare-xxhash-v2 + go-github-com-davecgh-go-spew + go-github-com-json-iterator-go + go-github-com-prometheus-client-model + go-github-com-prometheus-common + go-github-com-prometheus-procfs + go-golang-org-x-sys + go-google-golang-org-protobuf)) + (home-page "https://github.com/prometheus/client_golang") + (synopsis "HTTP server and client tools for Prometheus") + (description + "This package @code{promhttp} provides HTTP client and server tools for +Prometheus metrics.") + (license license:asl2.0))) + (define-public go-github-com-prometheus-client-model (package (name "go-github-com-prometheus-client-model") diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index eb6699c3a1..2be0cae94e 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -186,6 +186,7 @@ (define-module (gnu packages web) #:use-module (gnu packages perl) #:use-module (gnu packages perl-check) #:use-module (gnu packages perl-compression) + #:use-module (gnu packages prometheus) #:use-module (gnu packages python) #:use-module (gnu packages python-build) #:use-module (gnu packages python-check) -- cgit v1.2.3 From 0e823e011ea0314069208dce78e89438dfde9118 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 25 Jul 2024 11:01:25 +0100 Subject: gnu: go-github-com-prometheus-procfs: Update to 0.15.1. * gnu/packages/golang.scm (go-github-com-prometheus-procfs): Update to 0.15.1. [propagated-inputs]: Add go-github-com-google-go-cmp and go-golang-org-x-sys. Change-Id: I571e93b72c6d544d47199867c70fe6386df2015d --- gnu/packages/golang.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index ab00edc877..a81c4f8d02 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7352,7 +7352,7 @@ (define-public go-github-com-delthas-go-localeinfo (define-public go-github-com-prometheus-procfs (package (name "go-github-com-prometheus-procfs") - (version "0.0.4") + (version "0.15.1") (source (origin (method git-fetch) (uri (git-reference @@ -7361,14 +7361,17 @@ (define-public go-github-com-prometheus-procfs (file-name (git-file-name name version)) (sha256 (base32 - "1z5jq5rjala0a0di4nwk1rai0z9f73qwqj6mgcbpjbg2qknlb544")))) + "116ns8k1yjdj9a2vq5czlpmafrhy0yw5y0bcm1qqbqnn57agg68m")))) (build-system go-build-system) (arguments '(#:import-path "github.com/prometheus/procfs" ;; The tests require Go modules, which are not yet supported in Guix's ;; Go build system. #:tests? #f)) - (propagated-inputs (list go-golang-org-x-sync)) + (propagated-inputs + (list go-github-com-google-go-cmp + go-golang-org-x-sync + go-golang-org-x-sys)) (synopsis "Go library for reading @file{/proc}") (description "The @code{procfs} Go package provides functions to retrieve system, kernel, and process metrics from the @file{/proc} pseudo file system.") -- cgit v1.2.3 From 0b898c594c0eb8e7621e6412ddf6d93af20848e6 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 25 Jul 2024 11:22:07 +0100 Subject: gnu: go-github-com-prometheus-procfs: Move to prometheus. * gnu/packages/golang.scm (go-github-com-prometheus-procfs): Move from here ... * gnu/packages/prometheus.scm: ... to here. Remove (gnu packages golang) module. * gnu/packages/golang.scm: Remove (gnu packages prometheus) module. * gnu/packages/prometheus.scm: Remove (gnu packages golang) module. Change-Id: I3dd26ebc80c0a9fad47cec9887d6f52ad21bdc45 --- gnu/packages/golang.scm | 30 ------------------------------ gnu/packages/prometheus.scm | 35 ++++++++++++++++++++++++++++++++++- 2 files changed, 34 insertions(+), 31 deletions(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index a81c4f8d02..3acc5588a5 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -96,7 +96,6 @@ (define-module (gnu packages golang) #:use-module (gnu packages pcre) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) - #:use-module (gnu packages prometheus) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages ruby) #:use-module (gnu packages terminals) @@ -7349,35 +7348,6 @@ (define-public go-github-com-delthas-go-localeinfo formatting information, rather than the current locale name.") (license license:expat)))) -(define-public go-github-com-prometheus-procfs - (package - (name "go-github-com-prometheus-procfs") - (version "0.15.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/prometheus/procfs") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "116ns8k1yjdj9a2vq5czlpmafrhy0yw5y0bcm1qqbqnn57agg68m")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/prometheus/procfs" - ;; The tests require Go modules, which are not yet supported in Guix's - ;; Go build system. - #:tests? #f)) - (propagated-inputs - (list go-github-com-google-go-cmp - go-golang-org-x-sync - go-golang-org-x-sys)) - (synopsis "Go library for reading @file{/proc}") - (description "The @code{procfs} Go package provides functions to retrieve -system, kernel, and process metrics from the @file{/proc} pseudo file system.") - (home-page "https://github.com/prometheus/procfs") - (license license:asl2.0))) - (define-public go-github-com-zalando-go-keyring (package (name "go-github-com-zalando-go-keyring") diff --git a/gnu/packages/prometheus.scm b/gnu/packages/prometheus.scm index c61d107234..5ed3acaeb3 100644 --- a/gnu/packages/prometheus.scm +++ b/gnu/packages/prometheus.scm @@ -1,10 +1,13 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Pierre Neidhardt +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2019, 2020 Leo Famulari +;;; Copyright © 2020 Efraim Flashner ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2024 Dominic Martinez ;;; Copyright © 2024 Jesse Eisses ;;; Copyright © 2024 Sharlatan Hellseher +;;; Copyright © 2024 Troy Figiel ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,7 +31,6 @@ (define-module (gnu packages prometheus) #:use-module (guix git-download) #:use-module (guix packages) #: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) @@ -331,6 +333,37 @@ (define-public go-github-com-prometheus-common-sigv4 from the default AWS credential chain.") (license license:asl2.0))) +(define-public go-github-com-prometheus-procfs + (package + (name "go-github-com-prometheus-procfs") + (version "0.15.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/prometheus/procfs") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "116ns8k1yjdj9a2vq5czlpmafrhy0yw5y0bcm1qqbqnn57agg68m")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/prometheus/procfs" + ;; The tests require Go modules, which are not yet supported in Guix's + ;; Go build system. + #:tests? #f)) + (propagated-inputs + (list go-github-com-google-go-cmp + go-golang-org-x-sync + go-golang-org-x-sys)) + (synopsis "Go library for reading @file{/proc}") + (home-page "https://github.com/prometheus/procfs") + (description + "The @code{procfs} Go package provides functions to retrieve system, +kernel, and process metrics from the @file{/proc} pseudo file system.") + (license license:asl2.0))) + ;;; ;;; Executables: ;;; -- cgit v1.2.3 From 3fbccedb863fa14abfdb971fdbd63b78f4ef52ef Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 25 Jul 2024 22:25:58 +0100 Subject: gnu: go-github-com-bits-and-blooms-bloom: Update to 3.7.0. * gnu/packages/golang.scm (go-github-com-bits-and-blooms-bloom): Update to 3.7.0. Change-Id: I7f147536c7fb075711fb50a6836554675e02a224 --- gnu/packages/golang.scm | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 3acc5588a5..c4a92d7b35 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -6191,7 +6191,7 @@ (define-public go-github-com-bits-and-blooms-bitset (define-public go-github-com-bits-and-blooms-bloom (package (name "go-github-com-bits-and-blooms-bloom") - (version "3.6.0") + (version "3.7.0") (source (origin (method git-fetch) (uri (git-reference @@ -6200,20 +6200,10 @@ (define-public go-github-com-bits-and-blooms-bloom (file-name (git-file-name name version)) (sha256 (base32 - "02rpjlgl7k3755qnlsk519xazgqlk73b8wvkpqlvccywms5w77bq")))) + "022pyzjp862ysl30aj105i2xmapn400ambjh8h1dcyjy9c0f8agn")))) (build-system go-build-system) (arguments - '(#:import-path "github.com/bits-and-blooms/bloom" - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-import-path - (lambda _ - ;; See 'go.mod' in the source distribution of Syncthing 1.5.0 for - ;; more information. - ;; - (substitute* "src/github.com/bits-and-blooms/bloom/bloom.go" - (("spaolacci") "twmb")) - #t))))) + (list #:import-path "github.com/bits-and-blooms/bloom")) (propagated-inputs (list go-github-com-twmb-murmur3 go-github-com-bits-and-blooms-bitset)) (synopsis "Bloom filters in Go") -- cgit v1.2.3 From 39fab0cf8c48cf0804d87a5d72bd80426b80eaf7 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 25 Jul 2024 22:28:08 +0100 Subject: gnu: go-github-com-bits-and-blooms-bloom: Rename variable. * gnu/packages/golang.scm (go-github-com-bits-and-blooms-bloom): Rename variable to go-github-com-bits-and-blooms-bloom-v3 to reflect go.mod import path. * gnu/packages/networking.scm (yggdrasil) [propagated-inputs]: Remove go-github-com-bits-and-blooms-bloom; add go-github-com-bits-and-blooms-bloom-v3. Change-Id: Idc568d5e7357da4ce74d53ac575421f32260f766 --- gnu/packages/golang.scm | 4 ++-- gnu/packages/networking.scm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index c4a92d7b35..82575caa94 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -6188,9 +6188,9 @@ (define-public go-github-com-bits-and-blooms-bitset (home-page "https://github.com/bits-and-blooms/bitset") (license license:bsd-3))) -(define-public go-github-com-bits-and-blooms-bloom +(define-public go-github-com-bits-and-blooms-bloom-v3 (package - (name "go-github-com-bits-and-blooms-bloom") + (name "go-github-com-bits-and-blooms-bloom-v3") (version "3.7.0") (source (origin (method git-fetch) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 3791b7f997..2e252efeb1 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -4666,7 +4666,7 @@ (define-public yggdrasil go-github-com-vishvananda-netns go-github-com-vishvananda-netlink go-github-com-bits-and-blooms-bitset - go-github-com-bits-and-blooms-bloom + go-github-com-bits-and-blooms-bloom-v3 go-github-com-quic-go-quic-go go-github-com-hjson-hjson-go-v4 go-github-com-olekukonko-tablewriter -- cgit v1.2.3 From 7a6f5b05028af5a2796bcf3205d5ac63ddeb2c0e Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 25 Jul 2024 22:36:06 +0100 Subject: gnu: go-github-com-arceliar-ironwood: Enable tests. * gnu/packages/golang.scm (go-github-com-arceliar-ironwood): Enable most of the tests. [arguments]: <#:phases>: Add 'remove-examples and use custom 'check phase. [propagated-inputs]: Add go-github-com-bits-and-blooms-bitset and go-github-com-bits-and-blooms-bloom-v3. Change-Id: I3319e291927e8aa53ce90d00d2cbf6a9df684568 --- gnu/packages/golang.scm | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 82575caa94..11d806c3de 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -8176,14 +8176,26 @@ (define-public go-github-com-arceliar-ironwood "06ay82gqm3k649m7x0r3a3crnqv9x0yxhyqfabrf1b7inki35mfs")))) (build-system go-build-system) (arguments - (list #:import-path "github.com/Arceliar/ironwood" - #:tests? #f - #:phases - #~(modify-phases %standard-phases - ;; Source-only package - (delete 'build)))) + (list + #:import-path "github.com/Arceliar/ironwood" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'remove-examples + (lambda* (#:key import-path #:allow-other-keys) + (delete-file-recursively + (string-append "src/" import-path "/cmd/ironwood-example")))) + ;; XXX: Replace when go-build-system supports nested path. + (delete 'build) + (replace 'check + (lambda* (#:key import-path tests? #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" "./...")))))))) (propagated-inputs - (list go-golang-org-x-crypto go-github-com-arceliar-phony)) + (list go-github-com-arceliar-phony + go-github-com-bits-and-blooms-bitset + go-github-com-bits-and-blooms-bloom-v3 + go-golang-org-x-crypto)) (home-page "https://github.com/Arceliar/ironwood") (synopsis "Experimental network routing library") (description -- cgit v1.2.3 From 11622b137bd02651d6b1210d0e845758bdc8e6b8 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 26 Jul 2024 13:32:13 +0100 Subject: gnu: go-gopkg-in-ini-v1: Update to 1.67.0. * gnu/packages/golang.scm (go-gopkg-in-ini-v1): Update to 1.67.0. Change-Id: I8a1aa5b67c07aaf8650027e83b8d091755fd9c58 --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 11d806c3de..6d6d96743f 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -4040,7 +4040,7 @@ (define-public go-github-com-gorhill-cronexpr (define-public go-gopkg-in-ini-v1 (package (name "go-gopkg-in-ini-v1") - (version "1.56.0") + (version "1.67.0") (source (origin (method git-fetch) @@ -4050,7 +4050,7 @@ (define-public go-gopkg-in-ini-v1 (file-name (git-file-name name version)) (sha256 (base32 - "0j5z0cngg6mq2f9id083jcdi7k6r2h35714pashv6sdv2q7bmfc5")))) + "1vpzkjmrwp7bqqsijp61293kk2vn6lcck56j8m5y6ks6cf21lpap")))) (build-system go-build-system) (arguments '(#:import-path "gopkg.in/ini.v1" -- cgit v1.2.3 From 93952ffbb7815eb270d47db6b87bbcc3a4a7e4ce Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 26 Jul 2024 13:32:48 +0100 Subject: gnu: go-gopkg-in-ini-v1: Enable tests. * gnu/packages/golang.scm (go-gopkg-in-ini-v1): Enable tests. [native-inputs]: Add go-github-com-stretchr-testify. Change-Id: I30cd79fe6406e3bbc380c823c7b5b7a39ec2bb58 --- gnu/packages/golang.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 6d6d96743f..fb8f488482 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -4049,13 +4049,13 @@ (define-public go-gopkg-in-ini-v1 (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "1vpzkjmrwp7bqqsijp61293kk2vn6lcck56j8m5y6ks6cf21lpap")))) + (base32 "1vpzkjmrwp7bqqsijp61293kk2vn6lcck56j8m5y6ks6cf21lpap")))) (build-system go-build-system) (arguments - '(#:import-path "gopkg.in/ini.v1" - ;; Requires large unpackaged test framework - #:tests? #f)) + (list + #:import-path "gopkg.in/ini.v1")) + (native-inputs + (list go-github-com-stretchr-testify)) (home-page "https://gopkg.in/ini.v1") (synopsis "Go library for ini files") (description "Go library for ini files") -- cgit v1.2.3 From bb611d3213c3d86c675b08fe26ecb6f918746f35 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 26 Jul 2024 13:37:13 +0100 Subject: gnu: go-gopkg-in-ini-v1: Move to golang-xyz. * gnu/packages/golang.scm (go-gopkg-in-ini-v1): Move from here ... * gnu/packages/golang-xyz.scm: ... to here. Change-Id: Ie75a3d46253e28ba886db80f9c56407efa7c4675 --- gnu/packages/golang-xyz.scm | 27 ++++++++++++++++++++++++++- gnu/packages/golang.scm | 24 ------------------------ 2 files changed, 26 insertions(+), 25 deletions(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index ea41dddbcc..00c89761e3 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2019-2022 Efraim Flashner ;;; Copyright © 2020 Alex Griffin ;;; Copyright © 2020 Danny Milosavljevic +;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2020 Joseph LaFreniere ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020, 2021 raingloom @@ -35,8 +36,8 @@ ;;; Copyright © 2024 Artyom V. Poptsov ;;; Copyright © 2024 Herman Rimm ;;; Copyright © 2024 Jesse Eisses -;;; Copyright © 2024 Troy Figiel ;;; Copyright © 2024 Luis Higino +;;; Copyright © 2024 Troy Figiel ;;; ;;; This file is part of GNU Guix. ;;; @@ -5344,6 +5345,30 @@ (define-public go-gopkg-in-alecthomas-kingpin-v2 (list #:import-path "gopkg.in/alecthomas/kingpin.v2")))) +(define-public go-gopkg-in-ini-v1 + (package + (name "go-gopkg-in-ini-v1") + (version "1.67.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/go-ini/ini") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1vpzkjmrwp7bqqsijp61293kk2vn6lcck56j8m5y6ks6cf21lpap")))) + (build-system go-build-system) + (arguments + (list + #:import-path "gopkg.in/ini.v1")) + (native-inputs + (list go-github-com-stretchr-testify)) + (home-page "https://gopkg.in/ini.v1") + (synopsis "Go library for ini files") + (description "Go library for ini files") + (license license:asl2.0))) + (define-public go-gopkg-in-natefinch-lumberjack.v2 (package (name "go-gopkg-in-natefinch-lumberjack.v2") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index fb8f488482..acb607e0dd 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -4037,30 +4037,6 @@ (define-public go-github-com-gorhill-cronexpr (license (list license:gpl3+ license:asl2.0))))) -(define-public go-gopkg-in-ini-v1 - (package - (name "go-gopkg-in-ini-v1") - (version "1.67.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/go-ini/ini") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1vpzkjmrwp7bqqsijp61293kk2vn6lcck56j8m5y6ks6cf21lpap")))) - (build-system go-build-system) - (arguments - (list - #:import-path "gopkg.in/ini.v1")) - (native-inputs - (list go-github-com-stretchr-testify)) - (home-page "https://gopkg.in/ini.v1") - (synopsis "Go library for ini files") - (description "Go library for ini files") - (license license:asl2.0))) - (define-public go-gopkg-in-yaml-v3 (package (name "go-gopkg-in-yaml-v3") -- cgit v1.2.3 From 460340ecfaddbc89db855d0e578179751caac2d6 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 26 Jul 2024 13:55:14 +0100 Subject: gnu: aws-vault: Update to 7.2.0. * gnu/packages/golang.scm (aws-vault): Update to 7.2.0. [native-inputs]: Remove go-github-com-99designs-go-keyring, go-github-com-mtibben-androiddnsfix, go-github-com-mtibben-percent, go-github-com-jmespath-go-jmespath, go-github-com-dvsekhvalnov-jose2go, go-github-com-godbus-dbus, go-github-com-gsterjov-go-libsecret, go-github-com-mitchellh-go-homedir, go-golang-org-x-crypto, go-golang-org-x-sys, go-gopkg-in-ini, go-github-com-alecthomas-kingpin, go-github-com-alecthomas-template, and go-github-com-alecthomas-units; add go-github-com-99designs-keyring, go-github-com-alecthomas-kingpin-v2, go-github-com-aws-aws-sdk-go-v2-credentials, go-github-com-google-go-cmp, go-github-com-mattn-go-isatty, go-github-com-mattn-go-tty, and go-gopkg-in-ini-v1. Change-Id: Id28ebb181c978cbd1195fe6b0e31c97e4339aa1f --- gnu/packages/golang.scm | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index acb607e0dd..ccb5735a46 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -8210,7 +8210,7 @@ (define-public go-github-com-mtibben-percent (define-public aws-vault (package (name "aws-vault") - (version "6.6.2") + (version "7.2.0") (source (origin (method git-fetch) (uri (git-reference @@ -8219,31 +8219,24 @@ (define-public aws-vault (file-name (git-file-name name version)) (sha256 (base32 - "0fjdslg7nhlm9hl7bg69j1izrjx6sspbhwk973d0m8ig9nkdja06")))) + "1dqg6d2k8r80ww70afghf823z0pijha1i0a0c0c6918yb322zkj2")))) (build-system go-build-system) (native-inputs - (list go-github-com-99designs-go-keyring - go-github-com-mtibben-androiddnsfix - go-github-com-mtibben-percent - go-github-com-jmespath-go-jmespath - go-github-com-dvsekhvalnov-jose2go - go-github-com-godbus-dbus - go-github-com-gsterjov-go-libsecret - go-github-com-mitchellh-go-homedir - go-golang-org-x-crypto - go-golang-org-x-sys - go-golang-org-x-term - go-gopkg-in-ini - go-github-com-skratchdot-open-golang - go-github-com-alecthomas-kingpin - go-github-com-alecthomas-template - go-github-com-alecthomas-units + (list go-github-com-99designs-keyring + go-github-com-alecthomas-kingpin-v2 go-github-com-aws-aws-sdk-go-v2 go-github-com-aws-aws-sdk-go-v2-config + go-github-com-aws-aws-sdk-go-v2-credentials go-github-com-aws-aws-sdk-go-v2-service-iam go-github-com-aws-aws-sdk-go-v2-service-sso go-github-com-aws-aws-sdk-go-v2-service-ssooidc - go-github-com-aws-aws-sdk-go-v2-service-sts)) + go-github-com-aws-aws-sdk-go-v2-service-sts + go-github-com-google-go-cmp + go-github-com-mattn-go-isatty + go-github-com-mattn-go-tty + go-github-com-skratchdot-open-golang + go-golang-org-x-term + go-gopkg-in-ini-v1)) (arguments `(#:import-path "github.com/99designs/aws-vault" #:install-source? #f -- cgit v1.2.3 From 57c40eb9042608f5c6275f45c345646a5b708cd1 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 26 Jul 2024 15:24:06 +0100 Subject: gnu: aws-vault: Improve package style. * gnu/packages/golang.scm (aws-vault): Improve package style. Fix indentation. [arguments]: Apply G-expressions. [native-inputs]: Place after [arguments]. [home-page]: Place above [synopsis]. Change-Id: I752318280483d5e501577e063ab899063eea0112 --- gnu/packages/golang.scm | 81 +++++++++++++++++++++++++------------------------ 1 file changed, 41 insertions(+), 40 deletions(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index ccb5735a46..f1cc28a295 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -8211,16 +8211,46 @@ (define-public aws-vault (package (name "aws-vault") (version "7.2.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/99designs/aws-vault") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1dqg6d2k8r80ww70afghf823z0pijha1i0a0c0c6918yb322zkj2")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/99designs/aws-vault") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1dqg6d2k8r80ww70afghf823z0pijha1i0a0c0c6918yb322zkj2")))) (build-system go-build-system) + (arguments + (list + #:install-source? #f + #:import-path "github.com/99designs/aws-vault" + #:phases + #~(modify-phases %standard-phases + (add-before 'build 'patch-version + (lambda _ + (substitute* "src/github.com/99designs/aws-vault/main.go" + (("var Version = \"dev\"") + (string-append "var Version = \"v" #$version "\""))))) + (add-after 'build 'contrib + (lambda* (#:key import-path #:allow-other-keys) + (let* ((zsh-site-dir + (string-append #$output "/share/zsh/site-functions")) + (bash-completion-dir + (string-append #$output "/share/bash-completion/completions")) + (fish-completion-dir + (string-append #$output "/share/fish/completions"))) + (for-each mkdir-p (list bash-completion-dir + fish-completion-dir + zsh-site-dir)) + (with-directory-excursion + (string-append "src/" import-path "/contrib/completions") + (copy-file "zsh/aws-vault.zsh" + (string-append zsh-site-dir "/_aws-vault")) + (copy-file "bash/aws-vault.bash" + (string-append bash-completion-dir "/aws-vault")) + (copy-file "fish/aws-vault.fish" + (string-append fish-completion-dir "/aws-vault.fish"))))))))) (native-inputs (list go-github-com-99designs-keyring go-github-com-alecthomas-kingpin-v2 @@ -8237,36 +8267,8 @@ (define-public aws-vault go-github-com-skratchdot-open-golang go-golang-org-x-term go-gopkg-in-ini-v1)) - (arguments - `(#:import-path "github.com/99designs/aws-vault" - #:install-source? #f - #:phases - (modify-phases %standard-phases - (add-before 'build 'patch-version - (lambda _ - (substitute* "src/github.com/99designs/aws-vault/main.go" - (("var Version = \"dev\"") - (string-append "var Version = \"v" ,version "\""))))) - (add-after 'build 'contrib - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (zsh-site-dir (string-append out "/share/zsh/site-functions")) - (bash-completion-dir - (string-append out "/share/bash-completion/completions")) - (fish-completion-dir - (string-append out "/share/fish/completions"))) - (for-each mkdir-p - `(,zsh-site-dir ,bash-completion-dir ,fish-completion-dir)) - (with-directory-excursion - "src/github.com/99designs/aws-vault/contrib/completions" - (copy-file "zsh/aws-vault.zsh" - (string-append zsh-site-dir "/_aws-vault")) - (copy-file "bash/aws-vault.bash" - (string-append bash-completion-dir "/aws-vault")) - (copy-file "fish/aws-vault.fish" - (string-append fish-completion-dir "/aws-vault.fish"))))))))) - (synopsis - "Vault for securely storing and accessing AWS credentials") + (home-page "https://github.com/99designs/aws-vault") + (synopsis "Vault for securely storing and accessing AWS credentials") (description "AWS Vault is a tool to securely store and access @acronym{Amazon Web Services,AWS} credentials. @@ -8275,7 +8277,6 @@ (define-public aws-vault then generates temporary credentials from those to expose to your shell and applications. It's designed to be complementary to the AWS CLI tools, and is aware of your profiles and configuration in ~/.aws/config.") - (home-page "https://github.com/99designs/aws-vault") (license license:expat))) (define-public go-github-com-gsterjov-go-libsecret -- cgit v1.2.3 From a57cadf2f79cb0610cac32ebea63fed267ef227d Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 26 Jul 2024 17:04:53 +0100 Subject: gnu: go-github-com-gatherstars-com-jwz: Update to 1.4.0. * gnu/packages/golang.scm (go-github-com-gatherstars-com-jwz): Update to 1.4.0. Change-Id: I0250cd7787baeab177c36d24897e31655740361e --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index f1cc28a295..9933382143 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -8737,7 +8737,7 @@ (define-public go-github-com-jhillyerd-enmime (define-public go-github-com-gatherstars-com-jwz (package (name "go-github-com-gatherstars-com-jwz") - (version "1.3.1") + (version "1.4.0") (source (origin (method git-fetch) (uri (git-reference @@ -8746,7 +8746,7 @@ (define-public go-github-com-gatherstars-com-jwz (file-name (git-file-name name version)) (sha256 (base32 - "1zxg2vmka80m1vnlb1v1gdlrwnkpakcmwi1hxpl8jjjiyd4z2j2i")))) + "1d66axc3504wqpb4axlm8m9jq8rmwndxb4asbqwryymj3yh60cla")))) (build-system go-build-system) (arguments (list #:import-path "github.com/gatherstars-com/jwz")) -- cgit v1.2.3 From fd7f750c26cb8e4d1160ddaa88bcfa31c7d7b7b6 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 26 Jul 2024 19:45:14 +0100 Subject: gnu: go-github-com-gatherstars-com-jwz: Adjust synopsis and description. * gnu/packages/golang.scm (go-github-com-gatherstars-com-jwz) [synopsis]: Fix lint warning. [description]: Add link to the original implementation paper. Change-Id: I06400b3603caf4b9b588bc6822a6d04d861f6448 --- gnu/packages/golang.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 9933382143..cd97d891dd 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -8754,11 +8754,12 @@ (define-public go-github-com-gatherstars-com-jwz go-github-com-jhillyerd-enmime go-github-com-gdamore-tcell-v2)) (home-page "https://github.com/gatherstars-com/jwz") - (synopsis "Implementation in Go of the email threading algorithm -originally invented for Netscape Mail") + (synopsis "Email threading algorithm in Golang") (description "The jwz package provides an implementation of the email threading -algorithm originally designed for use in Netscape Mail 2.0 for Go.") +algorithm originally designed for use in +@url{https://www.jwz.org/doc/threading.html,Netscape Mail 2.0 and 3.0} for +Golang.") (license license:asl2.0))) (define-public go-github-com-creack-pty -- cgit v1.2.3 From cec2654f9757e0a92a552018d4c72fdb630625bb Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 26 Jul 2024 19:56:44 +0100 Subject: gnu: go-github-com-gatherstars-com-jwz: Move to golang-web. * gnu/packages/golang.scm (go-github-com-gatherstars-com-jwz): Move from here ... * gnu/packages/golang-web.scm: ... to here. Change-Id: I9c5c08dc04ee88cd60c24d8efced194acacc9f7d --- gnu/packages/golang-web.scm | 32 +++++++++++++++++++++++++++++++- gnu/packages/golang.scm | 28 ---------------------------- 2 files changed, 31 insertions(+), 29 deletions(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 38357010e1..276a8a9ad2 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -10,11 +10,12 @@ ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020 Ryan Prior ;;; Copyright © 2020 raingloom -;;; Copyright © 2020-2022 Efraim Flashner +;;; Copyright © 2020-2023 Efraim Flashner ;;; Copyright © 2021 Collin J. Doering ;;; Copyright © 2021 Philip McGrath ;;; Copyright © 2021 Raghav Gururajan ;;; Copyright © 2021 Sarah Morgensen +;;; Copyright © 2022 (unmatched-parenthesis ;;; Copyright © 2022 Adam Kandur ;;; Copyright © 2022 Dhruvin Gandhi ;;; Copyright © 2022 Giacomo Leidi @@ -756,6 +757,35 @@ (define-public go-github-com-francoispqt-gojay decode/encode structures and slices.") (license license:expat))) +(define-public go-github-com-gatherstars-com-jwz + (package + (name "go-github-com-gatherstars-com-jwz") + (version "1.4.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gatherstars-com/jwz") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1d66axc3504wqpb4axlm8m9jq8rmwndxb4asbqwryymj3yh60cla")))) + (build-system go-build-system) + (arguments + (list #:import-path "github.com/gatherstars-com/jwz")) + (propagated-inputs + (list go-github-com-rivo-tview + go-github-com-jhillyerd-enmime + go-github-com-gdamore-tcell-v2)) + (home-page "https://github.com/gatherstars-com/jwz") + (synopsis "Email threading algorithm in Golang") + (description + "The jwz package provides an implementation of the email threading +algorithm originally designed for use in +@url{https://www.jwz.org/doc/threading.html,Netscape Mail 2.0 and 3.0} for +Golang.") + (license license:asl2.0))) + ;; TODO: This repository has been archived by the owner on Aug 30, 2023. It is ;; now read-only. The raven-go SDK is no longer maintained and was superseded ;; by the sentry-go diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index cd97d891dd..e68b0ba07d 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -8734,34 +8734,6 @@ (define-public go-github-com-jhillyerd-enmime library geared towards parsing MIME encoded emails.") (license license:expat))) -(define-public go-github-com-gatherstars-com-jwz - (package - (name "go-github-com-gatherstars-com-jwz") - (version "1.4.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/gatherstars-com/jwz") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1d66axc3504wqpb4axlm8m9jq8rmwndxb4asbqwryymj3yh60cla")))) - (build-system go-build-system) - (arguments - (list #:import-path "github.com/gatherstars-com/jwz")) - (propagated-inputs (list go-github-com-rivo-tview - go-github-com-jhillyerd-enmime - go-github-com-gdamore-tcell-v2)) - (home-page "https://github.com/gatherstars-com/jwz") - (synopsis "Email threading algorithm in Golang") - (description - "The jwz package provides an implementation of the email threading -algorithm originally designed for use in -@url{https://www.jwz.org/doc/threading.html,Netscape Mail 2.0 and 3.0} for -Golang.") - (license license:asl2.0))) - (define-public go-github-com-creack-pty (package (name "go-github-com-creack-pty") -- cgit v1.2.3 From cbba4c9ed9985e86d771fdd05bed15962d419ca8 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 26 Jul 2024 21:09:54 +0100 Subject: gnu: Remove go-github-com-technoweenie-multipartstreamer. The project is abandoned, the last changes were added 11y ago. Not in use within Guix. * gnu/packages/golang.scm (go-github-com-technoweenie-multipartstreamer): Delete variable. Change-Id: I04cf34e4b3fe7a52b7c30ca794ad051a62a93691 --- gnu/packages/golang.scm | 24 ------------------------ 1 file changed, 24 deletions(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index e68b0ba07d..aff21c7c35 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3303,30 +3303,6 @@ (define-public go-github-com-stretchr-objx slices, JSON and other data.") (license license:expat))) -(define-public go-github-com-technoweenie-multipartstreamer - (package - (name "go-github-com-technoweenie-multipartstreamer") - (version "1.0.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/technoweenie/multipartstreamer") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "159jhcabdkds8m5777zfs8p5z3snpjhzz7q9aq9wjpcvh6xlljqa")))) - (build-system go-build-system) - (arguments - (list #:tests? #f ; Upstream tests are broken. - #:import-path "github.com/technoweenie/multipartstreamer")) - (home-page "https://github.com/technoweenie/multipartstreamer") - (synopsis "MIME multipart format streamer") - (description - "This package helps you encode large files in MIME multipart format -without reading the entire content into memory.") - (license license:expat))) - (define-public go-github-com-tevino-abool (let ((commit "3c25f2fe7cd0ef3eabefce1d90efd69a65d35b12") -- cgit v1.2.3 From 60c96b2f77174e46bf1584aed07e662eade2c70a Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 26 Jul 2024 21:32:53 +0100 Subject: gnu: go-github-com-emersion-go-message: Update to 0.18.1. * gnu/packages/golang.scm (go-github-com-emersion-go-message): Update to 0.18.1. [propagated-inputs]: Remove go-github-com-emersion-go-textwrapper. Change-Id: I136df111c87e0476cbdd71f2e3e2ec8306d09456 --- gnu/packages/golang.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index aff21c7c35..4738179bce 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -8628,7 +8628,7 @@ (define-public go-github-com-zenhack-go-notmuch (define-public go-github-com-emersion-go-message (package (name "go-github-com-emersion-go-message") - (version "0.16.0") + (version "0.18.1") (source (origin (method git-fetch) (uri (git-reference @@ -8637,12 +8637,12 @@ (define-public go-github-com-emersion-go-message (file-name (git-file-name name version)) (sha256 (base32 - "1j5qdhsna28xcs843zsiccw700rld5hin466dl0n3a0ax1w13ay0")))) + "0gzcgrs5sava8fpybp5cw6f3zqnbz096wf93hcgkrg94wl1g7kqb")))) (build-system go-build-system) (arguments (list #:import-path "github.com/emersion/go-message")) - (propagated-inputs (list go-golang-org-x-text - go-github-com-emersion-go-textwrapper)) + (propagated-inputs + (list go-golang-org-x-text)) (home-page "https://github.com/emersion/go-message") (synopsis "Internet messages and MIME for Go") (description -- cgit v1.2.3 From 9f3e8c045f4c8fb652fa8da0705a41eb60f05808 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 26 Jul 2024 23:29:29 +0100 Subject: gnu: go-github-com-emersion-go-message: Move to golang-web. * gnu/packages/golang.scm (go-github-com-emersion-go-message): Move from here ... * gnu/packages/golang-web.scm: ... to here. Change-Id: I63e5b4d52142e90e64bdbf4f31cec9e18d221c24 --- gnu/packages/golang-web.scm | 25 +++++++++++++++++++++++++ gnu/packages/golang.scm | 25 ------------------------- 2 files changed, 25 insertions(+), 25 deletions(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 3665ab73c3..007af4ef7c 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -677,6 +677,31 @@ (define-public go-github-com-coreos-go-oidc-v3 go-golang-org-x-net go-golang-org-x-oauth2)))) +(define-public go-github-com-emersion-go-message + (package + (name "go-github-com-emersion-go-message") + (version "0.18.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emersion/go-message") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0gzcgrs5sava8fpybp5cw6f3zqnbz096wf93hcgkrg94wl1g7kqb")))) + (build-system go-build-system) + (arguments + (list #:import-path "github.com/emersion/go-message")) + (propagated-inputs + (list go-golang-org-x-text)) + (home-page "https://github.com/emersion/go-message") + (synopsis "Internet messages and MIME for Go") + (description + "The message package implements the Internet Message Format and +Multipurpose Internet Mail Extensions in Go.") + (license license:expat))) + (define-public go-github-com-emicklei-go-restful (package (name "go-github-com-emicklei-go-restful") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 4738179bce..cc032fb021 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -8625,31 +8625,6 @@ (define-public go-github-com-zenhack-go-notmuch email library.") (license license:gpl3+))) -(define-public go-github-com-emersion-go-message - (package - (name "go-github-com-emersion-go-message") - (version "0.18.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/emersion/go-message") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0gzcgrs5sava8fpybp5cw6f3zqnbz096wf93hcgkrg94wl1g7kqb")))) - (build-system go-build-system) - (arguments - (list #:import-path "github.com/emersion/go-message")) - (propagated-inputs - (list go-golang-org-x-text)) - (home-page "https://github.com/emersion/go-message") - (synopsis "Internet messages and MIME for Go") - (description - "The message package implements the Internet Message Format and Multipurpose -Internet Mail Extensions in Go.") - (license license:expat))) - (define-public go-github-com-jaytaylor-html2text (package (name "go-github-com-jaytaylor-html2text") -- cgit v1.2.3 From 0508bb1f7d209e24f28e4a847ab4f866f95e2534 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 26 Jul 2024 23:33:41 +0100 Subject: gnu: go-github-com-jhillyerd-enmime: Move to golang-web. * gnu/packages/golang.scm (go-github-com-jhillyerd-enmime): Move from here ... * gnu/packages/golang-web.scm: ... to here. Change-Id: Ifbc0490421ad5063d6681c46b8e0facca636bd9e --- gnu/packages/golang-web.scm | 32 ++++++++++++++++++++++++++++++++ gnu/packages/golang.scm | 32 -------------------------------- 2 files changed, 32 insertions(+), 32 deletions(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 007af4ef7c..f1bf859224 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -1620,6 +1620,38 @@ (define-public go-github-com-jcmturner-gokrb5-v8 Microsoft AD PAC authorization data.") (license license:asl2.0))) +(define-public go-github-com-jhillyerd-enmime + (package + (name "go-github-com-jhillyerd-enmime") + (version "1.2.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jhillyerd/enmime") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "03pir9wq9ha2i2ifj819yv5i0lvrgdn904ksbzgc3k8bqc497ydn")))) + (build-system go-build-system) + (arguments + (list #:import-path "github.com/jhillyerd/enmime")) + (native-inputs + (list go-github-com-stretchr-testify)) + (propagated-inputs + (list go-github-com-cention-sany-utf7 + go-github-com-go-test-deep + go-github-com-gogs-chardet + go-github-com-jaytaylor-html2text + go-github-com-pkg-errors + go-golang-org-x-text)) + (home-page "https://github.com/jhillyerd/enmime") + (synopsis "MIME encoder and decoder for Go") + (description + "The enmime package implements a MIME encoding and decoding library +geared towards parsing MIME encoded emails.") + (license license:expat))) + (define-public go-github-com-jmespath-go-jmespath (package (name "go-github-com-jmespath-go-jmespath") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index cc032fb021..a6b01bff4d 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -8653,38 +8653,6 @@ (define-public go-github-com-jaytaylor-html2text text-only mail clients to display them.") (license license:expat))) -(define-public go-github-com-jhillyerd-enmime - (package - (name "go-github-com-jhillyerd-enmime") - (version "1.2.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/jhillyerd/enmime") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "03pir9wq9ha2i2ifj819yv5i0lvrgdn904ksbzgc3k8bqc497ydn")))) - (build-system go-build-system) - (arguments - (list #:import-path "github.com/jhillyerd/enmime")) - (native-inputs - (list go-github-com-stretchr-testify)) - (propagated-inputs (list - go-github-com-cention-sany-utf7 - go-github-com-go-test-deep - go-github-com-gogs-chardet - go-github-com-jaytaylor-html2text - go-github-com-pkg-errors - go-golang-org-x-text)) - (home-page "https://github.com/jhillyerd/enmime") - (synopsis "MIME encoder and decoder for Go") - (description - "The enmime package implements a MIME encoding and decoding -library geared towards parsing MIME encoded emails.") - (license license:expat))) - (define-public go-github-com-creack-pty (package (name "go-github-com-creack-pty") -- cgit v1.2.3 From b97196b9443024355065ed1db7f9e1d52e006aa3 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 27 Jul 2024 09:55:18 +0100 Subject: gnu: go-github-com-avast-retry-go: Update to 2.7.0. * gnu/packages/golang.scm (go-github-com-avast-retry-go): Update to 2.7.0. Change-Id: I0231e1cc2b4cbcc6990f3db086577b43952edd22 --- gnu/packages/golang.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index a6b01bff4d..a5fb3591ac 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -1124,21 +1124,19 @@ (define-public go-github-com-apparentlymart-go-textseg-autoversion #:import-path "github.com/apparentlymart/go-textseg/autoversion/textseg")))) (define-public go-github-com-avast-retry-go - (let ((commit "a322e24d96313ab405dec28ad5711f036c6d25a3") - (revision "0")) (package (name "go-github-com-avast-retry-go") - (version (git-version "2.4.2" revision commit)) + (version "2.7.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/avast/retry-go") - (commit commit))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0hb4b1668516a4gv8avmflr565b6c1h93phdb068hcjxxj8767ba")))) + (base32 "0zkn8c2gyz8j90bf0aj6avfl3sf7j4rk5g4ak4yhglnsx72jdhbz")))) (build-system go-build-system) (arguments (list @@ -1154,7 +1152,7 @@ (define-public go-github-com-avast-retry-go (description "This package is a simple Go library that provides retry functionality for functions that may fail. It includes various customizable retry strategies, such as fixed delay, backoff delay, and random delay.") - (license license:expat)))) + (license license:expat))) (define-public go-github-com-operatorfoundation-shapeshifter-transports (package -- cgit v1.2.3 From 0b00161f90d99c890e9f333267addd33a68a2077 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 27 Jul 2024 09:59:34 +0100 Subject: gnu: go-github-com-avast-retry-go: Move to golang-xyz. * gnu/packages/golang.scm (go-github-com-avast-retry-go): Move from here ... * gnu/packages/golang-xyz.scm: ... to here. Change-Id: Ie6d53537689aea9454e9fc07958d162f323b1f2a --- gnu/packages/golang-xyz.scm | 32 ++++++++++++++++++++++++++++++++ gnu/packages/golang.scm | 31 ------------------------------- 2 files changed, 32 insertions(+), 31 deletions(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index 00c89761e3..4358569d53 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -825,6 +825,38 @@ (define-public go-github-com-audriusbutkevicius-recli stored in a Go struct.") (license license:mpl2.0))) +(define-public go-github-com-avast-retry-go + (package + (name "go-github-com-avast-retry-go") + (version "2.7.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/avast/retry-go") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0zkn8c2gyz8j90bf0aj6avfl3sf7j4rk5g4ak4yhglnsx72jdhbz")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/avast/retry-go" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'remove-examples + (lambda* (#:key import-path #:allow-other-keys) + (delete-file-recursively + (string-append "src/" import-path "/examples"))))))) + (propagated-inputs (list go-github-com-stretchr-testify)) + (home-page "https://github.com/avast/retry-go") + (synopsis "Simple golang library for retry mechanism") + (description + "This package is a simple Go library that provides retry functionality +for functions that may fail. It includes various customizable retry +strategies, such as fixed delay, backoff delay, and random delay.") + (license license:expat))) + (define-public go-github-com-aymanbagabas-go-osc52-v2 (package (name "go-github-com-aymanbagabas-go-osc52-v2") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index a5fb3591ac..5423cf3531 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -1123,37 +1123,6 @@ (define-public go-github-com-apparentlymart-go-textseg-autoversion '(#:unpack-path "github.com/apparentlymart/go-textseg/autoversion" #:import-path "github.com/apparentlymart/go-textseg/autoversion/textseg")))) -(define-public go-github-com-avast-retry-go - (package - (name "go-github-com-avast-retry-go") - (version "2.7.0") - (source - (origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/avast/retry-go") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0zkn8c2gyz8j90bf0aj6avfl3sf7j4rk5g4ak4yhglnsx72jdhbz")))) - (build-system go-build-system) - (arguments - (list - #:import-path "github.com/avast/retry-go" - #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'remove-examples - (lambda* (#:key import-path #:allow-other-keys) - (delete-file-recursively - (string-append "src/" import-path "/examples"))))))) - (propagated-inputs (list go-github-com-stretchr-testify)) - (home-page "https://github.com/avast/retry-go") - (synopsis "Simple golang library for retry mechanism") - (description "This package is a simple Go library that provides retry -functionality for functions that may fail. It includes various customizable -retry strategies, such as fixed delay, backoff delay, and random delay.") - (license license:expat))) - (define-public go-github-com-operatorfoundation-shapeshifter-transports (package (name "go-github-com-operatorfoundation-shapeshifter-transports") -- cgit v1.2.3 From 982bb6d468fa5400a131b363eedc1a6e6e72608b Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 28 Jul 2024 00:12:58 +0100 Subject: gnu: go-github-com-rivo-uniseg: Update to 0.4.7. * gnu/packages/golang.scm (go-github-com-rivo-uniseg): Update to 0.4.7. Change-Id: Ifabe78888d4a6cf3176633d757eac7253e04e8f3 --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 5423cf3531..1984c8b039 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7991,7 +7991,7 @@ (define-public go-github-com-vmihailenco-tagparser (define-public go-github-com-rivo-uniseg (package (name "go-github-com-rivo-uniseg") - (version "0.2.0") + (version "0.4.7") (source (origin (method git-fetch) @@ -8000,7 +8000,7 @@ (define-public go-github-com-rivo-uniseg (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0j7h22vfmjj562vr8gpsyrkrwp1pq9ayh5fylv24skxb467g9f0q")))) + (base32 "0nlcqyvq4vhq3hqhk84h6fp0jbqkjj88kcpcl853yr7sh4sisdxc")))) (build-system go-build-system) (arguments '(#:import-path "github.com/rivo/uniseg")) (home-page "https://github.com/rivo/uniseg") -- cgit v1.2.3 From 8c0be9fa2ad9127085f2b4841e3afad7fcf52351 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 28 Jul 2024 00:18:34 +0100 Subject: gnu: go-github-com-emersion-go-smtp: Update to 0.21.3. * gnu/packages/golang.scm (go-github-com-emersion-go-smtp): Update to 0.21.3. Change-Id: I6c7cf9add7b475e1a7b1bc85cadf1950f068803a --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 1984c8b039..35aa4f2531 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -5650,7 +5650,7 @@ (define-public go-github-com-emersion-go-imap-sortthread (define-public go-github-com-emersion-go-smtp (package (name "go-github-com-emersion-go-smtp") - (version "0.15.0") + (version "0.21.3") (source (origin (method git-fetch) (uri (git-reference @@ -5659,7 +5659,7 @@ (define-public go-github-com-emersion-go-smtp (file-name (git-file-name name version)) (sha256 (base32 - "1vhc0vpjd4yhxk6wrh01sdpi7nprjn98s46yy82xwlkm0cskl0h7")))) + "0drvmvrkmhqhnv4m3my1hbkyyva2vi35b36j0pdi57xc9rflziq3")))) (build-system go-build-system) (arguments (list #:import-path "github.com/emersion/go-smtp")) -- cgit v1.2.3 From cd2dca378638956315e678ea1e9a2b40919eaef6 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 28 Jul 2024 00:21:05 +0100 Subject: gnu: go-github-com-emersion-go-maildir: Updae to 0.5.0. * gnu/packages/golang.scm (go-github-com-emersion-go-maildir): Update to 0.5.0. Change-Id: I5c498843a1a2e3673c7be1c35532deaa2bcc8d1d --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 35aa4f2531..3df6c44f7e 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -5725,7 +5725,7 @@ (define-public go-github-com-emersion-go-imap-idle (define-public go-github-com-emersion-go-maildir (package (name "go-github-com-emersion-go-maildir") - (version "0.3.0") + (version "0.5.0") (source (origin (method git-fetch) (uri (git-reference @@ -5734,7 +5734,7 @@ (define-public go-github-com-emersion-go-maildir (file-name (git-file-name name version)) (sha256 (base32 - "1rs9kbacjpcza25pmdkbm7sdm7r6gq4g44nihi9asyrvspx96zf2")))) + "0wa7spn3qa7ipmg29vrimw7phyybyaagdalrjklcazjb6rplvwpl")))) (build-system go-build-system) (arguments (list #:import-path "github.com/emersion/go-maildir")) -- cgit v1.2.3 From b97a0691a8fdc014719dae597091066bc9e0a889 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 28 Jul 2024 22:07:09 +0100 Subject: gnu: go-github-com-fsnotify-fsnotify: Update to 1.7.0. * gnu/packages/golang.scm (go-github-com-fsnotify-fsnotify): Update to 1.7.0. Change-Id: Ib38aab3a61d09844e5680e24638ceda37b0a0840 --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 3df6c44f7e..c873b15088 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3542,7 +3542,7 @@ (define-public go-github-com-spf13-viper (define-public go-github-com-fsnotify-fsnotify (package (name "go-github-com-fsnotify-fsnotify") - (version "1.4.9") + (version "1.7.0") (source (origin (method git-fetch) @@ -3552,7 +3552,7 @@ (define-public go-github-com-fsnotify-fsnotify (file-name (git-file-name name version)) (sha256 (base32 - "1i1r72knpbfwwql9frn9bqc3nhfc2ai5m6qllcyr6wban62lr40x")))) + "1h7vs21lkj4bqbw5a6mqykaf56y181r0nja7c8pzajkvbsc39y8m")))) (build-system go-build-system) (arguments `(#:import-path "github.com/fsnotify/fsnotify")) -- cgit v1.2.3 From 2960dddc72c3b7ccbc03d01f3ff647170d08cc46 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 28 Jul 2024 22:07:18 +0100 Subject: gnu: go-github-com-sirupsen-logrus: Update to 1.9.3. * gnu/packages/golang.scm (go-github-com-sirupsen-logrus): Update to 1.9.3. Change-Id: I230ef1dbc9d74d3d7ee04bfdb4654a963a6cab7d --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index c873b15088..180dc769f7 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3682,7 +3682,7 @@ (define-public go-github-com-subosito-gotenv (define-public go-github-com-sirupsen-logrus (package (name "go-github-com-sirupsen-logrus") - (version "1.9.0") + (version "1.9.3") (source (origin (method git-fetch) @@ -3692,7 +3692,7 @@ (define-public go-github-com-sirupsen-logrus (file-name (git-file-name name version)) (sha256 (base32 - "12i402dxq5js4npnncg043vx874h6nk4ffn4gswcccxrp6h10ivz")))) + "1jz7nyq88i9fwfpp7krl046q62kjn6lb9j4r932bxnpypl1hwc49")))) (build-system go-build-system) (arguments (list -- cgit v1.2.3 From 5930a71791d10af81d580a58a8a87afc0fabd465 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 28 Jul 2024 22:07:18 +0100 Subject: gnu: go-github-com-emersion-go-msgauth: Update to 0.6.8. * gnu/packages/golang.scm (go-github-com-emersion-go-msgauth): Update to 0.6.8. Change-Id: I33d22a0142e13052a33b0465b77e7c8ea89f59d0 --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 180dc769f7..5a676c6bf0 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -5772,7 +5772,7 @@ (define-public go-github-com-emersion-go-milter (define-public go-github-com-emersion-go-msgauth (package (name "go-github-com-emersion-go-msgauth") - (version "0.6.6") + (version "0.6.8") (source (origin (method git-fetch) (uri (git-reference @@ -5781,7 +5781,7 @@ (define-public go-github-com-emersion-go-msgauth (file-name (git-file-name name version)) (sha256 (base32 - "0ds8yr4cm9wigcxg1sxc2m0wmy4z9n6gws3mj50dmf2ayij69z9j")))) + "0az83i6jmk3bjglgdqw5zsvhh8698rav0mcg4dy8kr0cgq0lj5zs")))) (build-system go-build-system) (arguments (list #:import-path "github.com/emersion/go-msgauth" -- cgit v1.2.3 From 38e174e3503657075e013b04f38c80ada1a5989f Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 28 Jul 2024 22:07:18 +0100 Subject: gnu: go-github-com-go-ini-ini: Update to 1.67.0. * gnu/packages/golang.scm (go-github-com-go-ini-ini): Update to 1.67.0. Change-Id: I9f4f1bafec3194fb656d3d3734a0f2b1d0f8bd83 --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 5a676c6bf0..9197f377fc 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -8312,7 +8312,7 @@ (define-public go-github-com-go-ini-ini (package (inherit go-gopkg-in-ini) (name "go-github-com-go-ini-ini") - (version "1.66.6") + (version "1.67.0") (source (origin (method git-fetch) (uri (git-reference @@ -8321,7 +8321,7 @@ (define-public go-github-com-go-ini-ini (file-name (git-file-name name version)) (sha256 (base32 - "0kqg13606hnw8f75cb59fsy1m85kiqf3csi2g7q2512avdmaphc9")))) + "1vpzkjmrwp7bqqsijp61293kk2vn6lcck56j8m5y6ks6cf21lpap")))) (arguments (list #:import-path "github.com/go-ini/ini")) (propagated-inputs (list go-github-com-stretchr-testify)))) -- cgit v1.2.3 From 190e98f8fb50d5f98b27e6ca075b216e253b685a Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 28 Jul 2024 22:07:18 +0100 Subject: gnu: go-github-com-arran4-golang-ical: Update to 0.3.1. * gnu/packages/golang.scm (go-github-com-arran4-golang-ical): Update to 0.3.1. [propagated-inputs]: Remove go-gopkg-in-yaml-v3, go-gopkg-in-check-v1, go-github-com-stretchr-testify, go-github-com-niemeyer-pretty, go-github-com-kr-text, and go-github-com-davecgh-go-spew. [native-inputs]: Add go-github-com-google-go-cmp and go-github-com-stretchr-testify. Change-Id: I9a41eb87c75136e397278d01d7b0d7b846adfba7 --- gnu/packages/golang.scm | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 9197f377fc..e50b3f3101 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -8859,25 +8859,22 @@ (define-public go-github-com-niemeyer-pretty (define-public go-github-com-arran4-golang-ical (package (name "go-github-com-arran4-golang-ical") - (version "0.0.0-20220517104411-fd89fefb0182") + (version "0.3.1") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/arran4/golang-ical") - (commit (go-version->git-ref version)))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "0bxs0b5yg26liiifc0cc41l307r0wc93hp8iygv8dgpc60yzncaw")))) + "0gcn5afds1dnq3wrl4ndi4wqqwmrnvh9pdqhyv77d3cqakn82vj3")))) (build-system go-build-system) (arguments (list #:import-path "github.com/arran4/golang-ical")) - (propagated-inputs (list go-gopkg-in-yaml-v3 - go-gopkg-in-check-v1 - go-github-com-stretchr-testify - go-github-com-niemeyer-pretty - go-github-com-kr-text - go-github-com-davecgh-go-spew)) + (native-inputs + (list go-github-com-google-go-cmp + go-github-com-stretchr-testify)) (home-page "https://github.com/arran4/golang-ical") (synopsis "Handle iCalenders in Go") (description -- cgit v1.2.3 From af14e5a4f8e80ed9a7275f306c37215573518738 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 28 Jul 2024 22:07:19 +0100 Subject: gnu: go-github-com-lithammer-fuzzysearch: Update to 1.1.8. * gnu/packages/golang.scm (go-github-com-lithammer-fuzzysearch): Update to 1.1.8. Change-Id: Ic82f06bd935bdc9f78eba9c3c87298cc652fd0c3 --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index e50b3f3101..5bf487c2c6 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -8885,7 +8885,7 @@ (define-public go-github-com-arran4-golang-ical (define-public go-github-com-lithammer-fuzzysearch (package (name "go-github-com-lithammer-fuzzysearch") - (version "1.1.5") + (version "1.1.8") (source (origin (method git-fetch) (uri (git-reference @@ -8894,7 +8894,7 @@ (define-public go-github-com-lithammer-fuzzysearch (file-name (git-file-name name version)) (sha256 (base32 - "1b036sm42cf64diwlqhx24vxy6g5afrmfbdfyqhpg8zrii3lpwns")))) + "0fp00gzbrr5fnz01lmkjqcs5z24zjrsp4r13ia0x0wslp5r13hv8")))) (build-system go-build-system) (propagated-inputs (list go-golang-org-x-text)) (arguments -- cgit v1.2.3 From 14c1a4bec96b346e65193bb7e6f7f3749bbf9b9e Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 28 Jul 2024 22:36:35 +0100 Subject: gnu: go-github-com-emersion-go-milter: Update to 0.4.1. * gnu/packages/golang.scm (go-github-com-emersion-go-milter): Update to 0.4.1. Change-Id: Id46a35ccf3cbb390c59f03c27b031d645b9b031c --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 5bf487c2c6..0d2a5cd6a1 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -5748,7 +5748,7 @@ (define-public go-github-com-emersion-go-maildir (define-public go-github-com-emersion-go-milter (package (name "go-github-com-emersion-go-milter") - (version "0.3.3") + (version "0.4.1") (source (origin (method git-fetch) (uri (git-reference @@ -5757,7 +5757,7 @@ (define-public go-github-com-emersion-go-milter (file-name (git-file-name name version)) (sha256 (base32 - "10vpry5gjz2bh9qchcx4p59zm7cc6cb6bfkii2n6vsn4svb950sa")))) + "11qjwjz6ippsx9da81gylx46p1a96mk39j54ayw925m40skqhh3c")))) (build-system go-build-system) (arguments (list #:import-path "github.com/emersion/go-milter")) -- cgit v1.2.3 From 07420241df3fa3001a606724eb1e281a83989e6e Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 28 Jul 2024 22:10:27 +0100 Subject: gnu: go-github-com-arran4-golang-ical: Move to golang-xyz. * gnu/packages/golang.scm (go-github-com-arran4-golang-ical): Move from here ... * gnu/packages/golang-xyz.scm: ... to here. Change-Id: Iec66cbbab2bce986201ddacaaa643d7410f57ca6 --- gnu/packages/golang-xyz.scm | 27 +++++++++++++++++++++++++++ gnu/packages/golang.scm | 26 -------------------------- 2 files changed, 27 insertions(+), 26 deletions(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index 71bfeb0be5..f7e534d908 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -861,6 +861,33 @@ (define-public go-github-com-armon-go-radix @url{http://en.wikipedia.org/wiki/Radix_tree,radix tree}.") (license license:expat))) +(define-public go-github-com-arran4-golang-ical + (package + (name "go-github-com-arran4-golang-ical") + (version "0.3.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/arran4/golang-ical") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0gcn5afds1dnq3wrl4ndi4wqqwmrnvh9pdqhyv77d3cqakn82vj3")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/arran4/golang-ical")) + (native-inputs + (list go-github-com-google-go-cmp + go-github-com-stretchr-testify)) + (home-page "https://github.com/arran4/golang-ical") + (synopsis "Handle iCalenders in Go") + (description + "The @code{ical} package provides an ICS/iCalender parser and serialiser +for Go.") + (license license:asl2.0))) + (define-public go-github-com-audriusbutkevicius-recli (package (name "go-github-com-audriusbutkevicius-recli") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 0d2a5cd6a1..ee45190900 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -8856,32 +8856,6 @@ (define-public go-github-com-niemeyer-pretty terminal.") (license license:expat))) -(define-public go-github-com-arran4-golang-ical - (package - (name "go-github-com-arran4-golang-ical") - (version "0.3.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/arran4/golang-ical") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0gcn5afds1dnq3wrl4ndi4wqqwmrnvh9pdqhyv77d3cqakn82vj3")))) - (build-system go-build-system) - (arguments - (list #:import-path "github.com/arran4/golang-ical")) - (native-inputs - (list go-github-com-google-go-cmp - go-github-com-stretchr-testify)) - (home-page "https://github.com/arran4/golang-ical") - (synopsis "Handle iCalenders in Go") - (description - "The @code{ical} package provides an ICS/iCalender parser and -serialiser for Go.") - (license license:asl2.0))) - (define-public go-github-com-lithammer-fuzzysearch (package (name "go-github-com-lithammer-fuzzysearch") -- cgit v1.2.3 From 0b569a6c2db33c5d92ed0fcffafc3beabbc9a2ab Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 28 Jul 2024 22:17:10 +0100 Subject: gnu: go-github-com-emersion-go-imap: Move to golang-web. * gnu/packages/golang.scm (go-github-com-emersion-go-imap): Move from here ... * gnu/packages/golang-web.scm: ... to here. Change-Id: I86e6b6b901359657dfafe6af65231405cc110514 --- gnu/packages/golang-web.scm | 28 ++++++++++++++++++++++++++++ gnu/packages/golang.scm | 26 -------------------------- 2 files changed, 28 insertions(+), 26 deletions(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 0bea9afb7d..fb07dbfe07 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -715,6 +715,34 @@ (define-public go-github-com-coreos-go-oidc-v3 go-golang-org-x-net go-golang-org-x-oauth2)))) +(define-public go-github-com-emersion-go-imap + (package + (name "go-github-com-emersion-go-imap") + (version "1.2.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emersion/go-imap") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0ak2ysvfcc9w0g1070msis8x9sh6gzvf0nd65ks594siwbmqddw8")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/emersion/go-imap")) + (propagated-inputs + (list go-golang-org-x-text + go-github-com-emersion-go-sasl + go-github-com-emersion-go-message)) + (home-page "https://github.com/emersion/go-imap") + (synopsis "IMAP4rev1 library written in Go") + (description + "This package provides an IMAP4rev1 library written in Go. It can be +used to build IMAP clients and servers.") + (license license:expat))) + (define-public go-github-com-emersion-go-message (package (name "go-github-com-emersion-go-message") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index ee45190900..d4ec83ee99 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -5595,32 +5595,6 @@ (define-public go-github-com-ddevault-go-libvterm "This is a fork of another go-libvterm library for use with aerc.") (license license:expat)))) -(define-public go-github-com-emersion-go-imap - (package - (name "go-github-com-emersion-go-imap") - (version "1.2.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/emersion/go-imap") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0ak2ysvfcc9w0g1070msis8x9sh6gzvf0nd65ks594siwbmqddw8")))) - (build-system go-build-system) - (arguments - (list #:import-path "github.com/emersion/go-imap")) - (propagated-inputs (list go-golang-org-x-text - go-github-com-emersion-go-sasl - go-github-com-emersion-go-message)) - (home-page "https://github.com/emersion/go-imap") - (synopsis "IMAP4rev1 library written in Go") - (description - "This package provides an IMAP4rev1 library written in Go. It -can be used to build IMAP clients and servers.") - (license license:expat))) - (define-public go-github-com-emersion-go-imap-sortthread (package (name "go-github-com-emersion-go-imap-sortthread") -- cgit v1.2.3 From d084c3f9a6bb5ef5673cab47e7caa7becf451079 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 28 Jul 2024 22:23:25 +0100 Subject: gnu: go-github-com-emersion-go-imap-idle: Move to golang-web. * gnu/packages/golang.scm (go-github-com-emersion-go-imap-idle): Move from here ... * gnu/packages/golang-web.scm: ... to here. Change-Id: I7a26491bd077727e434a04bf51d98b338d4da151 --- gnu/packages/golang-web.scm | 29 +++++++++++++++++++++++++++++ gnu/packages/golang.scm | 27 --------------------------- 2 files changed, 29 insertions(+), 27 deletions(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index fb07dbfe07..f3233137ac 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -743,6 +743,35 @@ (define-public go-github-com-emersion-go-imap used to build IMAP clients and servers.") (license license:expat))) +;; XXX: This repository has been archived by the owner on Sep 8, 2021. It is +;; now read-only. +(define-public go-github-com-emersion-go-imap-idle + (let ((commit "2704abd7050ed7f2143753554ee23affdf847bd9") + (revision "0")) + (package + (name "go-github-com-emersion-go-imap-idle") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emersion/go-imap-idle") + (commit commit))) + (sha256 + (base32 + "0blwcadmxgqsdwgr9m4jqfbpfa2viw5ah19xbybpa1z1z4aj5cbc")) + (file-name (git-file-name name version)))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/emersion/go-imap-idle")) + (propagated-inputs + (list go-github-com-emersion-go-imap)) + (home-page "https://github.com/emersion/go-imap-idle") + (synopsis "IDLE extension for go-imap") + (description "This package provides an IDLE extension for go-imap.") + (license license:expat)))) + (define-public go-github-com-emersion-go-message (package (name "go-github-com-emersion-go-message") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index d4ec83ee99..7c1474e348 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -5669,33 +5669,6 @@ (define-public go-github-com-emersion-go-sasl (description "This package provides a SASL library written in Go.") (license license:expat)))) -(define-public go-github-com-emersion-go-imap-idle - (let ((commit "2704abd7050ed7f2143753554ee23affdf847bd9") - (revision "0")) - (package - (name "go-github-com-emersion-go-imap-idle") - (version (git-version "0.0.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/emersion/go-imap-idle") - (commit commit))) - (sha256 - (base32 - "0blwcadmxgqsdwgr9m4jqfbpfa2viw5ah19xbybpa1z1z4aj5cbc")) - (file-name (git-file-name name version)))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/emersion/go-imap-idle")) - (native-inputs - (list go-github-com-emersion-go-imap go-github-com-emersion-go-sasl - go-golang-org-x-text)) - (home-page "https://github.com/emersion/go-imap-idle") - (synopsis "IDLE extension for go-imap") - (description "This package provides an IDLE extension for go-imap.") - (license license:expat)))) - (define-public go-github-com-emersion-go-maildir (package (name "go-github-com-emersion-go-maildir") -- cgit v1.2.3 From e2f5651c15d0b94ea896bbff8e96f039f3ab34e5 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 28 Jul 2024 22:27:53 +0100 Subject: gnu: go-github-com-emersion-go-imap-sortthread: Move to golang-web. * gnu/packages/golang.scm (go-github-com-emersion-go-imap-sortthread): Move from here ... * gnu/packages/golang-web.scm: ... to here. Change-Id: I82fd80d70a5df4b6c7937c9fb5f857de8a55c5bb --- gnu/packages/golang-web.scm | 27 +++++++++++++++++++++++++++ gnu/packages/golang.scm | 26 -------------------------- 2 files changed, 27 insertions(+), 26 deletions(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index f3233137ac..d0a324e909 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -772,6 +772,33 @@ (define-public go-github-com-emersion-go-imap-idle (description "This package provides an IDLE extension for go-imap.") (license license:expat)))) +(define-public go-github-com-emersion-go-imap-sortthread + (package + (name "go-github-com-emersion-go-imap-sortthread") + (version "1.2.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emersion/go-imap-sortthread") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1cfbgz1l5angnj52v9pxwggai2shx0h78ffcp7j4r4lr7lzflnwz")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/emersion/go-imap-sortthread")) + (propagated-inputs + (list + go-github-com-emersion-go-imap)) + (home-page "https://github.com/emersion/go-imap-sortthread") + (synopsis "Sorting and threading of messages for the imap package") + (description + "The sortthread package implements message sorting and threading for +@code{go-github-com-emersion-go-imap}.") + (license license:expat))) + (define-public go-github-com-emersion-go-message (package (name "go-github-com-emersion-go-message") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 7c1474e348..f90b28691b 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -5595,32 +5595,6 @@ (define-public go-github-com-ddevault-go-libvterm "This is a fork of another go-libvterm library for use with aerc.") (license license:expat)))) -(define-public go-github-com-emersion-go-imap-sortthread - (package - (name "go-github-com-emersion-go-imap-sortthread") - (version "1.2.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/emersion/go-imap-sortthread") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1cfbgz1l5angnj52v9pxwggai2shx0h78ffcp7j4r4lr7lzflnwz")))) - (build-system go-build-system) - (arguments - (list #:import-path "github.com/emersion/go-imap-sortthread")) - (propagated-inputs (list go-golang-org-x-text - go-github-com-emersion-go-sasl - go-github-com-emersion-go-imap)) - (home-page "https://github.com/emersion/go-imap-sortthread") - (synopsis "Sorting and threading of messages for the imap package") - (description - "The sortthread package implements message sorting and threading for -@code{go-github-com-emersion-go-imap}.") - (license license:expat))) - (define-public go-github-com-emersion-go-smtp (package (name "go-github-com-emersion-go-smtp") -- cgit v1.2.3 From 7a8126e107999b2af4a50bd2ff7e8f1a9faaedab Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 28 Jul 2024 22:30:55 +0100 Subject: gnu: go-github-com-emersion-go-maildir: Move to golang-web. * gnu/packages/golang.scm (go-github-com-emersion-go-maildir): Move from here ... * gnu/packages/golang-web.scm: ... to here. Change-Id: I75029fd66f94a807d87e877df7fc962f3ee567e1 --- gnu/packages/golang-web.scm | 23 +++++++++++++++++++++++ gnu/packages/golang.scm | 23 ----------------------- 2 files changed, 23 insertions(+), 23 deletions(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index d0a324e909..3c196ef228 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -799,6 +799,29 @@ (define-public go-github-com-emersion-go-imap-sortthread @code{go-github-com-emersion-go-imap}.") (license license:expat))) +(define-public go-github-com-emersion-go-maildir + (package + (name "go-github-com-emersion-go-maildir") + (version "0.5.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emersion/go-maildir") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0wa7spn3qa7ipmg29vrimw7phyybyaagdalrjklcazjb6rplvwpl")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/emersion/go-maildir")) + (home-page "https://github.com/emersion/go-maildir") + (synopsis "Maildir interface for Go") + (description + "This package provides an interface to mailboxes in the Maildir format.") + (license license:expat))) + (define-public go-github-com-emersion-go-message (package (name "go-github-com-emersion-go-message") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index f90b28691b..5668ff25bc 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -5643,29 +5643,6 @@ (define-public go-github-com-emersion-go-sasl (description "This package provides a SASL library written in Go.") (license license:expat)))) -(define-public go-github-com-emersion-go-maildir - (package - (name "go-github-com-emersion-go-maildir") - (version "0.5.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/emersion/go-maildir") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0wa7spn3qa7ipmg29vrimw7phyybyaagdalrjklcazjb6rplvwpl")))) - (build-system go-build-system) - (arguments - (list #:import-path "github.com/emersion/go-maildir")) - (home-page "https://github.com/emersion/go-maildir") - (synopsis "Maildir interface for Go") - (description - "This package provides an interface to mailboxes in the Maildir -format.") - (license license:expat))) - (define-public go-github-com-emersion-go-milter (package (name "go-github-com-emersion-go-milter") -- cgit v1.2.3 From 110644260c9522f050e214ca575914c89e0b16d6 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 28 Jul 2024 22:33:49 +0100 Subject: gnu: go-github-com-emersion-go-mbox: Move to golang-web. * gnu/packages/golang.scm (go-github-com-emersion-go-mbox): Move from here ... * gnu/packages/golang-web.scm: ... to here. Change-Id: Ib367bdb08a6989c73eb00c92b830af8e7b47a1b8 --- gnu/packages/golang-web.scm | 24 ++++++++++++++++++++++++ gnu/packages/golang.scm | 23 ----------------------- 2 files changed, 24 insertions(+), 23 deletions(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 3c196ef228..7266d3bd28 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -822,6 +822,30 @@ (define-public go-github-com-emersion-go-maildir "This package provides an interface to mailboxes in the Maildir format.") (license license:expat))) +(define-public go-github-com-emersion-go-mbox + (package + (name "go-github-com-emersion-go-mbox") + (version "1.0.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emersion/go-mbox") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0vnadh2khx7sxn0irrd8gz8ra02x7ij0q8zglq3rqffqil06nliv")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/emersion/go-mbox")) + (home-page "https://github.com/emersion/go-mbox") + (synopsis "Go library for handling @code{mbox} files") + (description + "This package provides a library for parsing and formatting @code{mbox} +files.") + (license license:expat))) + (define-public go-github-com-emersion-go-message (package (name "go-github-com-emersion-go-message") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 5668ff25bc..9ec89d16d0 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -5697,29 +5697,6 @@ (define-public go-github-com-emersion-go-msgauth "This package provides a Go library for authenticating emails.") (license license:expat))) -(define-public go-github-com-emersion-go-mbox - (package - (name "go-github-com-emersion-go-mbox") - (version "1.0.3") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/emersion/go-mbox") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0vnadh2khx7sxn0irrd8gz8ra02x7ij0q8zglq3rqffqil06nliv")))) - (build-system go-build-system) - (arguments - (list #:import-path "github.com/emersion/go-mbox")) - (home-page "https://github.com/emersion/go-mbox") - (synopsis "Go library for handling @code{mbox} files") - (description - "This package provides a library for parsing and formatting -@code{mbox} files.") - (license license:expat))) - (define-public go-github-com-google-uuid (package (name "go-github-com-google-uuid") -- cgit v1.2.3 From b09861ec7c249ad30b7aec9ef4407439040dabfa Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 28 Jul 2024 22:38:13 +0100 Subject: gnu: go-github-com-emersion-go-milter: Move to golang-web. * gnu/packages/golang.scm (go-github-com-emersion-go-milter): Move from here ... * gnu/packages/golang-web.scm: ... to here. Change-Id: Id8e90ba52f4832df397b88768a7c9a4c6fb6f45e --- gnu/packages/golang-web.scm | 26 ++++++++++++++++++++++++++ gnu/packages/golang.scm | 24 ------------------------ 2 files changed, 26 insertions(+), 24 deletions(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 7266d3bd28..f65629c8b6 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -871,6 +871,32 @@ (define-public go-github-com-emersion-go-message Multipurpose Internet Mail Extensions in Go.") (license license:expat))) +(define-public go-github-com-emersion-go-milter + (package + (name "go-github-com-emersion-go-milter") + (version "0.4.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emersion/go-milter") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "11qjwjz6ippsx9da81gylx46p1a96mk39j54ayw925m40skqhh3c")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/emersion/go-milter")) + (propagated-inputs + (list go-github-com-emersion-go-message)) + (home-page "https://github.com/emersion/go-milter") + (synopsis "Milter mail filters in Go") + (description + "This package provides an interface for implementing milter mail filters +for Go.") + (license license:bsd-2))) + (define-public go-github-com-emicklei-go-restful (package (name "go-github-com-emicklei-go-restful") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 9ec89d16d0..b437ab994c 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -5643,30 +5643,6 @@ (define-public go-github-com-emersion-go-sasl (description "This package provides a SASL library written in Go.") (license license:expat)))) -(define-public go-github-com-emersion-go-milter - (package - (name "go-github-com-emersion-go-milter") - (version "0.4.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/emersion/go-milter") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "11qjwjz6ippsx9da81gylx46p1a96mk39j54ayw925m40skqhh3c")))) - (build-system go-build-system) - (arguments - (list #:import-path "github.com/emersion/go-milter")) - (propagated-inputs (list go-github-com-emersion-go-message)) - (home-page "https://github.com/emersion/go-milter") - (synopsis "Milter mail filters in Go") - (description - "This package provides an interface for implementing milter mail -filters for Go.") - (license license:bsd-2))) - (define-public go-github-com-emersion-go-msgauth (package (name "go-github-com-emersion-go-msgauth") -- cgit v1.2.3 From 35438093a48b2cc1ce600f5a24b38ca1363df29e Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 28 Jul 2024 22:40:03 +0100 Subject: gnu: go-github-com-emersion-go-msgauth: Move to golang-web. * gnu/packages/golang.scm (go-github-com-emersion-go-msgauth): Move from here ... * gnu/packages/golang-web.scm: ... to here. Change-Id: Iec9f8d3f488668c188a96dae53046ad0075781ff --- gnu/packages/golang-web.scm | 32 ++++++++++++++++++++++++++++++++ gnu/packages/golang.scm | 30 ------------------------------ 2 files changed, 32 insertions(+), 30 deletions(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index f65629c8b6..02c1262b0d 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -897,6 +897,38 @@ (define-public go-github-com-emersion-go-milter for Go.") (license license:bsd-2))) +(define-public go-github-com-emersion-go-msgauth + (package + (name "go-github-com-emersion-go-msgauth") + (version "0.6.8") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emersion/go-msgauth") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0az83i6jmk3bjglgdqw5zsvhh8698rav0mcg4dy8kr0cgq0lj5zs")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/emersion/go-msgauth" + #:tests? #f ; Source-only package. + #:phases + #~(modify-phases %standard-phases + ;; Source-only package. + (delete 'build)))) + (propagated-inputs + (list go-golang-org-x-crypto + go-github-com-emersion-go-milter + go-github-com-emersion-go-message)) + (home-page "https://github.com/emersion/go-msgauth") + (synopsis "Email authentication for Go") + (description + "This package provides a Go library for authenticating emails.") + (license license:expat))) + (define-public go-github-com-emicklei-go-restful (package (name "go-github-com-emicklei-go-restful") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index b437ab994c..4d99ca56f0 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -5643,36 +5643,6 @@ (define-public go-github-com-emersion-go-sasl (description "This package provides a SASL library written in Go.") (license license:expat)))) -(define-public go-github-com-emersion-go-msgauth - (package - (name "go-github-com-emersion-go-msgauth") - (version "0.6.8") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/emersion/go-msgauth") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0az83i6jmk3bjglgdqw5zsvhh8698rav0mcg4dy8kr0cgq0lj5zs")))) - (build-system go-build-system) - (arguments - (list #:import-path "github.com/emersion/go-msgauth" - #:tests? #f ; Source-only package. - #:phases - #~(modify-phases %standard-phases - ;; Source-only package. - (delete 'build)))) - (propagated-inputs (list go-golang-org-x-crypto - go-github-com-emersion-go-milter - go-github-com-emersion-go-message)) - (home-page "https://github.com/emersion/go-msgauth") - (synopsis "Email authentication for Go") - (description - "This package provides a Go library for authenticating emails.") - (license license:expat))) - (define-public go-github-com-google-uuid (package (name "go-github-com-google-uuid") -- cgit v1.2.3 From 892c4cace7ae8c366e423366f5094a37486ffc59 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 28 Jul 2024 22:53:29 +0100 Subject: gnu: go-github-com-emersion-go-sasl: Move to golang-web. * gnu/packages/golang.scm (go-github-com-emersion-go-sasl): Move from here ... * gnu/packages/golang-web.scm: ... to here. Change-Id: I00729892042a0054b4749693f08cb36c9de72dd9 --- gnu/packages/golang-web.scm | 25 +++++++++++++++++++++++++ gnu/packages/golang.scm | 24 ------------------------ 2 files changed, 25 insertions(+), 24 deletions(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 4d9f0c0882..70397c311f 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -934,6 +934,31 @@ (define-public go-github-com-emersion-go-msgauth "This package provides a Go library for authenticating emails.") (license license:expat))) +(define-public go-github-com-emersion-go-sasl + (let ((commit "0b9dcfb154ac3d7515b08bc2691a0332800edfe9") + (revision "1")) + (package + (name "go-github-com-emersion-go-sasl") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emersion/go-sasl") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1cbf86wkqrdinfydndgdlnayg4a5mg3d4vqra377j2sfkg7wj0hs")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/emersion/go-sasl")) + (home-page "https://github.com/emersion/go-sasl") + (synopsis "SASL library written in Go") + (description + "This package provides a SASL library written in Go.") + (license license:expat)))) + (define-public go-github-com-emicklei-go-restful (package (name "go-github-com-emicklei-go-restful") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 4d99ca56f0..15a7954a58 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -5619,30 +5619,6 @@ (define-public go-github-com-emersion-go-smtp defined by RFC 5321.") (license license:expat))) -(define-public go-github-com-emersion-go-sasl - (let ((commit "0b9dcfb154ac3d7515b08bc2691a0332800edfe9") - (revision "1")) - (package - (name "go-github-com-emersion-go-sasl") - (version (git-version "0.0.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/emersion/go-sasl") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1cbf86wkqrdinfydndgdlnayg4a5mg3d4vqra377j2sfkg7wj0hs")))) - (build-system go-build-system) - (arguments - (list #:import-path "github.com/emersion/go-sasl")) - (home-page "https://github.com/emersion/go-sasl") - (synopsis "SASL library written in Go") - (description "This package provides a SASL library written in Go.") - (license license:expat)))) - (define-public go-github-com-google-uuid (package (name "go-github-com-google-uuid") -- cgit v1.2.3 From 389bf59aed5faedfd4aecb010b16eb2cbced5f30 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 28 Jul 2024 22:55:00 +0100 Subject: gnu: go-github-com-emersion-go-smtp: Move to golang-web. * gnu/packages/golang.scm (go-github-com-emersion-go-smpt): Move from here ... * gnu/packages/golang-web.scm: ... to here. Change-Id: I5df22126cc7bdd541e33661996e7753e2cd732ea --- gnu/packages/golang-web.scm | 26 ++++++++++++++++++++++++++ gnu/packages/golang.scm | 24 ------------------------ 2 files changed, 26 insertions(+), 24 deletions(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 70397c311f..5c1ece7389 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -959,6 +959,32 @@ (define-public go-github-com-emersion-go-sasl "This package provides a SASL library written in Go.") (license license:expat)))) +(define-public go-github-com-emersion-go-smtp + (package + (name "go-github-com-emersion-go-smtp") + (version "0.21.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emersion/go-smtp") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0drvmvrkmhqhnv4m3my1hbkyyva2vi35b36j0pdi57xc9rflziq3")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/emersion/go-smtp")) + (propagated-inputs + (list go-github-com-emersion-go-sasl)) + (home-page "https://github.com/emersion/go-smtp") + (synopsis "SMTP implementation for Go") + (description + "This package implements the Simple Mail Transfer Protocol as defined by +RFC 5321.") + (license license:expat))) + (define-public go-github-com-emicklei-go-restful (package (name "go-github-com-emicklei-go-restful") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 15a7954a58..ec5a1421d0 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -5595,30 +5595,6 @@ (define-public go-github-com-ddevault-go-libvterm "This is a fork of another go-libvterm library for use with aerc.") (license license:expat)))) -(define-public go-github-com-emersion-go-smtp - (package - (name "go-github-com-emersion-go-smtp") - (version "0.21.3") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/emersion/go-smtp") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0drvmvrkmhqhnv4m3my1hbkyyva2vi35b36j0pdi57xc9rflziq3")))) - (build-system go-build-system) - (arguments - (list #:import-path "github.com/emersion/go-smtp")) - (propagated-inputs (list go-github-com-emersion-go-sasl)) - (home-page "https://github.com/emersion/go-smtp") - (synopsis "SMTP implementation for Go") - (description - "This package implements the Simple Mail Transfer Protocol as -defined by RFC 5321.") - (license license:expat))) - (define-public go-github-com-google-uuid (package (name "go-github-com-google-uuid") -- cgit v1.2.3 From 9a4cd495a428ddf90eeafcaea883af80350574d5 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 28 Jul 2024 23:26:30 +0100 Subject: gnu: go-1.22: Update to 1.22.5. * gnu/packages/golang.scm (go-1.22): Update to 1.22.5. Change-Id: I636a6c87ab3bec3a399bbd95d6a57610f5cdb4df --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index ec5a1421d0..50ac5328c6 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -951,7 +951,7 @@ (define-public go-1.22 (package (inherit go-1.21) (name "go") - (version "1.22.2") + (version "1.22.5") (source (origin (method git-fetch) @@ -960,7 +960,7 @@ (define-public go-1.22 (commit (string-append "go" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0p6v5dl4mzlrma6v1a26d8zr4csq5mm10d9sdhl3kn9d22vphql1")))) + (base32 "1ahcxhyfr4wa4yahpl1jzdr1pizp5xpa6cy96jz649zsp21640d9")))) (arguments (substitute-keyword-arguments (package-arguments go-1.21) ((#:phases phases) -- cgit v1.2.3