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') 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 @@ editor.") (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.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') 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 @@ 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 - `(#: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.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') 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 @@ programming language.") 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 @@ developed by the Go team. It provides IDE features to any LSP-compatible 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.3 From 123dcb2f319126dc5314a440e07226bf9feb54c3 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Mon, 15 Jul 2024 15:53:27 +0100 Subject: gnu: go-github-com-coreos-go-oidc-v3: Update to 3.11.0. * gnu/packages/golang-web.scm (go-github-com-coreos-go-oidc-v3): Update to 3.11.0. [arguments]: <#:unpack-path>: Remove it. <#:import-path>: Adjust to reflect go.mod module path. <#:phases>: Remove 'build phase. Use custom 'check. [propagated-inputs]: Remove go-github-com-go-jose-go-jose-v3; add go-github-com-go-jose-go-jose-v4 and go-golang-org-x-net. Change-Id: Ibda17bed6eff43b1006199f4f5b3433ee922184f --- gnu/packages/golang-web.scm | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index a9213f1be8..a21339adb2 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -633,7 +633,7 @@ and stop increasing when a certain threshold is met.") (package (inherit go-github-com-coreos-go-oidc) (name "go-github-com-coreos-go-oidc-v3") - (version "3.6.0") + (version "3.11.0") (source (origin (method git-fetch) @@ -642,13 +642,23 @@ and stop increasing when a certain threshold is met.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1sbm6n3lp48lymn0g921afhq2j6inb38w3wy5rhyx9h8gpzhnxx9")))) + (base32 "00nbv15pjfcfxdy0i4k366ricdm2cylhpwak3hmjlgh6lrzxypl9")))) (arguments - (list ;; no Go files in [...]/src/github.com/coreos/go-oidc/v3. - #:import-path "github.com/coreos/go-oidc/v3/oidc" - #:unpack-path "github.com/coreos/go-oidc/v3")) + (list + #:import-path "github.com/coreos/go-oidc/v3" + #: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-github-com-go-jose-go-jose-v3 + (list go-github-com-go-jose-go-jose-v4 + go-golang-org-x-net go-golang-org-x-oauth2)))) (define-public go-github-com-emicklei-go-restful -- cgit v1.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') 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 @@ filters for Go.") (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 @@ filters for Go.") (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.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') 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 @@ filters for Go.") (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.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') 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 @@ filters for Go.") #: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.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') 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 @@ but it works for any C/C++ project.") 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 @@ compatible with SQLite using a graphical user interface.") #: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 @@ workloads. This kind of profiling is also known as wall-clock profiling.") (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 @@ when comparing complex types like structures and maps.") (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 @@ connections from a single physical connection.") '(#: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 @@ connections from a single physical connection.") '(#: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 @@ connections from a single physical connection.") (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 @@ decompose request handling into many smaller layers.") (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 @@ router.") (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 @@ programming language, which supports draft-04, draft-06 and draft-07.") (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 @@ the library more lightweight.") (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 @@ command-line parsers.") "./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 @@ the @url{https://vuln.go.dev,Go Vulnerability Database}.") (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 @@ filters for Go.") @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 @@ create or replace a file or symbolic link.") (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 @@ with gotest-tools."))) (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 @@ gotest-tools."))) #: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 @@ test when a comparison fails.") 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 @@ data serialization format.") (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 @@ deleting secrets from the system keyring.") '(#: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 @@ Gemini clients and servers.") 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 @@ and @code{go-ipld-format} legacy interface.") 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 @@ daemon as described in #: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 @@ time strings.") (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.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') 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 @@ ;;; ;;; 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 @@ filters for Go.") @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.3 From 96998167c26cddbf44129cbf9955871b3fedaee9 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 20 Jul 2024 08:17:09 +0100 Subject: gnu: go-golang-org-x-exp: Adjust package style. * gnu/packages/golang-build.scm (go-golang-org-x-exp): Fix indentation, apply list style. [description]: Place the sentence on a new line. Change-Id: I79d4682dc8ca0e5f0826f7e32c6dd01fc58aca44 --- gnu/packages/golang-build.scm | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm index 88665490bb..d1977d36c8 100644 --- a/gnu/packages/golang-build.scm +++ b/gnu/packages/golang-build.scm @@ -262,28 +262,30 @@ language.") (base32 "0ccjgv19w5p9sbcq12czmfnkjwv3b7hfljifwax6r9wk4dx0fcn7")) (modules '((guix build utils))) (snippet - '(begin - ;; Submodules with their own go.mod files and packed as separated - ;; packages: - ;; - ;; - golang.org/x/exp/event - ;; - golang.org/x/exp/jsonrpc2 - ;; - golang.org/x/exp/shiny - ;; - golang.org/x/exp/sumbdb - ;; - golang.org/x/exp/typeparams - (for-each delete-file-recursively - (list "event" "jsonrpc2" "shiny" "sumdb" "typeparams")))))) + #~(begin + ;; Submodules with their own go.mod files and packed as separated + ;; packages: + ;; + ;; - golang.org/x/exp/event + ;; - golang.org/x/exp/jsonrpc2 + ;; - golang.org/x/exp/shiny + ;; - golang.org/x/exp/sumbdb + ;; - golang.org/x/exp/typeparams + (for-each delete-file-recursively + (list "event" "jsonrpc2" "shiny" "sumdb" "typeparams")))))) (build-system go-build-system) (arguments - '(#:import-path "golang.org/x/exp" - ;; Source-only package - #:tests? #f - #:phases (modify-phases %standard-phases - (delete 'build)))) + (list + #:import-path "golang.org/x/exp" + ;; Source-only package + #:tests? #f + #:phases #~(modify-phases %standard-phases + (delete 'build)))) (home-page "https://golang.org/x/exp") (synopsis "Experimental and deprecated Go packages") - (description "This subrepository holds experimental and deprecated (in the -@code{old} directory) packages.") + (description + "This subrepository holds experimental and deprecated (in the @code{old} +directory) packages.") (license license:bsd-3))) (define-public go-golang-org-x-exp-typeparams -- cgit v1.3 From 4714623e05dd645c98554f90899d22f26f77d33d Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 20 Jul 2024 08:34:26 +0100 Subject: gnu: go-golang-org-x-exp: Enable tests. * gnu/packages/golang-build.scm (go-golang-org-x-exp): Enable tests. [arguments]: <#:phases>: Add 'remove-failing-tests phase. Use custom 'check phase. [propagated-inputs]: Add go-github-com-google-go-cmp, go-golang-org-x-mod, and go-golang-org-x-tools. Change-Id: Ic1573969572d32bb7318ed73135c853f42338f86 --- gnu/packages/golang-build.scm | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm index d1977d36c8..a8f4cbeb20 100644 --- a/gnu/packages/golang-build.scm +++ b/gnu/packages/golang-build.scm @@ -277,10 +277,32 @@ language.") (arguments (list #:import-path "golang.org/x/exp" - ;; Source-only package - #:tests? #f - #:phases #~(modify-phases %standard-phases - (delete 'build)))) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'remove-failing-tests + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + ;; Benchmark requires other modules to pass tests, delete them. + (delete-file-recursively "slog/benchmarks") + (substitute* (find-files "." "\\_test.go$") + ;; Disable failing tests: error running `go mod init`: go: + ;; modules disabled by GO111MODULE=off; see 'go help modules' + ;; , exit status 1 + (("TestFailure") "OffTestFailure") + (("TestRelease_gitRepo_uncommittedChanges") + "OffTestRelease_gitRepo_uncommittedChanges"))))) + ;; 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 + go-golang-org-x-mod + go-golang-org-x-tools)) (home-page "https://golang.org/x/exp") (synopsis "Experimental and deprecated Go packages") (description -- cgit v1.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') 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 @@ Go programming language.") 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 @@ data serialization format.") (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.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') 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 @@ ;;; ;;; 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 @@ test results.") (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.3 From d7f4f2c0538cdacf088f0108558c70656f96b4c2 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 20 Jul 2024 16:37:01 +0100 Subject: gnu: go-github-com-stretchr-testify: Update to 1.9.0. * gnu/packages/golang-check.scm (go-github-com-stretchr-testify): Update to 1.9.0. (go-github-com-stretchr-testify-next): Delete variable. (go-go-uber-org-goleak): [native-inputs]: Remove go-github-com-stretchr-testify-next; add go-github-com-stretchr-testify. * gnu/packages/golang-web.scm (go-github-com-quic-go-webtransport-go): [native-inputs]: Remove go-github-com-stretchr-testify-next; add go-github-com-stretchr-testify. * gnu/packages/golang-xyz.scm (go-github-com-masterminds-semver-v3, go-go-uber-org-dig, go-go-uber-org-fx, go-go-uber-org-zap): [native-inputs]: Remove go-github-com-stretchr-testify-next; add go-github-com-stretchr-testify. Change-Id: Ife39309254b5d89fcb61d84183771a4aab7e13db --- gnu/packages/golang-check.scm | 21 +++------------------ gnu/packages/golang-web.scm | 2 +- gnu/packages/golang-xyz.scm | 8 ++++---- 3 files changed, 8 insertions(+), 23 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm index 4323a6c557..6baffb84d2 100644 --- a/gnu/packages/golang-check.scm +++ b/gnu/packages/golang-check.scm @@ -878,7 +878,7 @@ current goroutine's ID.") (define-public go-github-com-stretchr-testify (package (name "go-github-com-stretchr-testify") - (version "1.7.0") + (version "1.9.0") (source (origin (method git-fetch) @@ -888,7 +888,7 @@ current goroutine's ID.") (file-name (git-file-name name version)) (sha256 (base32 - "0ixgjsvafr3513pz3r6pmgk074s2dxkll0dadvl25gkf30rkmh10")))) + "12cnhk96h8b3ddlb7jfvwwavzc0j1c2iva92pszl9rv6r571ckzg")))) (build-system go-build-system) (arguments '(#:import-path "github.com/stretchr/testify")) @@ -923,21 +923,6 @@ Features include: (propagated-inputs (list go-gopkg-in-yaml-v3))))) -(define-public go-github-com-stretchr-testify-next - (package - (inherit go-github-com-stretchr-testify) - (name "go-github-com-stretchr-testify") - (version "1.9.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/stretchr/testify") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "12cnhk96h8b3ddlb7jfvwwavzc0j1c2iva92pszl9rv6r571ckzg")))))) - (define-public go-github-com-tdewolff-test (package (name "go-github-com-tdewolff-test") @@ -1280,7 +1265,7 @@ gracefully enhance standard library testing package and behaviors of the (list #:import-path "go.uber.org/goleak")) (native-inputs - (list go-github-com-stretchr-testify-next)) + (list go-github-com-stretchr-testify)) (home-page "https://pkg.go.dev/go.uber.org/goleak") (synopsis "Goroutine leak detector") (description diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index f8862ddd10..2b72cb3423 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -2786,7 +2786,7 @@ protocol.") #:import-path "github.com/quic-go/webtransport-go")) (native-inputs (list go-go-uber-org-mock - go-github-com-stretchr-testify-next)) + go-github-com-stretchr-testify)) (propagated-inputs (list go-github-com-quic-go-quic-go go-golang-org-x-exp)) diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index ebce00f117..cf29278501 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -3111,7 +3111,7 @@ implementing features like: (list #:import-path "github.com/Masterminds/semver/v3")) (native-inputs - (list go-github-com-stretchr-testify-next)) + (list go-github-com-stretchr-testify)) (home-page "https://github.com/Masterminds/semver/") (synopsis "@code{semver} helps to work with semantic versions") (description @@ -5158,7 +5158,7 @@ CPU quota.") (list #:import-path "go.uber.org/dig")) (native-inputs - (list go-github-com-stretchr-testify-next)) + (list go-github-com-stretchr-testify)) (home-page "https://pkg.go.dev/go.uber.org/dig") (synopsis "Reflection based dependency injection toolkit for Golang") (description @@ -5184,7 +5184,7 @@ object dependencies graph during the process startup.") (list #:import-path "go.uber.org/fx")) (native-inputs - (list go-github-com-stretchr-testify-next)) + (list go-github-com-stretchr-testify)) (propagated-inputs (list go-go-uber-org-dig go-go-uber-org-goleak @@ -5252,7 +5252,7 @@ applications out of reusable, composable modules.") (string-append "src/" import-path "/stacktrace_ext_test.go"))))))) (native-inputs - (list go-github-com-stretchr-testify-next + (list go-github-com-stretchr-testify go-go-uber-org-goleak go-golang-org-x-lint go-honnef-co-go-tools)) -- cgit v1.3 From 1528b458739065e4e8591d7ef8afbb5707b58a43 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 20 Jul 2024 16:54:46 +0100 Subject: gnu: go-golang-org-sql-mock: Update to 1.5.2. * gnu/packages/golang-check.scm (go-golang-org-sql-mock): Update to 1.5.2. Change-Id: Ib976ac1fa79b0bdefc3c4827ce0b1ff7f75ba09c --- gnu/packages/golang-check.scm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm index 6baffb84d2..aea2639293 100644 --- a/gnu/packages/golang-check.scm +++ b/gnu/packages/golang-check.scm @@ -1065,22 +1065,19 @@ under test) much simpler.") (license license:asl2.0))) (define-public go-golang-org-sql-mock - (let ((commit "e98392b8111b45f8126e00af035a0dd95dc12e8b") - (version "1.3.3") - (revision "1")) (package (name "go-golang-org-sql-mock") - (version (git-version version revision commit)) + (version "1.5.2") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/DATA-DOG/go-sqlmock") - (commit commit))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "033vv29g2wf6fd757ajfmha30bqin3b07377037zkl051mk6mghs")) + "1vpvdx9hwmx9gm27aq5r5219xpaxz0gy4q1iqskk4saz05bspn0f")) (modules '((guix build utils))) (snippet '(delete-file-recursively "examples")))) (build-system go-build-system) @@ -1090,7 +1087,7 @@ under test) much simpler.") (description "This library simulates SQL-driver behavior in tests without requiring a real database connection.") (home-page "https://github.com/DATA-DOG/go-sqlmock") - (license license:expat)))) + (license license:expat))) (define-public go-golang-org-x-lint (let ((commit "83fdc39ff7b56453e3793356bcff3070b9b96445") -- cgit v1.3 From 6f80521c7edd0d5f306408c9373b6dad7de0fe8e Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 20 Jul 2024 16:56:29 +0100 Subject: gnu: go-golang-org-sql-mock: Refresh package style. * gnu/packages/golang-check.scm (go-golang-org-sql-mock): Fix indentation. Apply list style. [source]: Remove snippet. [arguments]: <#:phases>: Add 'remove-example phase. [home-page]: Place before [synopsis]. [description]: Start from a new line. Change-Id: Idbe31ee6a9ffe8d3d2ae4479c39f523531258bca --- gnu/packages/golang-check.scm | 51 ++++++++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 23 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm index aea2639293..05c37102f2 100644 --- a/gnu/packages/golang-check.scm +++ b/gnu/packages/golang-check.scm @@ -1065,29 +1065,34 @@ under test) much simpler.") (license license:asl2.0))) (define-public go-golang-org-sql-mock - (package - (name "go-golang-org-sql-mock") - (version "1.5.2") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/DATA-DOG/go-sqlmock") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1vpvdx9hwmx9gm27aq5r5219xpaxz0gy4q1iqskk4saz05bspn0f")) - (modules '((guix build utils))) - (snippet '(delete-file-recursively "examples")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/DATA-DOG/go-sqlmock")) - (synopsis "Mock library implementing @code{sql/driver}") - (description "This library simulates SQL-driver behavior in tests -without requiring a real database connection.") - (home-page "https://github.com/DATA-DOG/go-sqlmock") - (license license:expat))) + (package + (name "go-golang-org-sql-mock") + (version "1.5.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/DATA-DOG/go-sqlmock") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1vpvdx9hwmx9gm27aq5r5219xpaxz0gy4q1iqskk4saz05bspn0f")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/DATA-DOG/go-sqlmock" + #: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"))))))) + (home-page "https://github.com/DATA-DOG/go-sqlmock") + (synopsis "Mock library implementing @code{sql/driver}") + (description + "This library simulates SQL-driver behavior in tests without requiring a +real database connection.") + (license license:expat))) (define-public go-golang-org-x-lint (let ((commit "83fdc39ff7b56453e3793356bcff3070b9b96445") -- cgit v1.3 From f4f60672199ec5b4d61a45683d8b6bc7775a2054 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 20 Jul 2024 18:13:25 +0100 Subject: gnu: go-github-com-onsi-ginkgo-v2: Update to 2.19.0. * gnu/packages/golang-check.scm (go-github-com-onsi-ginkgo-v2): Update to 2.19.0. Change-Id: Ib1f8a70d5792ff174c49a33752eb187e3a1d0b55 --- gnu/packages/golang-check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm index 05c37102f2..dc7288bed9 100644 --- a/gnu/packages/golang-check.scm +++ b/gnu/packages/golang-check.scm @@ -682,7 +682,7 @@ Gomega matcher library.") (package (inherit go-github-com-onsi-ginkgo) (name "go-github-com-onsi-ginkgo-v2") - (version "2.18.0") + (version "2.19.0") (source (origin (method git-fetch) @@ -691,7 +691,7 @@ Gomega matcher library.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1w5dldjjcz2kpyxml4zd9yah7galfpmhcpc2l4zc5pr3skpwpibv")))) + (base32 "0dwnkcysb5d9dyg8p84hhx5a3sj85g3bwgki1pgay4i8glz7xa7q")))) (arguments (list #:import-path "github.com/onsi/ginkgo/v2")) -- cgit v1.3 From 5603a0df4bbd84273b956f8bbba372d1290ca61d Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 20 Jul 2024 18:16:19 +0100 Subject: gnu: go-github-com-frankban-quicktest: Update to 1.14.6. * gnu/packages/golang-check.scm (go-github-com-frankban-quicktest): Update to 1.14.6. Change-Id: I61fcf3f0c00070aeedd4c02742d8f773d479d9df --- gnu/packages/golang-check.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm index dc7288bed9..bb7c0c7081 100644 --- a/gnu/packages/golang-check.scm +++ b/gnu/packages/golang-check.scm @@ -286,7 +286,7 @@ workloads. This kind of profiling is also known as wall-clock profiling.") (define-public go-github-com-frankban-quicktest (package (name "go-github-com-frankban-quicktest") - (version "1.11.1") + (version "1.14.6") (source (origin (method git-fetch) @@ -295,11 +295,11 @@ workloads. This kind of profiling is also known as wall-clock profiling.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "0b1b44b2hli2p969gqz30z8v9z6ahlklpqzi17nwk1lsjz9yv938")))) + (base32 "0gnh9v4cg39pw8y356299zhh5jmq2p4cf9945lfiqsjsk7h6ld70")))) (build-system go-build-system) (arguments - '(#:import-path "github.com/frankban/quicktest")) + (list + #:import-path "github.com/frankban/quicktest")) (propagated-inputs (list go-github-com-google-go-cmp go-github-com-kr-pretty)) (home-page "https://github.com/frankban/quicktest") -- cgit v1.3 From e69fe095d0bb0a828208ed7aa1c2c0040ae5f66e Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 20 Jul 2024 18:17:39 +0100 Subject: gnu: go-github-com-tdewolff-test: Update to 1.0.10. * gnu/packages/golang-check.scm (go-github-com-tdewolff-test): Update to 1.0.10. Change-Id: Ib74ea6da165dd68ab3683979d5c461c8ddb4259c --- gnu/packages/golang-check.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm index bb7c0c7081..21019dcd27 100644 --- a/gnu/packages/golang-check.scm +++ b/gnu/packages/golang-check.scm @@ -926,7 +926,7 @@ Features include: (define-public go-github-com-tdewolff-test (package (name "go-github-com-tdewolff-test") - (version "1.0.9") + (version "1.0.10") (source (origin (method git-fetch) @@ -935,11 +935,11 @@ Features include: (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "10myz3zdkqmx37cvj507h7l2ncb0rq9shqvz9ggq1swijbsvazff")))) + (base32 "1ihlcnygwdgxq068b29d3n9n1gdbb2j03sc0al1qk5i5dkvgziyx")))) (build-system go-build-system) (arguments - (list #:import-path "github.com/tdewolff/test")) + (list + #:import-path "github.com/tdewolff/test")) (home-page "https://github.com/tdewolff/test") (synopsis "Go test helper functions") (description -- cgit v1.3 From 4731149db44ceb917bc34f6bc48197aa43251807 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 20 Jul 2024 18:19:30 +0100 Subject: gnu: go-go-etcd-io-gofail: Update to 0.2.0. * gnu/packages/golang-check.scm (go-go-etcd-io-gofail): Update to 0.2.0. Change-Id: I5114fd530216ece9a0462012226af2d83fc5fe83 --- gnu/packages/golang-check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm index 21019dcd27..b4e85349fb 100644 --- a/gnu/packages/golang-check.scm +++ b/gnu/packages/golang-check.scm @@ -1036,7 +1036,7 @@ under test) much simpler.") (define-public go-go-etcd-io-gofail (package (name "go-go-etcd-io-gofail") - (version "0.1.0") + (version "0.2.0") (source (origin (method git-fetch) @@ -1045,7 +1045,7 @@ under test) much simpler.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0jh0qjgfb2irshwj7an3lj0w9bv6c5gbnkdhisgpdr7x7hk682m1")))) + (base32 "0wxjaq1v5w0wjyv84af5cazrmv369i1416ar0dx8r9ag1szcfvpc")))) (build-system go-build-system) (arguments (list -- cgit v1.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') 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 @@ functions for writing tests in Go.") (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 @@ termination.") "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.3 From bfad718be86ff3df29053a151df07384048edb88 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 20 Jul 2024 19:56:24 +0100 Subject: gnu: go-go-uber-org-goleak: Update to 1.3.0. * gnu/packages/golang-check.scm (go-go-uber-org-goleak): Update to 1.3.0. Change-Id: I75bed5c4b6e5de457210fbdbfef530f926b81a9c --- gnu/packages/golang-check.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm index 8aaad3967c..9f7a72147b 100644 --- a/gnu/packages/golang-check.scm +++ b/gnu/packages/golang-check.scm @@ -1251,7 +1251,7 @@ gracefully enhance standard library testing package and behaviors of the (define-public go-go-uber-org-goleak (package (name "go-go-uber-org-goleak") - (version "1.2.0") + (version "1.3.0") (source (origin (method git-fetch) @@ -1260,8 +1260,7 @@ gracefully enhance standard library testing package and behaviors of the (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "1lpqw7ygffak8qki9i4vw8b99l25l8jrw8iwcplqsclk6fzkl24p")))) + (base32 "14rvkxh3znp9jzbdjqdkrly3zfg3rmhgg5845biqqrq17w8jvv5s")))) (build-system go-build-system) (arguments (list -- cgit v1.3 From 0d4b8d60dc9fc8992fcd9197587bad6851a54433 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 20 Jul 2024 20:09:25 +0100 Subject: gnu: go-github-com-go-test-deep: Update to 1.1.1. * gnu/packages/golang-check.scm (go-github-com-go-test-deep): Update to 1.1.1. Change-Id: Ic00f89bc7c55fb7f5353a734445a58693a29968f --- gnu/packages/golang-check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm index 9f7a72147b..18fb48147d 100644 --- a/gnu/packages/golang-check.scm +++ b/gnu/packages/golang-check.scm @@ -312,7 +312,7 @@ tests.") (define-public go-github-com-go-test-deep (package (name "go-github-com-go-test-deep") - (version "1.0.8") + (version "1.1.1") (source (origin (method git-fetch) @@ -321,7 +321,7 @@ tests.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1mmw2w3by7y24jjpjwmf2gfl08c65jihn3si9m0sswmagmdsk8q0")))) + (base32 "1vjzmd4gc3zr9hlpzhhq4g1d0k6rbhply10vdl49gvir4dzmzzrl")))) (build-system go-build-system) (arguments (list #:import-path "github.com/go-test/deep")) -- cgit v1.3 From 13e0dc141f5c248906bff856af2c71478a586e3e Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 20 Jul 2024 20:31:26 +0100 Subject: gnu: go-pgregory-net-rapid: Build with default go. * gnu/packages/golang-check.scm (go-pgregory-net-rapid): Fix indentation. [arguments]: <#:go>: Use default. <#:phases>: Add 'remove-failing-tests phase. Change-Id: I61a925255f806b712f35625e0fd9f1684e5d7a30 --- gnu/packages/golang-check.scm | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm index 18fb48147d..287a514ace 100644 --- a/gnu/packages/golang-check.scm +++ b/gnu/packages/golang-check.scm @@ -1361,16 +1361,23 @@ advanced Go linter.") (build-system go-build-system) (arguments (list - #:go go-1.18 - #:import-path "pgregory.net/rapid")) + #:import-path "pgregory.net/rapid" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'remove-failing-tests + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + ;; Remove test file failing on go-1.21, see + ;; . + (delete-file "strings_example_test.go"))))))) (home-page "https://pgregory.net/rapid/") (synopsis "Go property-based testing library") (description "@code{Rapid} is a Go library for property-based testing. -Rapid checks that properties you define hold for a large number of automatically -generated test cases. If a failure is found, rapid automatically minimizes the -failing test case before presenting it. +Rapid checks that properties you define hold for a large number of +automatically generated test cases. If a failure is found, rapid +automatically minimizes the failing test case before presenting it. Features: @itemize -- cgit v1.3 From acdc473e0fb2a1c849328f7f69a56823cc0a0056 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 21 Jul 2024 11:25:14 +0100 Subject: gnu: go-github-com-burntsushi-toml: Update to 1.4.0. * gnu/packages/golang-xyz.scm (go-github-com-burntsushi-toml): Update to 1.4.0. Change-Id: I1d8e50f09a31c9a642672b80e7430f9de2b77acc --- gnu/packages/golang-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index cf29278501..bbcc3583a5 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -1050,7 +1050,7 @@ indicator to any terminal application.") (define-public go-github-com-burntsushi-toml (package (name "go-github-com-burntsushi-toml") - (version "1.2.1") + (version "1.4.0") (source (origin (method git-fetch) @@ -1059,7 +1059,7 @@ indicator to any terminal application.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1v9czq4hsyvdz7yx70y6sgq77wmrgfmn09r9cj4w85z38jqnamv7")))) + (base32 "1vk0s7pcn80hkx0lcyws509gqs42c8y1rppv05zxiqj0yn2zrjnx")))) (build-system go-build-system) (arguments '(#:import-path "github.com/BurntSushi/toml")) -- cgit v1.3 From 294d3fde530b96a3871fa6b7a6821f09d9798010 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 21 Jul 2024 11:26:47 +0100 Subject: gnu: go-github-com-burntsushi-toml: Enable all tests. * gnu/packages/golang-xyz.scm (go-github-com-burntsushi-toml) [arguments]: <#:phases>: Use custom 'check phase. Change-Id: Ie0b76af157c7b8b7ddd18c934e79f895712cb365 --- gnu/packages/golang-xyz.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index bbcc3583a5..320b44565b 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -1062,7 +1062,16 @@ indicator to any terminal application.") (base32 "1vk0s7pcn80hkx0lcyws509gqs42c8y1rppv05zxiqj0yn2zrjnx")))) (build-system go-build-system) (arguments - '(#:import-path "github.com/BurntSushi/toml")) + (list + #:import-path "github.com/BurntSushi/toml" + #:phases + #~(modify-phases %standard-phases + ;; XXX: Replace when go-build-system supports nested path. + (replace 'check + (lambda* (#:key import-path tests? #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" "./...")))))))) (home-page "https://github.com/BurntSushi/toml") (synopsis "Toml parser and encoder for Go") (description -- cgit v1.3 From 4ac55d72594117b095a4774bb6fb287db7e6a32e Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 24 Jul 2024 22:09:01 +0100 Subject: gnu: Remove go-github-com-aws-sdk. * gnu/packages/golang-web.scm (go-github-com-aws-sdk): Delete variable. Change-Id: I5901914bc355c1eef472230646b2fbf69fa9650c --- gnu/packages/golang-web.scm | 30 ------------------------------ 1 file changed, 30 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 2b72cb3423..a73a3ac23b 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -227,36 +227,6 @@ the parse trees produced by the html package.") connections from a single physical connection.") (license license:expat))) -(define-public go-github-com-aws-sdk - (package - (name "go-github-com-aws-sdk") - (version "1.35.2") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/aws/aws-sdk-go") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1ky5lw2s2zpslnnqcs6hgsrwvwbxwgflb5jwf16dd4aga3vrg10c")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/aws/aws-sdk-go/aws" - #:unpack-path "github.com/aws/aws-sdk-go")) - (propagated-inputs - (list go-github-com-go-sql-driver-mysql - go-github-com-jmespath-go-jmespath - go-github-com-pkg-errors - go-golang-org-x-net)) - (home-page "https://github.com/aws/aws-sdk-go") - (synopsis "Library to access Amazon Web Services (AWS)") - (description - "This is the official AWS SDK for the Go programming language.") - (license license:asl2.0))) - -;; XXX: This package might be a duplicate of go-github-com-aws-sdk, it's not -;; in use anywhere. Keep it here for the farther review. (define-public go-github-com-aws-aws-sdk-go (package (name "go-github-com-aws-aws-sdk-go") -- cgit v1.3 From 265345083d73301a5bb8da62d69a5ffac3510ccc Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 24 Jul 2024 22:07:40 +0100 Subject: gnu: go-github-com-aws-aws-sdk-go: Update to 1.55.2. * gnu/packages/golang-web.scm (go-github-com-aws-aws-sdk-go): Update to 1.55.2. Change-Id: Iaa12eb287f3eef248733d78b437cfbf896f3436c --- gnu/packages/golang-web.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index a73a3ac23b..8fa7b39b4c 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -230,7 +230,7 @@ connections from a single physical connection.") (define-public go-github-com-aws-aws-sdk-go (package (name "go-github-com-aws-aws-sdk-go") - (version "1.36.18") + (version "1.55.2") (source (origin (method git-fetch) @@ -239,17 +239,17 @@ connections from a single physical connection.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "169mkkw1cff1px6326krwvfpfj07sb4y5rbn003gi4bk176h6ry9")))) + (base32 "0wsl1vcig3j9z6v2hppfr1bvrvbisck026fwq2a7yzmx36pwnj6a")))) (build-system go-build-system) + (arguments + (list + #:import-path "github.com/aws/aws-sdk-go")) (propagated-inputs (list go-github-com-jmespath-go-jmespath)) - (arguments - '(#:import-path "github.com/aws/aws-sdk-go" - #:phases %standard-phases)) + (home-page "https://github.com/aws/aws-sdk-go") (synopsis "The official AWS SDK for the Go programming language") (description "The official AWS SDK for the Go programming language.") - (home-page "https://github.com/aws/aws-sdk-go") (license license:asl2.0))) (define-public go-github-com-aws-aws-sdk-go-v2 -- cgit v1.3 From 1664dfa7b78f9d8e6cf891399b3b90350cc558b1 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 24 Jul 2024 22:20:08 +0100 Subject: gnu: go-github-com-aws-aws-sdk-go: Enable all tests. * gnu/packages/golang-web.scm (go-github-com-aws-aws-sdk-go): Enable all tests. [arguments]: <#:phases>: Add 'disable-failing-tests and use custom 'check phases. Change-Id: I732a4f0c1da8e431dd751aaa4a451f0b1a6656cb --- gnu/packages/golang-web.scm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 8fa7b39b4c..237823e26e 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -243,7 +243,22 @@ connections from a single physical connection.") (build-system go-build-system) (arguments (list - #:import-path "github.com/aws/aws-sdk-go")) + #:import-path "github.com/aws/aws-sdk-go" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'disable-failing-tests + (lambda* (#:key tests? import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (substitute* (find-files "." "\\_test.go$") + (("TestProcessProviderTimeout") + "OffTestProcessProviderTimeout"))))) + ;; XXX: Workaround for go-build-system's lack of Go modules + ;; support. + (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-jmespath-go-jmespath)) (home-page "https://github.com/aws/aws-sdk-go") -- cgit v1.3 From ef82e014740d05fb86f8b3c367d19a8cf31d39b5 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 21 Jul 2024 11:30:59 +0100 Subject: gnu: Add go-tomlv. * gnu/packages/golang-xyz.scm (go-tomlv): New variable. Change-Id: I2a95352302a0621dede1f67de766903482c610e2 --- gnu/packages/golang-xyz.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index 320b44565b..9c1385e584 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -5467,6 +5467,21 @@ tool.")))) "\nThis package provides an command line interface (CLI) tool.")))) +(define-public go-tomlv + (package + (inherit go-github-com-burntsushi-toml) + (name "go-tomlv") + (arguments + (list + #:install-source? #f + #:tests? #f ; no tests. + #:import-path "github.com/BurntSushi/toml/cmd/tomlv" + #:unpack-path "github.com/BurntSushi/toml")) + (description + (string-append (package-description go-github-com-burntsushi-toml) + " This package provides an command line interface (CLI) +tool.")))) + ;;; ;;; Avoid adding new packages to the end of this file. To reduce the chances ;;; of a merge conflict, place them above by existing packages with similar -- cgit v1.3 From fae1883b08c2324e884de6dba0649be3b8b5c09f Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 20 Jul 2024 19:54:22 +0100 Subject: gnu: scc: Update to 3.3.5. * gnu/packages/code.scm (scc): Update to 3.3.5. Change-Id: I17536f3de68bd124c07f1e1908607d248db75492 --- gnu/packages/code.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index 80070b3065..cfd62e2402 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -390,7 +390,7 @@ cloc can handle a greater variety of programming languages.") (define-public scc (package (name "scc") - (version "3.1.0") + (version "3.3.5") (source (origin (method git-fetch) @@ -399,7 +399,7 @@ cloc can handle a greater variety of programming languages.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1rkkfg6jimlc2rkajk6ypd5v0m3zai25ga5idz2pmkmzakv82n21")))) + (base32 "0fvp9ab65vwn3dn0wm8l63rrp5fz1gpymcxs8yr0h4s5zmrsg9zf")))) (build-system go-build-system) (arguments (list -- cgit v1.3 From 15a1f441846fd6b4de74bd7c092d16912c0690cd Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 20 Jul 2024 20:34:46 +0100 Subject: gnu: nebula: Update to 1.9.3. * gnu/packages/networking.scm (nebula): Update to 1.9.3. Change-Id: Idf59d25df50fd0e37812d003db7b06dff74e3af3 --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 91aaccf06d..8b93aaf443 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -4702,7 +4702,7 @@ IPv6 Internet connectivity - it also works over IPv4.") (define-public nebula (package (name "nebula") - (version "1.8.2") + (version "1.9.3") (source (origin (method git-fetch) (uri (git-reference @@ -4711,7 +4711,7 @@ IPv6 Internet connectivity - it also works over IPv4.") (file-name (git-file-name name version)) (sha256 (base32 - "0ly1axgmskrkmxhzymqis6gxf2wd7rvhycm94wfb8k0hirndvg5m")) + "08zzbx2v713zd9p7i4kd1bvcw47xb0092p5apba1x5wg6fpxw5zr")) ;; Remove windows-related binary blobs and files (snippet #~(begin -- cgit v1.3 From a156b3d2f72933ec69b56277313ea2919f44f2f1 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 20 Jul 2024 20:45:01 +0100 Subject: gnu: Add packages/prometheus module. * gnu/packages/prometheus.scm: New file. * gnu/local.mk: Add gnu/packages/prometheus.scm to the scope. Change-Id: Ie291afe3b4470c1681d3d77e62ffe2ee090d3a54 --- gnu/local.mk | 1 + gnu/packages/prometheus.scm | 46 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 gnu/packages/prometheus.scm (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index df4e32add7..3fbe6633c0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -540,6 +540,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/printers.scm \ %D%/packages/profiling.scm \ %D%/packages/prolog.scm \ + %D%/packages/prometheus.scm \ %D%/packages/pth.scm \ %D%/packages/pulseaudio.scm \ %D%/packages/pumpio.scm \ diff --git a/gnu/packages/prometheus.scm b/gnu/packages/prometheus.scm new file mode 100644 index 0000000000..e898602ea0 --- /dev/null +++ b/gnu/packages/prometheus.scm @@ -0,0 +1,46 @@ +;;; GNU Guix --- Functional package management for GNU +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages prometheus) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix build-system go) + #:use-module (guix gexp) + #:use-module (guix git-download) + #:use-module (guix packages) + #:use-module (gnu packages)) + +;;; Commentary: +;;; +;;; Libraries and commands related to, or provided by Prometheus project +;;; . +;;; +;;; Please: Try to add new module packages in alphabetic order. +;;; +;;; Code: + +;;; +;;; Libraries: +;;; + +;;; +;;; Executables: +;;; + +;;; +;;; Avoid adding new packages to the end of this file. To reduce the chances +;;; of a merge conflict, place them above in alphabetic order. +;;; -- cgit v1.3 From 2a8637107c084f121f45e76c16680d123646eab7 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 21 Jul 2024 11:34:30 +0100 Subject: gnu: go-github-com-prometheus-client-model: Update to 0.6.1. * gnu/packages/golang-xyz.scm (go-github-com-prometheus-client-model): Update to 0.6.1. Change-Id: I1bcc2a57e45c9111eccc2788fd7cfa9c219f6db9 --- gnu/packages/golang-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index 9c1385e584..4749fd5698 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -4235,7 +4235,7 @@ Pion}.") (define-public go-github-com-prometheus-client-model (package (name "go-github-com-prometheus-client-model") - (version "0.5.0") + (version "0.6.1") (source (origin (method git-fetch) @@ -4244,7 +4244,7 @@ Pion}.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1pl9i969jx5vkhm8vd5vb8yrifv37aw6h8mjg04820pw0ygfbigy")))) + (base32 "0g1q2szzwp4rwkvayi2mnq2nwj6hj4ja7j43vwyi1iaz6d9z505c")))) (build-system go-build-system) (arguments '(#:import-path "github.com/prometheus/client_model" -- cgit v1.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') 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 @@ Pion}.") "@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 @@ #: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 @@ #: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 @@ #: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 @@ ;;; 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.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') 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 @@ storing only one copy of each unique string in memory. All functions may be 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 @@ developed by the Go team. It provides IDE features to any LSP-compatible 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.3 From 44396204d6e7bec4df71a4307336ef161c1a0cce Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 24 Jul 2024 16:20:43 +0100 Subject: gnu: go-github-com-jpillora-backoff: Update to 1.0.0-1.fab01a9. * gnu/packages/golang-xyz.scm (go-github-com-jpillora-backoff): Update to 1.0.0-1.fab01a9. Change-Id: Ied4eea21571324e694ccb4cfb4a7c5ba0b2c8ab9 --- gnu/packages/golang-xyz.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index 171ad06462..58840f4046 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -2766,12 +2766,11 @@ called concurrently with themselves and each other.") (license license:expat))) (define-public go-github-com-jpillora-backoff - (let ((commit - "06c7a16c845dc8e0bf575fafeeca0f5462f5eb4d") - (revision "0")) + (let ((commit "fab01a9d9810a410d2d95a0a697f0afb604658f9") + (revision "1")) (package (name "go-github-com-jpillora-backoff") - (version (git-version "0.0.0" revision commit)) + (version (git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -2780,7 +2779,7 @@ called concurrently with themselves and each other.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "0xhvxr7bm47czdc5hy3kl508z3y4j91i2jm7vg774i52zych6k4l")))) + (base32 "0irpxdjvwmfd1njvws5x466ar8faiwjnnna26jnly9sw1b0h1b89")))) (build-system go-build-system) (arguments (list -- cgit v1.3 From c8e9ee9c47690327ea8cde92bb6109eaf33a5fcb Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 24 Jul 2024 16:30:35 +0100 Subject: gnu: Add go-github-com-munnerz-goautoneg. * gnu/packages/golang-web.scm (go-github-com-munnerz-goautoneg): New variable. Change-Id: I0e5827d19f49d8c45b2ae6e4ac7300742cf053cf --- gnu/packages/golang-web.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 237823e26e..b12018bd34 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -1897,6 +1897,30 @@ multistream-select protocol. The protocol is defined at @url{https://github.com/multiformats/multistream-select}") (license license:expat))) +(define-public go-github-com-munnerz-goautoneg + (package + (name "go-github-com-munnerz-goautoneg") + (version "0.0.0-20191010083416-a7dc8b61c822") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/munnerz/goautoneg") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1m4v6bw6yf1g0kvpc46isjp0qfhx2y8gnvlnyjf637jy64613mgg")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/munnerz/goautoneg")) + (home-page "https://github.com/munnerz/goautoneg") + (synopsis "HTTP Content-Type Autonegotiation") + (description + "This package implements @url{https://rfc-editor.org/rfc/rfc2616.html,RFC +2616} HTTP/1.1 standard.") + (license license:bsd-3))) + (define-public go-github-com-nwidger-jsoncolor (package (name "go-github-com-nwidger-jsoncolor") -- cgit v1.3 From e331cfa3e6c0e38a641de5ecf36e22199cd0341d Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 24 Jul 2024 16:37:03 +0100 Subject: gnu: Add go-github-com-mwitkow-go-conntrack. * gnu/packages/prometheus.scm (go-github-com-mwitkow-go-conntrack): New variable. Change-Id: I874b96a61ee116fee435e3817d84802fa48eacfe --- gnu/packages/prometheus.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/prometheus.scm b/gnu/packages/prometheus.scm index 6ab034c20a..997cf4e503 100644 --- a/gnu/packages/prometheus.scm +++ b/gnu/packages/prometheus.scm @@ -24,7 +24,11 @@ #:use-module (guix git-download) #:use-module (guix packages) #:use-module (gnu packages) - #:use-module (gnu packages golang-build)) + #:use-module (gnu packages golang) + #:use-module (gnu packages golang-build) + #:use-module (gnu packages golang-check) + #:use-module (gnu packages golang-web) + #:use-module (gnu packages golang-xyz)) ;;; Commentary: ;;; @@ -39,6 +43,48 @@ ;;; Libraries: ;;; +(define-public go-github-com-mwitkow-go-conntrack + (package + (name "go-github-com-mwitkow-go-conntrack") + (version "0.0.0-20190716064945-2f068394615f") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mwitkow/go-conntrack") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0ymjmy12ks7smgwmrwsa5kf07d9w5kpk1dn650azlzr61b561aw7")))) + (build-system go-build-system) + (arguments + (list + #:tests? #f + #:import-path "github.com/mwitkow/go-conntrack" + #:phases + #~(modify-phases %standard-phases + ;; Breaking cycle: + ;; go-github-com-prometheus-common -> + ;; go-github-com-prometheus-client-golang -> + ;; go-github-com-mwitkow-go-conntrack -> + ;; go-github-com-prometheus-common + (delete 'build)))) + (native-inputs + (list go-github-com-stretchr-testify)) + (propagated-inputs + (list go-github-com-jpillora-backoff + go-github-com-munnerz-goautoneg + ;; go-github-com-prometheus-client-golang + go-golang-org-x-net)) + (home-page "https://github.com/mwitkow/go-conntrack") + (synopsis "Go middleware for @code{net.Conn} tracking") + (description + "@url{https://prometheus.io/,Prometheus} monitoring and +@url{https://godoc.org/golang.org/x/net/trace#@code{EventLog,(code} +x/net/trace)} tracing wrappers @code{net.Conn}, both inbound +(@@code{net.Listener}) and outbound (@@code{net.Dialer}).") + (license license:asl2.0))) + (define-public go-github-com-prometheus-client-model (package (name "go-github-com-prometheus-client-model") -- cgit v1.3 From fbdf5b76a70c28dcaa80f81b569b5bf21560d374 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 24 Jul 2024 17:01:46 +0100 Subject: gnu: Add go-github-com-go-logfmt-logfmt. * gnu/packages/golang-xyz.scm (go-github-com-go-logfmt-logfmt): New variable. Change-Id: I3bf4d8405b9ec61e811ab88c6a67098feac36a72 --- gnu/packages/golang-xyz.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index 58840f4046..3e248a571a 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -2017,6 +2017,33 @@ Differentiation between text and binary files}. @end itemize") (license license:expat))) +(define-public go-github-com-go-logfmt-logfmt + (package + (name "go-github-com-go-logfmt-logfmt") + (version "0.6.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/go-logfmt/logfmt") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0s3dz7z5a8p5ia5czihy5y2hkij7rdfyr425sw9rnxqil3d0dlj6")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/go-logfmt/logfmt")) + (home-page "https://github.com/go-logfmt/logfmt") + (synopsis "Marshal and unmarshal logfmt messages") + (description + "Package logfmt implements utilities to marshal and unmarshal data in the +logfmt format. The logfmt format records key/value pairs in a way that +balances readability for humans and simplicity of computer parsing. It is +most commonly used as a more human friendly alternative to JSON for structured +logging.") + (license license:expat))) + (define-public go-github-com-go-logr-logr (package (name "go-github-com-go-logr-logr") -- cgit v1.3 From 76f1290a388a7f525458b0f37a9e14aa396f302d Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 24 Jul 2024 17:04:24 +0100 Subject: gnu: Add go-github-com-go-kit-log. * gnu/packages/golang-xyz.scm (go-github-com-go-kit-log): New variable. Change-Id: Icc42de8b129ea3c9e69eaa77e1d5e6f838b460ec --- gnu/packages/golang-xyz.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index 3e248a571a..82b9fa59d5 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -2017,6 +2017,34 @@ Differentiation between text and binary files}. @end itemize") (license license:expat))) +(define-public go-github-com-go-kit-log + (package + (name "go-github-com-go-kit-log") + (version "0.2.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/go-kit/log") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1xjv2g1cd1iaghhm1c1zw0lcz89a9zq5xradyjipvrbqxbxckqm6")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/go-kit/log")) + (propagated-inputs + (list go-github-com-go-logfmt-logfmt)) + (home-page "https://github.com/go-kit/log") + (synopsis "Minimal and extensible structured logger") + (description + "This package provides a minimal interface for structured logging in +services. It may be wrapped to encode conventions, enforce type-safety, +provide leveled logging, and so on. It can be used for both typical +application log events, and log-structured data streams.") + (license license:expat))) + (define-public go-github-com-go-logfmt-logfmt (package (name "go-github-com-go-logfmt-logfmt") -- cgit v1.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') 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 @@ formatting information, rather than the current locale name.") (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.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') 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 @@ formatting information, rather than the current locale name.") (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 @@ formatting information, rather than the current locale name.") (file-name (git-file-name name version)) (sha256 (base32 - "006y6mlxglr2xzmdqxl5bwh899whfx1prcgjai7qhhs5ys5dspy5")) + "0bsbxil7qz8rhckhv0844nmn38g7i7347cjv5m6na47hbdpi0rqh")) (modules '((guix build utils))) (snippet #~(begin @@ -7380,10 +7380,20 @@ formatting information, rather than the current locale name.") (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.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') 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 @@ formatting information, rather than the current locale name.") (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.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') 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 @@ system.") 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 @@ x/net/trace)} tracing wrappers @code{net.Conn}, both inbound "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.3 From 310643fbaaee1d8678b8ca796f76da6db3cbc7a9 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 24 Jul 2024 21:50:23 +0100 Subject: gnu: Add go-github-com-prometheus-common-assets. * gnu/packages/prometheus.scm (go-github-com-prometheus-common-assets): New variable. Change-Id: I75e9cea67883076d20aef6be5f144397bd4da4f8 --- gnu/packages/prometheus.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/prometheus.scm b/gnu/packages/prometheus.scm index 843d5fa604..717a5546f1 100644 --- a/gnu/packages/prometheus.scm +++ b/gnu/packages/prometheus.scm @@ -183,6 +183,30 @@ x/net/trace)} tracing wrappers @code{net.Conn}, both inbound metrics.") (license license:asl2.0))) +(define-public go-github-com-prometheus-common-assets + (package + (name "go-github-com-prometheus-common-assets") + (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")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/prometheus/common/assets" + #:unpack-path "github.com/prometheus/common")) + (home-page "https://github.com/prometheus/common") + (synopsis "Prometheus assets") + (description + "This package provides Prometheus assets.") + (license license:asl2.0))) + ;;; ;;; Executables: ;;; -- cgit v1.3 From e654b7f9376689f6316cfe41a036ac3ba93cfd7c Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 24 Jul 2024 22:07:40 +0100 Subject: gnu: Add go-github-com-prometheus-common-sigv4. * gnu/packages/prometheus.scm (go-github-com-prometheus-common-sigv4): New variable. Change-Id: Id023eec48d48f53b70882809fad139362a48803c --- gnu/packages/prometheus.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/prometheus.scm b/gnu/packages/prometheus.scm index 717a5546f1..5ec4fe0b12 100644 --- a/gnu/packages/prometheus.scm +++ b/gnu/packages/prometheus.scm @@ -207,6 +207,44 @@ metrics.") "This package provides Prometheus assets.") (license license:asl2.0))) +(define-public go-github-com-prometheus-common-sigv4 + (package + (name "go-github-com-prometheus-common-sigv4") + (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")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/prometheus/common/sigv4" + #:unpack-path "github.com/prometheus/common" + #:phases + #~(modify-phases %standard-phases + (add-before 'unpack 'override-prometheus-common + (lambda _ + (delete-file-recursively "src/github.com/prometheus/common")))))) + (native-inputs + (list go-github-com-stretchr-testify)) + (propagated-inputs + (list go-github-com-aws-aws-sdk-go + go-github-com-prometheus-client-golang + go-github-com-prometheus-common + go-gopkg-in-yaml-v2)) + (home-page "https://github.com/prometheus/common") + (synopsis "HTTP signed requests with Amazon's Signature Verification V4") + (description + "This package provides a @code{http.RoundTripper} that will sign requests +using Amazon's Signature Verification V4 signing procedure, using credentials +from the default AWS credential chain.") + (license license:asl2.0))) + ;;; ;;; Executables: ;;; -- cgit v1.3 From 493da0697bd807864213dfeef3c0bbf088499ba4 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 24 Jul 2024 23:22:11 +0100 Subject: gnu: go-github-com-beorn7-perks-quantile: Rename variable. * gnu/packages/golang-xyz.scm (go-github-com-beorn7-perks-quantile): Rename to go-github-com-beorn7-perks to reflect go.mod import path. [arguments]: <#phases>: Use custom 'check phase, delete 'build phase. Change-Id: Iae8e39e2e2f2929002e2382fde297b6282bca070 --- gnu/packages/golang-xyz.scm | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index 82b9fa59d5..f131499766 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -872,9 +872,9 @@ interface around the standard library's @code{time} package so that the applicat can use the realtime clock while tests can use the mock clock.") (license license:expat))) -(define-public go-github-com-beorn7-perks-quantile +(define-public go-github-com-beorn7-perks (package - (name "go-github-com-beorn7-perks-quantile") + (name "go-github-com-beorn7-perks") (version "1.0.1") (source (origin @@ -887,8 +887,17 @@ can use the realtime clock while tests can use the mock clock.") (base32 "17n4yygjxa6p499dj3yaqzfww2g7528165cl13haj97hlx94dgl7")))) (build-system go-build-system) (arguments - (list #:import-path "github.com/beorn7/perks/quantile" - #:unpack-path "github.com/beorn7/perks")) + (list + #:import-path "github.com/beorn7/perks" + #: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" "./...")))))))) (home-page "https://github.com/beorn7/perks") (synopsis "Compute approximate quantiles over an unbounded data stream") (description -- cgit v1.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') 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 @@ Architecture Processors\" by J. Guilford et al.") (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 @@ friendly sizes. It converts boring ugly numbers to human-friendly strings and 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.3 From b167bab9a1040fad0477c4bffc728e5b36837fd5 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 24 Jul 2024 23:28:51 +0100 Subject: gnu: go-github-com-cespare-xxhash: Rename variable. * gnu/packages/golang-crypto.scm (go-github-com-cespare-xxhash): Rename to go-github-com-cespare-xxhash-v2 to reflect go.mod import path. * gnu/packages/golang-xyz.scm (go-github-com-coocood-freecache) [propagated-inputs]: Remove go-github-com-cespare-xxhash, add go-github-com-cespare-xxhash-v2. * gnu/packages/networking.scm (nebula) [native-inputs]: Remove go-github-com-cespare-xxhash, add go-github-com-cespare-xxhash-v2. * gnu/packages/textutils.scm (csvdiff): Likewise. Change-Id: I4d26cea51178d25962933ff6f19f0afafef61d6d --- gnu/packages/golang-crypto.scm | 6 +++--- gnu/packages/golang-xyz.scm | 2 +- gnu/packages/networking.scm | 2 +- gnu/packages/textutils.scm | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm index e89c486bcc..8783c19443 100644 --- a/gnu/packages/golang-crypto.scm +++ b/gnu/packages/golang-crypto.scm @@ -355,9 +355,9 @@ needing to use secp256k1 elliptic curve cryptography.") the Ristretto prime-order group built from Edwards25519.") (license license:expat))) -(define-public go-github-com-cespare-xxhash +(define-public go-github-com-cespare-xxhash-v2 (package - (name "go-github-com-cespare-xxhash") + (name "go-github-com-cespare-xxhash-v2") (version "2.1.2") (source (origin @@ -373,7 +373,7 @@ the Ristretto prime-order group built from Edwards25519.") (build-system go-build-system) (arguments (list - #:import-path "github.com/cespare/xxhash" + #:import-path "github.com/cespare/xxhash/v2" #:phases #~(modify-phases %standard-phases (replace 'check diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index f131499766..8324a2f568 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -1237,7 +1237,7 @@ levels that works by wrapping the standard @code{log} library.") (arguments (list #:import-path "github.com/coocood/freecache")) - (propagated-inputs (list go-github-com-cespare-xxhash)) + (propagated-inputs (list go-github-com-cespare-xxhash-v2)) (home-page "https://github.com/coocood/freecache") (synopsis "Caching library for Go") (description diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 64587ed3e1..c1c609cef9 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -4750,7 +4750,7 @@ IPv6 Internet connectivity - it also works over IPv4.") (list go-dario-cat-mergo go-github-com-anmitsu-go-shlex go-github-com-armon-go-radix - go-github-com-cespare-xxhash + go-github-com-cespare-xxhash-v2 go-github-com-cyberdelia-go-metrics-graphite go-github-com-flynn-noise go-github-com-gogo-protobuf diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 7deea364d8..0b77a24d23 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -1589,7 +1589,7 @@ files for valid UTF-8 use and to report which line endings they use.") #:install-source? #f #:import-path "github.com/aswinkarthik/csvdiff")) (native-inputs - (list go-github-com-cespare-xxhash + (list go-github-com-cespare-xxhash-v2 go-github-com-fatih-color go-github-com-spf13-afero go-github-com-spf13-cobra -- cgit v1.3 From a56bb2142ae61b6f60aa21091aa9bca939fa431e Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 25 Jul 2024 19:08:58 +0100 Subject: gnu: Add go-github-com-cespare-xxhash. * gnu/packages/golang-crypto.scm (go-github-com-cespare-xxhash): New variable. (go-github-com-cespare-xxhash-v2): Inherit from go-github-com-cespare-xxhash. Change-Id: I2fd831ecd91729a87bbe204dda42841cb05abb69 --- gnu/packages/golang-crypto.scm | 35 +++++++++++++++++++++++++++++------ 1 file changed, 29 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm index 8783c19443..cb760227e8 100644 --- a/gnu/packages/golang-crypto.scm +++ b/gnu/packages/golang-crypto.scm @@ -355,8 +355,36 @@ needing to use secp256k1 elliptic curve cryptography.") the Ristretto prime-order group built from Edwards25519.") (license license:expat))) +(define-public go-github-com-cespare-xxhash + (package + (name "go-github-com-cespare-xxhash") + (version "1.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cespare/xxhash") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1qyzlcdcayavfazvi03izx83fvip8h36kis44zr2sg7xf6sx6l4x")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/cespare/xxhash")) + (propagated-inputs + (list go-github-com-spaolacci-murmur3 + go-github-com-oneofone-xxhash)) + (home-page "https://github.com/cespare/xxhash") + (synopsis "Go implementation of xxHash") + (description + "Package xxhash implements the 64-bit variant of @code{xxHash} (XXH64) as +described at @url{https://xxhash.com/}.") + (license license:expat))) + (define-public go-github-com-cespare-xxhash-v2 (package + (inherit go-github-com-cespare-xxhash) (name "go-github-com-cespare-xxhash-v2") (version "2.1.2") (source @@ -370,7 +398,6 @@ the Ristretto prime-order group built from Edwards25519.") (base32 "1f3wyr9msnnz94szrkmnfps9wm40s5sp9i4ak0kl92zcrkmpy29a")) (modules '((guix build utils))) (snippet '(delete-file-recursively "xxhashbench")))) - (build-system go-build-system) (arguments (list #:import-path "github.com/cespare/xxhash/v2" @@ -382,11 +409,7 @@ the Ristretto prime-order group built from Edwards25519.") ;; The tests fail when run with gccgo. (false-if-exception (search-input-file inputs "/bin/gccgo")) (apply (assoc-ref %standard-phases 'check) args))))))) - (home-page "https://github.com/cespare/xxhash/") - (synopsis "Go implementation of xxHash") - (description "This package provides of Go implementation of the 64-bit -xxHash algorithm (XXH64).") - (license license:expat))) + (propagated-inputs '()))) (define-public go-github-com-chmduquesne-rollinghash (let ((commit "9a5199be7309f50c496efc87d29bd08788605ae7") -- cgit v1.3 From a5dde9851786198fe8eacd6b65b0adc1d3616db9 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 25 Jul 2024 19:33:19 +0100 Subject: gnu: csvdiff: Adjust inputs * gnu/packages/textutils.scm (csvdiff): Adjust inputs after package rename. [native-inputs]: Remove go-github-com-cespare-xxhash-v2; add go-github-com-cespare-xxhash. Change-Id: I241f54a7c15ca6a36d84fa2bc4c8a3120e0952fb --- gnu/packages/textutils.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 0b77a24d23..7deea364d8 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -1589,7 +1589,7 @@ files for valid UTF-8 use and to report which line endings they use.") #:install-source? #f #:import-path "github.com/aswinkarthik/csvdiff")) (native-inputs - (list go-github-com-cespare-xxhash-v2 + (list go-github-com-cespare-xxhash go-github-com-fatih-color go-github-com-spf13-afero go-github-com-spf13-cobra -- cgit v1.3 From 7c27315ac60a9c97445b48513a9cd3ac19470798 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 25 Jul 2024 20:59:26 +0100 Subject: gnu: kubo: Add missing input. * gnu/packages/ipfs.scm (kubo) [inputs]: Add go-github-com-cespare-xxhash. Change-Id: I0d3230e6a31245ec7f4cda7ed6b9db6e4cac3794 --- gnu/packages/ipfs.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm index 887654ec28..ea3514afa9 100644 --- a/gnu/packages/ipfs.scm +++ b/gnu/packages/ipfs.scm @@ -1135,6 +1135,7 @@ written in Go.") ;; available. ;; go-github-com-alecthomas-units ; github.com/ipfs/boxo + go-github-com-cespare-xxhash go-github-com-docker-go-units ; github.com/containerd/cgroups go-github-com-felixge-httpsnoop ; go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp go-github-com-flynn-noise ; github.com/libp2p/go-libp2p -- cgit v1.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') 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 @@ system, kernel, and process metrics from the @file{/proc} pseudo file system.") (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 @@ system, kernel, and process metrics from the @file{/proc} pseudo file system.") (file-name (git-file-name name version)) (sha256 (base32 - "1v8vdvi9wlpf18nxi62diysfnh9gc3c3cqq6hvx378snsvvl6n82")))) + "0mx5q221pbkx081ycf1lp8sxz513220ya8qczkkvab943cwlcarv")))) (build-system go-build-system) (arguments '(#:tests? #f @@ -7397,12 +7397,15 @@ system, kernel, and process metrics from the @file{/proc} pseudo file system.") ;; 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.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') 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 @@ system, kernel, and process metrics from the @file{/proc} pseudo file system.") "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.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') 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 @@ #: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 @@ #: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 @@ 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-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 @@ #: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 @@ #: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 @@ #: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 @@ x/net/trace)} tracing wrappers @code{net.Conn}, both inbound (@@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 @@ #: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.3 From acd5ffa629edbf84a123ce754b1d74ffad4ecea0 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 25 Jul 2024 10:38:22 +0100 Subject: gnu: go-github-com-nbrownus-go-metrics-prometheus: Move to prometheus. * gnu/packages/golang-xyz.scm (go-github-com-nbrownus-go-metrics-prometheus): Move from here ... * gnu/packages/prometheus.scm: ... to here. Change-Id: I02393dd3620d7c194c4bbba6404e5c0150f8448a --- gnu/packages/golang-xyz.scm | 33 --------------------------------- gnu/packages/prometheus.scm | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 33 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index 7d6b3a1c1d..b1df96b87c 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -72,7 +72,6 @@ #: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: @@ -3946,38 +3945,6 @@ varints.") very fast, and tries to be entropy pool friendly.") (license license:asl2.0))) -(define-public go-github-com-nbrownus-go-metrics-prometheus - (package - (name "go-github-com-nbrownus-go-metrics-prometheus") - (version "0.0.0-20210712211119-974a6260965f") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/nbrownus/go-metrics-prometheus") - (commit (go-version->git-ref version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1kl9l08aas544627zmhkgp843qx94sxs4inxm20nw1hx7gp79dz0")))) - (build-system go-build-system) - (arguments - (list - ;; The project looks abandoned, tests failed with a new go-metrics. - #:tests? #f - #:import-path "github.com/nbrownus/go-metrics-prometheus")) - (native-inputs - (list go-github-com-stretchr-testify)) - (propagated-inputs - (list go-github-com-prometheus-client-golang - go-github-com-rcrowley-go-metrics)) - (home-page "https://github.com/nbrownus/go-metrics-prometheus") - (synopsis "Prometheus support for go-metrics") - (description - "This package provides a reporter for the @code{go-metrics} library which -posts the metrics to the Prometheus client registry and just updates the -registry.") - (license license:asl2.0))) - (define-public go-github-com-neurosnap-sentences (package (name "go-github-com-neurosnap-sentences") diff --git a/gnu/packages/prometheus.scm b/gnu/packages/prometheus.scm index 860bb74017..c61d107234 100644 --- a/gnu/packages/prometheus.scm +++ b/gnu/packages/prometheus.scm @@ -2,7 +2,9 @@ ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2018, 2019, 2020 Leo Famulari ;;; Copyright © 2021 Sarah Morgensen +;;; Copyright © 2024 Dominic Martinez ;;; Copyright © 2024 Jesse Eisses +;;; Copyright © 2024 Sharlatan Hellseher ;;; ;;; This file is part of GNU Guix. ;;; @@ -88,6 +90,39 @@ x/net/trace)} tracing wrappers @code{net.Conn}, both inbound (@@code{net.Listener}) and outbound (@@code{net.Dialer}).") (license license:asl2.0))) +(define-public go-github-com-nbrownus-go-metrics-prometheus + (package + (name "go-github-com-nbrownus-go-metrics-prometheus") + (version "0.0.0-20210712211119-974a6260965f") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/nbrownus/go-metrics-prometheus") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1kl9l08aas544627zmhkgp843qx94sxs4inxm20nw1hx7gp79dz0")))) + (build-system go-build-system) + (arguments + (list + ;; The project looks abandoned, tests failed with a new go-metrics, see + ;; . + #:tests? #f + #:import-path "github.com/nbrownus/go-metrics-prometheus")) + (native-inputs + (list go-github-com-stretchr-testify)) + (propagated-inputs + (list go-github-com-prometheus-client-golang + go-github-com-rcrowley-go-metrics)) + (home-page "https://github.com/nbrownus/go-metrics-prometheus") + (synopsis "Prometheus support for go-metrics") + (description + "This package provides a reporter for the @code{go-metrics} library which +posts the metrics to the Prometheus client registry and just updates the +registry.") + (license license:asl2.0))) + (define-public go-github-com-prometheus-client-golang (package (name "go-github-com-prometheus-client-golang") -- cgit v1.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') 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 @@ formatting information, rather than the current locale name.") (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 @@ formatting information, rather than the current locale name.") (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.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') 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 @@ #: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 @@ system.") 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 @@ #: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 @@ using Amazon's Signature Verification V4 signing procedure, using credentials 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.3 From efdef61831e543bb63d0fc4abbc4b93d5ac8097e Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 25 Jul 2024 21:17:48 +0100 Subject: gnu: go-github-com-hjson-hjson-go: Update to 4.4.0. * gnu/packages/golang-web.scm (go-github-com-hjson-hjson-go): Update to 4.4.0. Change-Id: Ie2e9abd927681c399a16300a2a4fba9d04b1192f --- gnu/packages/golang-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index b12018bd34..629af677d9 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -1382,7 +1382,7 @@ with other clients.") (define-public go-github-com-hjson-hjson-go (package (name "go-github-com-hjson-hjson-go") - (version "4.3.1") + (version "4.4.0") (source (origin (method git-fetch) @@ -1391,7 +1391,7 @@ with other clients.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "138vmbnrwzxf64cia27k407clrydvs2jx927dlv6ziydiqyvy7m3")))) + (base32 "1d4b2hpqsnzbmfhgxq15hd19rjr5hydjmpblrh5yzfgx9z3cz2by")))) (build-system go-build-system) (arguments '(#:import-path "github.com/hjson/hjson-go")) -- cgit v1.3 From 734bf6bf02494e75808404c63b4c4f6384835f8a Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 25 Jul 2024 21:26:19 +0100 Subject: gnu: go-github-com-hjson-hjson-go: Rename variable. * gnu/packages/golang-web.scm (go-github-com-hjson-hjson-go): Rename variable to go-github-com-hjson-hjson-go-v4 to reflect go.mod import path. Apply new package style. * gnu/packages/networking.scm (yggdrasil) [propagated-inputs]: Remove go-github-com-hjson-hjson-go, add go-github-com-hjson-hjson-go-v4. * gnu/packages/uucp.scm (nncp) [propagated-inputs]: Remove go-github-com-hjson-hjson-go, add go-github-com-hjson-hjson-go-v4. Change-Id: I9e99f208feaf535d9946e11dff09a81fc4a01a7a --- gnu/packages/golang-web.scm | 14 ++++++++------ gnu/packages/networking.scm | 3 +-- gnu/packages/uucp.scm | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 629af677d9..e697fd716f 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -1379,9 +1379,9 @@ the Go standard library, but returns a client that does not share any state with other clients.") (license license:mpl2.0))) -(define-public go-github-com-hjson-hjson-go +(define-public go-github-com-hjson-hjson-go-v4 (package - (name "go-github-com-hjson-hjson-go") + (name "go-github-com-hjson-hjson-go-v4") (version "4.4.0") (source (origin @@ -1394,12 +1394,14 @@ with other clients.") (base32 "1d4b2hpqsnzbmfhgxq15hd19rjr5hydjmpblrh5yzfgx9z3cz2by")))) (build-system go-build-system) (arguments - '(#:import-path "github.com/hjson/hjson-go")) + (list + #:import-path "github.com/hjson/hjson-go/v4")) (home-page "https://hjson.org/") (synopsis "Human JSON implementation for Go") - (description "Hjson is a syntax extension to JSON. It is intended to be -used like a user interface for humans, to read and edit before passing the -JSON data to the machine.") + (description + "Hjson is a syntax extension to JSON. It is intended to be used like a +user interface for humans, to read and edit before passing the JSON data to +the machine.") (license license:expat))) (define-public go-github-com-jackpal-gateway diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index c1c609cef9..efd2864c30 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -4658,14 +4658,13 @@ QUIC protocol.") go-github-com-bits-and-blooms-bitset go-github-com-bits-and-blooms-bloom go-github-com-quic-go-quic-go - go-github-com-hjson-hjson-go + go-github-com-hjson-hjson-go-v4 go-github-com-olekukonko-tablewriter go-github-com-mitchellh-mapstructure go-github-com-mattn-go-runewidth go-github-com-mattn-go-isatty go-github-com-mattn-go-colorable go-github-com-kardianos-minwinsvc - go-github-com-hjson-hjson-go go-github-com-hashicorp-go-syslog go-github-com-gologme-log go-github-com-fatih-color diff --git a/gnu/packages/uucp.scm b/gnu/packages/uucp.scm index d8eb17111d..34de6bdec9 100644 --- a/gnu/packages/uucp.scm +++ b/gnu/packages/uucp.scm @@ -149,7 +149,7 @@ between computers.") go-github-com-dustin-go-humanize go-github-com-flynn-noise go-github-com-gorhill-cronexpr - go-github-com-hjson-hjson-go + go-github-com-hjson-hjson-go-v4 go-github-com-klauspost-compress go-golang-org-x-crypto go-golang-org-x-net -- cgit v1.3 From f6ed91c6407ef494503d82a2c784ca0cb62fc906 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 25 Jul 2024 21:35:44 +0100 Subject: gnu: go-netns: Update to 0.0.4. * gnu/packages/networking.scm (go-netns): Update to 0.0.4. [propagated-inputs]: Add go-golang-org-x-sys. Change-Id: I5af9f1d6e10454435ededae9c3f002f7445f2418 --- gnu/packages/networking.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index efd2864c30..abd5c6dc24 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1918,29 +1918,29 @@ virtual machines, and certificates.") (license license:gpl3+))) (define-public go-netns - (let ((commit "13995c7128ccc8e51e9a6bd2b551020a27180abd") - (revision "1")) (package (name "go-netns") - (version (git-version "0.0.0" revision commit)) + (version "0.0.4") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/vishvananda/netns") - (commit commit))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "1zk6w8158qi4niva5rijchbv9ixgmijsgqshh54wdaav4xrhjshn")))) + "0rci8c211m57nya9il81fz6459pia3dj5i4b16fp34vjrkcxliml")))) (build-system go-build-system) (arguments `(#:import-path "github.com/vishvananda/netns" #:tests? #f)) ;tests require root privileges + (propagated-inputs + (list go-golang-org-x-sys)) (home-page "https://github.com/vishvananda/netns") (synopsis "Simple network namespace handling for Go") (description "The netns package provides a simple interface for handling network namespaces in Go.") - (license license:asl2.0)))) + (license license:asl2.0))) (define-public go-sctp ;; docker-libnetwork-cmd-proxy requires this exact commit. -- cgit v1.3 From 8e233ea593eddaaadc1582cb79358d1983d711c2 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 25 Jul 2024 21:36:56 +0100 Subject: gnu: go-netns: Fix indentation. * gnu/packages/networking.scm (go-netns): Fix indentation. Change-Id: I06a2819e522abfedd8a21820ae14ae1e51f24488 --- gnu/packages/networking.scm | 47 +++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 23 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index abd5c6dc24..9813bc98e8 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1918,29 +1918,30 @@ virtual machines, and certificates.") (license license:gpl3+))) (define-public go-netns - (package - (name "go-netns") - (version "0.0.4") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/vishvananda/netns") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0rci8c211m57nya9il81fz6459pia3dj5i4b16fp34vjrkcxliml")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/vishvananda/netns" - #:tests? #f)) ;tests require root privileges - (propagated-inputs - (list go-golang-org-x-sys)) - (home-page "https://github.com/vishvananda/netns") - (synopsis "Simple network namespace handling for Go") - (description "The netns package provides a simple interface for -handling network namespaces in Go.") - (license license:asl2.0))) + (package + (name "go-netns") + (version "0.0.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/vishvananda/netns") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0rci8c211m57nya9il81fz6459pia3dj5i4b16fp34vjrkcxliml")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/vishvananda/netns" + #:tests? #f)) ;tests require root privileges + (propagated-inputs + (list go-golang-org-x-sys)) + (home-page "https://github.com/vishvananda/netns") + (synopsis "Simple network namespace handling for Go") + (description + "The netns package provides a simple interface for handling network +namespaces in Go.") + (license license:asl2.0))) (define-public go-sctp ;; docker-libnetwork-cmd-proxy requires this exact commit. -- cgit v1.3 From ebf41dcf110fe10814f1c6d7004bff3cfd42fa3a Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 25 Jul 2024 21:41:17 +0100 Subject: gnu: go-netns: Enable tests. * gnu/packages/networking.scm (go-netns): Enable most of the tests. [arguments]: <#:phases>: Add 'disable-failing-tests phase. Change-Id: I1430de0df4cfab3a922f7a0e5bd0342e82efa871 --- gnu/packages/networking.scm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 9813bc98e8..1afbe585da 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1932,8 +1932,17 @@ virtual machines, and certificates.") (base32 "0rci8c211m57nya9il81fz6459pia3dj5i4b16fp34vjrkcxliml")))) (build-system go-build-system) (arguments - `(#:import-path "github.com/vishvananda/netns" - #:tests? #f)) ;tests require root privileges + (list + #:import-path "github.com/vishvananda/netns" + #: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$") + ;; Disable tests requiring root access. + (("TestGetNewSetDelete") "OffTestGetNewSetDelete") + (("TestThreaded") "OffTestThreaded")))))))) (propagated-inputs (list go-golang-org-x-sys)) (home-page "https://github.com/vishvananda/netns") -- cgit v1.3 From da8d961036042c098761f76bab453bf236bb3100 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 25 Jul 2024 21:45:01 +0100 Subject: gnu: go-netns: Rename varialbe. * gnu/packages/networking.scm (go-netns): Rename variable to go-github-com-vishvananda-netns to reflect go.mod import path. (yggdrasil) [propagated-inputs]: Remove go-netns, add go-github-com-vishvananda-netns. (nebula): [inputs]: Remove go-netns, add go-github-com-vishvananda-netns. * gnu/packages/docker.scm (docker-libnetwork-cmd-proxy) [native-inputs]: Remove go-netns, add go-github-com-vishvananda-netns. * gnu/packages/linux.scm (go-netlink) [native-inputs]: Remove go-netns, add go-github-com-vishvananda-netns. Change-Id: I49fb89a886134b0c768557ca4700c9be19c2c5d7 --- gnu/packages/docker.scm | 2 +- gnu/packages/linux.scm | 2 +- gnu/packages/networking.scm | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index c033486c6a..b3884832d9 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -311,7 +311,7 @@ the required network abstractions for applications.") ;; For tests. ("logrus" ,go-github-com-sirupsen-logrus) ("go-netlink" ,go-netlink) - ("go-netns" ,go-netns) + ("go-github-com-vishvananda-netns" ,go-github-com-vishvananda-netns) ("go-golang-org-x-crypto" ,go-golang-org-x-crypto) ("go-golang-org-x-sys" ,go-golang-org-x-sys))) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index f36d0fc9ee..6111280cda 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -9307,7 +9307,7 @@ management tools in userspace.") `(#:tests? #f ; Tests depend on specific kernel modules. #:import-path "github.com/vishvananda/netlink")) (native-inputs - (list go-golang-org-x-sys go-netns)) + (list go-golang-org-x-sys go-github-com-vishvananda-netns)) (home-page "https://github.com/vishvananda/netlink") (synopsis "Simple netlink library for Go") (description "The netlink package provides a simple netlink library for diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 1afbe585da..d7183a83a4 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1917,9 +1917,9 @@ manage, and delete Internet resources from Gandi.net such as domain names, virtual machines, and certificates.") (license license:gpl3+))) -(define-public go-netns +(define-public go-github-com-vishvananda-netns (package - (name "go-netns") + (name "go-github-com-vishvananda-netns") (version "0.0.4") (source (origin @@ -4663,7 +4663,7 @@ QUIC protocol.") go-golang-org-x-crypto go-golang-org-x-tools go-golang-org-x-sys - go-netns + go-github-com-vishvananda-netns go-netlink go-github-com-bits-and-blooms-bitset go-github-com-bits-and-blooms-bloom @@ -4781,7 +4781,7 @@ IPv6 Internet connectivity - it also works over IPv4.") go-google-golang-org-protobuf go-gopkg-in-yaml-v2 go-netlink - go-netns)) + go-github-com-vishvananda-netns)) (home-page "https://github.com/slackhq/nebula") (synopsis "Scalable, peer-to-peer overlay networking tool") (description -- cgit v1.3 From 0a6eb07ad92f815cf6316298636d983544b8fa79 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 25 Jul 2024 21:53:08 +0100 Subject: gnu: go-netlink: Update to 1.1.0. * gnu/packages/linux.scm (go-netlink): Update to 1.1.0. Change-Id: I92aeb71ecdb5c5bc8027ded40438f86ae48a8416 --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 6111280cda..1fe8da839c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -9292,7 +9292,7 @@ management tools in userspace.") (define-public go-netlink (package (name "go-netlink") - (version "1.0.0") + (version "1.1.0") (source (origin (method git-fetch) (uri (git-reference @@ -9301,7 +9301,7 @@ management tools in userspace.") (file-name (git-file-name name version)) (sha256 (base32 - "0hpzghf1a4cwawzhkiwdzin80h6hd09fskl77d5ppgc084yvj8x0")))) + "1vhl30p1gx636a088ls4h6a0l8jjyfvz79fr5w0qzdrg4qg9h08h")))) (build-system go-build-system) (arguments `(#:tests? #f ; Tests depend on specific kernel modules. -- cgit v1.3 From c961057bf67f0d92ea4a4b3956f00c14150c4778 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 25 Jul 2024 21:53:59 +0100 Subject: gnu: go-netlink: Refresh package style. * gnu/packages/linux.scm (go-netlink): Fix indentation, apply new package style, swap native-inputs with propagated-inputs. [propagated-inputs]: Add go-golang-org-x-sys and go-github-com-vishvananda-netns. [native-inputs]: Remove go-golang-org-x-sys and go-github-com-vishvananda-netns. Change-Id: I523cd03263752ab00c08e9011b86cb1b64327e7f --- gnu/packages/linux.scm | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 1fe8da839c..40c14745fa 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -9293,27 +9293,29 @@ management tools in userspace.") (package (name "go-netlink") (version "1.1.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/vishvananda/netlink") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1vhl30p1gx636a088ls4h6a0l8jjyfvz79fr5w0qzdrg4qg9h08h")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/vishvananda/netlink") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1vhl30p1gx636a088ls4h6a0l8jjyfvz79fr5w0qzdrg4qg9h08h")))) (build-system go-build-system) (arguments - `(#:tests? #f ; Tests depend on specific kernel modules. - #:import-path "github.com/vishvananda/netlink")) - (native-inputs + (list + #:tests? #f ; Tests depend on specific kernel modules. + #:import-path "github.com/vishvananda/netlink")) + (propagated-inputs (list go-golang-org-x-sys go-github-com-vishvananda-netns)) (home-page "https://github.com/vishvananda/netlink") (synopsis "Simple netlink library for Go") - (description "The netlink package provides a simple netlink library for -Go. Netlink is the interface a user-space program in Linux uses to -communicate with the kernel. It can be used to add and remove interfaces, set -IP addresses and routes, and configure IPsec.") + (description + "The netlink package provides a simple netlink library for Go. Netlink +is the interface a user-space program in Linux uses to communicate with the +kernel. It can be used to add and remove interfaces, set IP addresses and +routes, and configure IPsec.") (license license:asl2.0))) (define-public libinih -- cgit v1.3 From a80cec86d54d0b4f0d33fdcf018d7e0e51faa853 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 25 Jul 2024 21:56:50 +0100 Subject: gnu: go-netlink: Enable tests. * gnu/packages/linux.scm (go-netlink): Enable most of the tests. [arguments]: <#:phases>: Add 'disable-failing-tests phase. Change-Id: Ie4fafbc922e98a7eb474f91317995b6502a99108 --- gnu/packages/linux.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 40c14745fa..542ed5945a 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -9305,8 +9305,16 @@ management tools in userspace.") (build-system go-build-system) (arguments (list - #:tests? #f ; Tests depend on specific kernel modules. - #:import-path "github.com/vishvananda/netlink")) + #:import-path "github.com/vishvananda/netlink" + #: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$") + ;; Disable tests requiring root access. + (("TestNetNsIdByFd") "OffTestNetNsIdByFd") + (("TestNetNsIdByPid") "OffTestNetNsIdByPid")))))))) (propagated-inputs (list go-golang-org-x-sys go-github-com-vishvananda-netns)) (home-page "https://github.com/vishvananda/netlink") -- cgit v1.3 From ef9a6e9132859de10bc6507cf0b43b0d0cc743ac Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 25 Jul 2024 21:59:53 +0100 Subject: gnu: go-netlink: Rename variable. * gnu/packages/linux.scm (go-netlink): Renamve variable to go-github-com-vishvananda-netlink to reflect go.mod import path. * gnu/packages/networking.scm (yggdrasil) [propagated-inputs]: Remove go-netlink, add go-github-com-vishvananda-netlink. (nebula): [inputs]: Remove go-netlink, add go-github-com-vishvananda-netlink. * gnu/packages/docker.scm (docker-libnetwork-cmd-proxy) [native-inputs]: Remove go-netlink, add go-github-com-vishvananda-netlink. Change-Id: I77658e6c7f5d57d8631b42c661466c6b7e08df50 --- gnu/packages/docker.scm | 2 +- gnu/packages/linux.scm | 4 ++-- gnu/packages/networking.scm | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index b3884832d9..c713466f67 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -310,7 +310,7 @@ the required network abstractions for applications.") `(("go-sctp" ,go-sctp) ;; For tests. ("logrus" ,go-github-com-sirupsen-logrus) - ("go-netlink" ,go-netlink) + ("go-github-com-vishvananda-netlink" ,go-github-com-vishvananda-netlink) ("go-github-com-vishvananda-netns" ,go-github-com-vishvananda-netns) ("go-golang-org-x-crypto" ,go-golang-org-x-crypto) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 542ed5945a..07f75acf15 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -9289,9 +9289,9 @@ nfnetlink_queue, nfnetlink_conntrack) and their respective users and/or management tools in userspace.") (license license:gpl2))) -(define-public go-netlink +(define-public go-github-com-vishvananda-netlink (package - (name "go-netlink") + (name "go-github-com-vishvananda-netlink") (version "1.1.0") (source (origin diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index d7183a83a4..3791b7f997 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -4664,7 +4664,7 @@ QUIC protocol.") go-golang-org-x-tools go-golang-org-x-sys go-github-com-vishvananda-netns - go-netlink + go-github-com-vishvananda-netlink go-github-com-bits-and-blooms-bitset go-github-com-bits-and-blooms-bloom go-github-com-quic-go-quic-go @@ -4780,7 +4780,7 @@ IPv6 Internet connectivity - it also works over IPv4.") go-golang-org-x-term go-google-golang-org-protobuf go-gopkg-in-yaml-v2 - go-netlink + go-github-com-vishvananda-netlink go-github-com-vishvananda-netns)) (home-page "https://github.com/slackhq/nebula") (synopsis "Scalable, peer-to-peer overlay networking tool") -- cgit v1.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') 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 @@ efficient space usage.") (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 @@ efficient space usage.") (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.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') 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 @@ efficient space usage.") (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 @@ QUIC protocol.") 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.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') 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 @@ dependencies and a simple API.") "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.3 From 86ee57e861bd729d31c3ce8a0ccdc77035f841b5 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 25 Jul 2024 22:40:48 +0100 Subject: gnu: yggdrasil: Adjust inputs. * gnu/packages/networking.scm (yggdrasil): Adjust inputs which come as propagated form other packages. [propagated-inputs]: Remove go-golang-org-x-tools, go-github-com-vishvananda-netns, go-github-com-bits-and-blooms-bitset, go-github-com-bits-and-blooms-bloom-v3, go-github-com-mitchellh-mapstructure, go-github-com-mattn-go-runewidth, go-github-com-mattn-go-isatty, go-github-com-mattn-go-colorable, go-github-com-fatih-color, and go-github-com-vividcortex-ewma. Change-Id: I127cc49d49ed97431ba8b21a419ee92397467213 --- gnu/packages/networking.scm | 38 +++++++++++++++----------------------- 1 file changed, 15 insertions(+), 23 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 2e252efeb1..6aebdb0a54 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -4657,31 +4657,23 @@ QUIC protocol.") "github.com/yggdrasil-network/yggdrasil-go/cmd/yggdrasilctl" "github.com/yggdrasil-network/yggdrasil-go/cmd/genkeys")))))))) (propagated-inputs - (list go-golang-zx2c4-com-wireguard - go-golang-org-x-text - go-golang-org-x-net - go-golang-org-x-crypto - go-golang-org-x-tools - go-golang-org-x-sys - go-github-com-vishvananda-netns - go-github-com-vishvananda-netlink - go-github-com-bits-and-blooms-bitset - go-github-com-bits-and-blooms-bloom-v3 - go-github-com-quic-go-quic-go + (list ;; go-golang-org-x-mobile ; Not packed yet, for contrib. + ;; go-golang-zx2c4-com-wireguard-windows ; Not packed yet, for tun. + go-github-com-arceliar-ironwood + go-github-com-arceliar-phony + go-github-com-cheggaaa-pb-v3 + go-github-com-gologme-log + go-github-com-hashicorp-go-syslog go-github-com-hjson-hjson-go-v4 - go-github-com-olekukonko-tablewriter - go-github-com-mitchellh-mapstructure - go-github-com-mattn-go-runewidth - go-github-com-mattn-go-isatty - go-github-com-mattn-go-colorable go-github-com-kardianos-minwinsvc - go-github-com-hashicorp-go-syslog - go-github-com-gologme-log - go-github-com-fatih-color - go-github-com-cheggaaa-pb-v3 - go-github-com-vividcortex-ewma - go-github-com-arceliar-phony - go-github-com-arceliar-ironwood)) + go-github-com-olekukonko-tablewriter + go-github-com-quic-go-quic-go + go-github-com-vishvananda-netlink + go-golang-org-x-crypto + go-golang-org-x-net + go-golang-org-x-sys + go-golang-org-x-text + go-golang-zx2c4-com-wireguard)) (home-page "https://yggdrasil-network.github.io/blog.html") (synopsis "Experiment in scalable routing as an encrypted IPv6 overlay network") -- cgit v1.3 From 1129b6fe4ab6faf2ae89093d0c8c92f66de5696b Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 25 Jul 2024 22:47:08 +0100 Subject: gnu: yggdrasil: Enable tests. * gnu/packages/networking.scm (yggdrasil): Enable tests. [arguments]: <#:phases>: Use custom 'check phase. Change-Id: Ia2a59803508063a97993eae647a66335f5db3d06 --- gnu/packages/networking.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 6aebdb0a54..b22a755396 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -4635,8 +4635,6 @@ QUIC protocol.") (build-system go-build-system) (arguments (list #:import-path "github.com/yggdrasil-network/yggdrasil-go" - ;; TODO: figure out how tests are run - #:tests? #f #:install-source? #f #:phases #~(modify-phases %standard-phases @@ -4655,7 +4653,12 @@ QUIC protocol.") #:import-path directory)) (list "github.com/yggdrasil-network/yggdrasil-go/cmd/yggdrasil" "github.com/yggdrasil-network/yggdrasil-go/cmd/yggdrasilctl" - "github.com/yggdrasil-network/yggdrasil-go/cmd/genkeys")))))))) + "github.com/yggdrasil-network/yggdrasil-go/cmd/genkeys"))))) + (replace 'check + (lambda* (#:key tests? import-path #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" "./cmd/..." "./src/...")))))))) (propagated-inputs (list ;; go-golang-org-x-mobile ; Not packed yet, for contrib. ;; go-golang-zx2c4-com-wireguard-windows ; Not packed yet, for tun. -- cgit v1.3 From 8af0ee243c6f6ca743ebc9f050e1b2bf7f56a554 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 26 Jul 2024 09:00:39 +0100 Subject: gnu: Add go-github-com-mattn-go-tty. * gnu/packages/golang-xyz.scm (go-github-com-mattn-go-tty): New variable. Change-Id: I08c4508c83aa70b747b71c307b3c9e2862b2588d --- gnu/packages/golang-xyz.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index b1df96b87c..ea41dddbcc 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -3457,6 +3457,35 @@ the @code{cpan} module @code{Parse::CommandLine}.") @code{database/sql}.") (license license:expat))) +(define-public go-github-com-mattn-go-tty + (package + (name "go-github-com-mattn-go-tty") + (version "0.0.7") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mattn/go-tty") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "09ndgwrx99jqaakmhk4v2pnai9h2mvryapc3qg6i33v2x809y6z6")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/mattn/go-tty")) + (propagated-inputs + (list go-github-com-mattn-go-colorable + go-github-com-mattn-go-isatty + go-github-com-mattn-go-runewidth + go-golang-org-x-sys)) + (home-page "https://github.com/mattn/go-tty") + (synopsis "Simple TTY utility for Golang") + (description + "This package provides a TTY utilities implementation for verity of +operation systems.") + (license license:expat))) + (define-public go-github-com-mattn-go-zglob (package (name "go-github-com-mattn-go-zglob") -- cgit v1.3 From 408b35a18b2a87db0caf50b7c33c40998da1adf5 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 26 Jul 2024 12:43:50 +0100 Subject: gnu: go-github-com-99designs-go-keyring: Rename variable. * gnu/packages/golang-crypto.scm (go-github-com-99designs-go-keyring): Rename variable to go-github-com-99designs-keyring to reflect go.mod import path. Change-Id: I0ceb3554cd9f2368958efe6493752ee5d2bfd919 --- gnu/packages/golang-crypto.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm index cb760227e8..05d539a10a 100644 --- a/gnu/packages/golang-crypto.scm +++ b/gnu/packages/golang-crypto.scm @@ -200,9 +200,9 @@ Go, exposing the necessary APIs to build a wide array of higher-level primitives.") (license license:bsd-3))) -(define-public go-github-com-99designs-go-keyring +(define-public go-github-com-99designs-keyring (package - (name "go-github-com-99designs-go-keyring") + (name "go-github-com-99designs-keyring") (version "1.2.2") (source (origin -- cgit v1.3 From 51679b4a9a43349f5243211f056c4e6bb7e0b440 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 26 Jul 2024 13:07:45 +0100 Subject: gnu: go-github-com-99designs-keyring: Enable tests. * gnu/packages/golang-crypto.scm (go-github-com-99designs-keyring): Refresh package style and enable tests. [arguments]: <#:phases>: Add 'disable-failing-test phase. [native-inputs]: Add gnupg, go-github-com-stretchr-testify, and password-store. Change-Id: Id679e834180b9d5ad5e7c1c4ce009d17b3c3ab5f --- gnu/packages/golang-crypto.scm | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm index 05d539a10a..fe6ce11398 100644 --- a/gnu/packages/golang-crypto.scm +++ b/gnu/packages/golang-crypto.scm @@ -46,12 +46,14 @@ #:use-module (guix packages) #:use-module (guix utils) #:use-module (gnu packages) + #:use-module (gnu packages gnupg) #:use-module (gnu packages golang) #:use-module (gnu packages golang-build) #:use-module (gnu packages golang-check) #:use-module (gnu packages golang-compression) #:use-module (gnu packages golang-web) #:use-module (gnu packages golang-xyz) + #:use-module (gnu packages password-utils) #:use-module (gnu packages specifications)) ;;; Commentary: @@ -214,6 +216,30 @@ primitives.") (sha256 (base32 "0mkvy7scyq07rkqhabfmkd8imcm4h9y7zj9palj04znpihpixa5m")))) (build-system go-build-system) + (arguments + (list + #:import-path "github.com/99designs/keyring" + #: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$") + ;; Disable test requring running DBus. + (("TestLibSecretKeysWhenEmpty") + "OffTestLibSecretKeysWhenEmpty") + (("TestLibSecretKeysWhenNotEmpty") + "OffTestLibSecretKeysWhenNotEmpty") + (("TestLibSecretGetWhenEmpty") + "OffTestLibSecretGetWhenEmpty") + (("TestLibSecretGetWhenNotEmpty") + "OffTestLibSecretGetWhenNotEmpty") + (("TestLibSecretRemoveWhenEmpty") + "OffTestLibSecretRemoveWhenEmpty") + (("TestLibSecretRemoveWhenNotEmpty") + "OffTestLibSecretRemoveWhenNotEmpty")))))))) + (native-inputs + (list gnupg go-github-com-stretchr-testify password-store)) (propagated-inputs (list go-github-com-dvsekhvalnov-jose2go go-github-com-godbus-dbus @@ -222,9 +248,7 @@ primitives.") go-github-com-mtibben-percent go-golang-org-x-sys go-golang-org-x-term)) - (arguments - '(#:import-path "github.com/99designs/keyring" - #:tests? #f)) ;XXX: tests require Vagrant + (home-page "https://github.com/99designs/keyring") (synopsis "Go library providing a uniform interface for various secure credential stores") (description @@ -235,7 +259,6 @@ workstations. Currently Keyring supports the following backends: macOS/OSX Keychain, Windows pcredential store, Pass, Secret Service, KDE Wallet, Encrypted File.") - (home-page "https://github.com/99designs/keyring") (license license:expat))) (define-public go-github-com-aead-chacha20 -- cgit v1.3 From 6cf5896b03b08234becbcc64edd66771bc87c1a9 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 26 Jul 2024 13:14:53 +0100 Subject: gnu: Add go-keyring. * gnu/packages/golang-crypto.scm (go-keyring): New variable. Change-Id: I492e1724ecaef9d6819d99be0aff8ee5a3d72b13 --- gnu/packages/golang-crypto.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm index fe6ce11398..d4509009fa 100644 --- a/gnu/packages/golang-crypto.scm +++ b/gnu/packages/golang-crypto.scm @@ -1547,6 +1547,20 @@ Go.") #:unpack-path "filippo.io/age" #:install-source? #f)))) +(define-public go-keyring + (package + (inherit go-github-com-99designs-keyring) + (name "go-keyring") + (arguments + (list + #:install-source? #f + #:import-path "github.com/99designs/keyring/cmd/keyring" + #:unpack-path "github.com/99designs/keyring")) + (description + (string-append (package-description go-github-com-99designs-keyring) + " This package provides an command line interface (CLI) +tool.")))) + ;;; ;;; Avoid adding new packages to the end of this file. To reduce the chances ;;; of a merge conflict, place them above by existing packages with similar -- cgit v1.3 From 67440865cfcd5783db7ac6f5304300f5ea1c0a07 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 26 Jul 2024 13:26:03 +0100 Subject: gnu: Add go-github-com-aws-aws-sdk-go-v2-credentials. * gnu/packages/golang-web.scm (go-github-com-aws-aws-sdk-go-v2-credentials): New variable. Change-Id: Iee01126d508d2bdfb315ec000843f301c1b539a8 --- gnu/packages/golang-web.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index e697fd716f..97d501c405 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -305,6 +305,34 @@ connections from a single physical connection.") (list go-github-com-google-go-cmp go-github-com-aws-smithy-go)))) +(define-public go-github-com-aws-aws-sdk-go-v2-credentials + (package + (name "go-github-com-aws-aws-sdk-go-v2-credentials") + (version "1.17.27") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/aws/aws-sdk-go-v2") + (commit (string-append "credentials/v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0jdj7wim98g80hjbw3av7ffrr3dqxzbygprmhjs0cxc16cw62wj7")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/aws/aws-sdk-go-v2/credentials" + #:unpack-path "github.com/aws/aws-sdk-go-v2")) + (propagated-inputs + (list go-github-com-google-go-cmp + go-github-com-aws-smithy-go)) + (home-page "https://pkg.go.dev/github.com/aws/aws-sdk-go-v2/credentials") + (synopsis "AWS SDK for Go v2 - credentials module") + (description + "Package credentials provides types for retrieving credentials from +credentials sources.") + (license license:asl2.0))) + (define-public go-github-com-aws-aws-sdk-go-v2-feature-s3-manager (package (inherit go-github-com-aws-aws-sdk-go-v2) -- cgit v1.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') 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 @@ which satisfies the cron expression.") (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 @@ which satisfies the cron expression.") (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.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') 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 @@ which satisfies the cron expression.") (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.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') 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 @@ Go.") (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 @@ which satisfies the cron expression.") (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.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') 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 @@ be useful for other network applications.") (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 @@ be useful for other network applications.") (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.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') 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 @@ be useful for other network applications.") (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 @@ be useful for other network applications.") 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 @@ AWS Vault stores IAM credentials in your operating system's secure keystore and 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.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') 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 @@ library geared towards parsing MIME encoded emails.") (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 @@ library geared towards parsing MIME encoded emails.") (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.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') 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 @@ library geared towards parsing MIME encoded emails.") 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.3 From 342411a327041cee1e97a8152a1d72e0e127df9a Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 26 Jul 2024 19:52:50 +0100 Subject: gnu: packages/golang-web: Update module commentary. * gnu/packages/golang-web.scm: Update module commentary. Change-Id: I2128fc62955d79d9dfa97e5f669ee85510b0fb7c --- gnu/packages/golang-web.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 97d501c405..38357010e1 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -66,8 +66,10 @@ ;;; Commentary: ;;; -;;; Golang modules (libraries) related to HTML, CSS, SCSS, JavaScript, JSON, -;;; Web-framework, REST-API or similar functionality. They may provide +;;; Golang modules (libraries) for Web related projects: HTML, CSS, SCSS, +;;; JavaScript, JSON, Web-framework, REST-API or similar functionality; for +;;; Network related projects: OSI layers implementation algorithms, MIME, +;;; Email protocols implementations, and similar. They may provide ;;; executables and libraries, for which there are marked sections. ;;; -- cgit v1.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') 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 @@ API and doesn't use reflection. It relies on small interfaces to 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 @@ text-only mail clients to display them.") 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.3 From c91cfc0cd03797ef5536388b4c709033b1aef9b3 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 26 Jul 2024 21:03:43 +0100 Subject: gnu: Remove go-github-com-go-telegram-bot-api-telegram-bot-api. The project is abandoned and not in used within Guix. * gnu/packages/golang-web.scm (go-github-com-go-telegram-bot-api-telegram-bot-api): Delete variable. Change-Id: I3c9525692f4b4f1c17b2c45a2331e71c7a6e42ac --- gnu/packages/golang-web.scm | 25 ------------------------- 1 file changed, 25 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 276a8a9ad2..3665ab73c3 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -923,31 +923,6 @@ Encryption, JSON Web Signature, and JSON Web Token standards.") language.") (license license:expat))) -(define-public go-github-com-go-telegram-bot-api-telegram-bot-api - (package - (name "go-github-com-go-telegram-bot-api-telegram-bot-api") - (version "4.6.4") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/go-telegram-bot-api/telegram-bot-api") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1x6j0k3aiicsr8l53na99ci10zm3qpn2syz4f60fzh164w5k1l7w")))) - (build-system go-build-system) - (home-page "https://go-telegram-bot-api.dev/") - (arguments - (list #:tests? #f ; Upstream tests are broken. - #:import-path "github.com/go-telegram-bot-api/telegram-bot-api")) - (propagated-inputs - (list go-github-com-technoweenie-multipartstreamer)) - (synopsis "Golang bindings for the Telegram Bot API") - (description - "This package provides Golang bindings for the Telegram Bot API.") - (license license:expat))) - (define-public go-github-com-go-webauthn-webauthn (package (name "go-github-com-go-webauthn-webauthn") -- cgit v1.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') 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 @@ editor.") 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.3 From 64aedb55764ad6c59afc622eef679ecedfed31c0 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 26 Jul 2024 21:15:39 +0100 Subject: gnu: go-github-com-emersion-go-pgpmail: Update to 0.2.1. * gnu/packages/golang-crypto.scm (go-github-com-emersion-go-pgpmail): Update to 0.2.1. [propagated-inputs]: Remove go-golang-org-x-crypto. Change-Id: I77a4f29b9f72482ff0a66033df122bb0528137e6 --- gnu/packages/golang-crypto.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm index d4509009fa..9d0efee58e 100644 --- a/gnu/packages/golang-crypto.scm +++ b/gnu/packages/golang-crypto.scm @@ -527,7 +527,7 @@ library.") (define-public go-github-com-emersion-go-pgpmail (package (name "go-github-com-emersion-go-pgpmail") - (version "0.2.0") + (version "0.2.1") (source (origin (method git-fetch) @@ -536,7 +536,7 @@ library.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0ar26b0apw5bxn58qfn1a79cxigbmrqm1irh1rb7x57fydihc7wm")))) + (base32 "1fiqpdwxnfba2cgij7j83dfqc0zz4mq95x15wicgm5f3vjr1xg5h")))) (build-system go-build-system) (arguments (list ;; tests don't support our version of protonmail/go-crypto; see @@ -546,7 +546,6 @@ library.") (propagated-inputs (list go-github-com-emersion-go-message go-github-com-protonmail-go-crypto - go-golang-org-x-crypto go-golang-org-x-text)) (home-page "https://github.com/emersion/go-pgpmail") (synopsis "PGP mail encryption for Go") -- cgit v1.3 From 9e79d8dc5afc36a5b90f06a2b529b7f1c02fc20e Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 26 Jul 2024 21:16:10 +0100 Subject: gnu: go-github-com-emersion-go-pgpmail: Enable tests. * gnu/packages/golang-crypto.scm (go-github-com-emersion-go-pgpmail): Enable tests. Change-Id: I3317c27e942e2f5f52a25354b53b7d8cb8c252b0 --- gnu/packages/golang-crypto.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm index 9d0efee58e..8d26aff08e 100644 --- a/gnu/packages/golang-crypto.scm +++ b/gnu/packages/golang-crypto.scm @@ -539,9 +539,7 @@ library.") (base32 "1fiqpdwxnfba2cgij7j83dfqc0zz4mq95x15wicgm5f3vjr1xg5h")))) (build-system go-build-system) (arguments - (list ;; tests don't support our version of protonmail/go-crypto; see - ;; - #:tests? #f + (list #:import-path "github.com/emersion/go-pgpmail")) (propagated-inputs (list go-github-com-emersion-go-message -- cgit v1.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') 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 @@ email library.") (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 @@ email library.") (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.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') 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 @@ and stop increasing when a certain threshold is met.") 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 @@ result is a conceptually simple, but highly performant, disk-backed storage syst 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.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') 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 @@ SPNEGO Kerberos authentication, as well as a HTTP handler wrapper decodes 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 @@ email library.") 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.3 From 1dd90ea87011e845e28b91d838104bbbc0eb4451 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 27 Jul 2024 09:31:08 +0100 Subject: gnu: go-github-com-vishvananda-netlink: Keep tests only on x86_64. * gnu/packages/linux.scm (go-github-com-vishvananda-netlink) [arguments]: <#:tests?>: Run tests only on x86_64 architecture. Change-Id: I15df89bd4d916e580fc82d650aefcb4cf050a20d --- gnu/packages/linux.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 07f75acf15..ff1455fbfb 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -9305,6 +9305,10 @@ management tools in userspace.") (build-system go-build-system) (arguments (list + ;; The tests are unsupported on all architectures except x86_64-linux: + ;; cannot use 0xabcdef99 (untyped int constant 2882400153) as int value + ;; in struct literal (overflows) + #:tests? (and (not (%current-target-system)) (target-x86-64?)) #:import-path "github.com/vishvananda/netlink" #:phases #~(modify-phases %standard-phases -- cgit v1.3 From ae08b8ab05264f4710405429d533a005d2fe8697 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 27 Jul 2024 09:33:28 +0100 Subject: gnu: docker-libnetwork-cmd-proxy: Improve package style. * gnu/packages/docker.scm (docker-libnetwork-cmd-proxy): Improve package style. Fix indentation. [arguments]: Apply list style, adjust order of the keys. [native-inputs]: Remove labels. [description]: Adjust it, place on a new line. Change-Id: I0cb59a3d9306291e4101f6c6d2e681ffd319ba9f --- gnu/packages/docker.scm | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index c713466f67..c6d56a06b1 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -300,24 +300,23 @@ the required network abstractions for applications.") (inherit docker-libnetwork) (name "docker-libnetwork-cmd-proxy") (arguments - ;; The tests are unsupported on all architectures except x86_64-linux. - `(#:tests? ,(and (not (%current-target-system)) - (target-x86-64?)) - #:import-path "github.com/docker/libnetwork/cmd/proxy" - #:unpack-path "github.com/docker/libnetwork" - #:install-source? #f)) + (list + ;; The tests are unsupported on all architectures except x86_64-linux. + #:tests? (and (not (%current-target-system)) (target-x86-64?)) + #:install-source? #f + #:import-path "github.com/docker/libnetwork/cmd/proxy" + #:unpack-path "github.com/docker/libnetwork")) (native-inputs - `(("go-sctp" ,go-sctp) - ;; For tests. - ("logrus" ,go-github-com-sirupsen-logrus) - ("go-github-com-vishvananda-netlink" ,go-github-com-vishvananda-netlink) - ("go-github-com-vishvananda-netns" ,go-github-com-vishvananda-netns) - ("go-golang-org-x-crypto" - ,go-golang-org-x-crypto) - ("go-golang-org-x-sys" ,go-golang-org-x-sys))) + (list go-github-com-sirupsen-logrus ; for tests. + go-github-com-vishvananda-netlink + go-github-com-vishvananda-netns + go-golang-org-x-crypto + go-golang-org-x-sys + go-sctp)) (synopsis "Docker user-space proxy") - (description "A proxy running in the user space. It is used by the -built-in registry server of Docker.") + (description + "This package provides a proxy running in the user space. It is used by +the built-in registry server of Docker.") (license license:asl2.0))) ;; TODO: Patch out modprobes for ip_vs, nf_conntrack, -- cgit v1.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') 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 @@ cluster segmentation algorithm.") #: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 @@ cluster segmentation algorithm.") (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.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') 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 @@ for generating command line clients for your application configuration that is 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 @@ cluster segmentation algorithm.") '(#: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.3 From b4b875d4a0ae02f5f1ba2b3b96d76ccfe31b5340 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 27 Jul 2024 10:04:58 +0100 Subject: gnu: Add go-github-com-avast-retry-go-v3. * gnu/packages/golang-xyz.scm (go-github-com-avast-retry-go-v3): New variable. Change-Id: I90857cf75765ec4c39141d462444fe3d775968a9 --- gnu/packages/golang-xyz.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index 4358569d53..fe2ea055de 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -857,6 +857,35 @@ 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-avast-retry-go-v3 + (package + (inherit go-github-com-avast-retry-go) + (name "go-github-com-avast-retry-go-v3") + (version "3.1.1") + (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 "01mwrzjh2y3xignkivx8kaghjs3gwb3z89zqgxjfaslslazc863b")))) + (arguments + (list + #:import-path "github.com/avast/retry-go/v3" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'disable-failing-tests + (lambda* (#:key tests? import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (substitute* (find-files "." "\\_test.go$") + (("TestMaxDelay") "OffTestMaxDelay"))))) + (add-after 'unpack 'remove-examples + (lambda* (#:key import-path #:allow-other-keys) + (delete-file-recursively + (string-append "src/" import-path "/examples"))))))))) + (define-public go-github-com-aymanbagabas-go-osc52-v2 (package (name "go-github-com-aymanbagabas-go-osc52-v2") -- cgit v1.3 From 33c4ad85c4ad38ad576004b66b4d8a2bd04ef0dc Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 27 Jul 2024 10:06:47 +0100 Subject: gnu: Add go-github-com-avast-retry-go-v4. * gnu/packages/golang-xyz.scm (go-github-com-avast-retry-go-v4): New variable. Change-Id: If1463e2f9851ce22c2adb804ea8ed4abaf597bcc --- gnu/packages/golang-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index fe2ea055de..144941c31b 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -886,6 +886,30 @@ strategies, such as fixed delay, backoff delay, and random delay.") (delete-file-recursively (string-append "src/" import-path "/examples"))))))))) +(define-public go-github-com-avast-retry-go-v4 + (package + (inherit go-github-com-avast-retry-go) + (name "go-github-com-avast-retry-go-v4") + (version "4.6.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 "09gs4wmkq7ragyf2xd0h6j8f9xqq66cwa95kwp5qdwz3wwv9xq1b")))) + (arguments + (list + #:import-path "github.com/avast/retry-go/v4" + #: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"))))))))) + (define-public go-github-com-aymanbagabas-go-osc52-v2 (package (name "go-github-com-aymanbagabas-go-osc52-v2") -- cgit v1.3 From 190c0abec86ae2d007330ed226033413997c1004 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 27 Jul 2024 18:49:32 +0100 Subject: gnu: go-github-com-avast-retry-go: Disable failing test. Disable one failing test as seen in . * gnu/packages/golang-xyz.scm (go-github-com-avast-retry-go) [arguments]: <#:phases>: Add 'disable-failing-tests phase. Change-Id: I95af4f01f254d5229c84754626502d768c730c39 --- gnu/packages/golang-xyz.scm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index 144941c31b..d8fa82d4c1 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -844,6 +844,11 @@ stored in a Go struct.") #:import-path "github.com/avast/retry-go" #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'disable-failing-tests + (lambda* (#:key tests? import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (substitute* (find-files "." "\\_test.go$") + (("TestMaxDelay") "OffTestMaxDelay"))))) (add-after 'unpack 'remove-examples (lambda* (#:key import-path #:allow-other-keys) (delete-file-recursively -- cgit v1.3 From 6593f40b77440c6680dbb828fc573897d4949b73 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 27 Jul 2024 23:45:56 +0100 Subject: gnu: Add go-git-sr-ht-rockorager-go-jmap. * gnu/packages/golang-web.scm (go-git-sr-ht-rockorager-go-jmap): New variable. Change-Id: I1445fda30635ee6132f9d6ea628980445c1ab133 --- gnu/packages/golang-web.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index f1bf859224..0bea9afb7d 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -130,6 +130,44 @@ API service accounts for Go.") "This package provides a GraphQL client and code generator for Go.") (license license:expat))) +(define-public go-git-sr-ht-rockorager-go-jmap + (package + (name "go-git-sr-ht-rockorager-go-jmap") + (version "0.5.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.sr.ht/~rockorager/go-jmap") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1r8bmdlmvpk08i7xrqwgv0aaz05564wgcyji73nszdh2s32m4kzl")))) + (build-system go-build-system) + (arguments + (list + #:import-path "git.sr.ht/~rockorager/go-jmap" + #:phases + #~(modify-phases %standard-phases + ;; XXX: Workaround for go-build-system's lack of Go modules support. + (replace 'check + (lambda* (#:key tests? import-path #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" "./...")))))))) + (native-inputs + (list + go-github-com-stretchr-testify)) + (propagated-inputs + (list go-golang-org-x-oauth2)) + (home-page "https://git.sr.ht/~rockorager/go-jmap") + (synopsis "JSON meta application protocol in Golang") + (description + "Package jmap implements JMAP Core protocol as defined in +@@url{https://rfc-editor.org/rfc/rfc8620.html,RFC 8620} published on July +2019.") + (license license:expat))) + (define-public go-github-com-alexliesenfeld-health (package (name "go-github-com-alexliesenfeld-health") -- cgit v1.3 From 21b1f165c8534b771cd01dd3554e16dd8bca2396 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 27 Jul 2024 23:52:39 +0100 Subject: gnu: Add go-git-sr-ht-rjarry-go-opt. * gnu/packages/golang-xyz.scm (go-git-sr-ht-rjarry-go-opt): New variable. Change-Id: I2dfafc9144a95dcbd6b10439888f2426be8e7915 --- gnu/packages/golang-xyz.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index d8fa82d4c1..98da7f953f 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -293,6 +293,34 @@ a human-readable byte format.") search functionality to database applications.") (license license:expat))) +(define-public go-git-sr-ht-rjarry-go-opt + (package + (name "go-git-sr-ht-rjarry-go-opt") + (version "1.4.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.sr.ht/~rjarry/go-opt") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0jcs3bn43g3wv4d5w59zazy139qfkn0903lnvndfn06s81gzqpch")))) + (build-system go-build-system) + (arguments + (list + #:import-path "git.sr.ht/~rjarry/go-opt")) + (native-inputs + (list go-github-com-stretchr-testify)) + (home-page "https://git.sr.ht/~rjarry/go-opt") + (synopsis "Argument parsing and completion based on struct tags") + (description + "@code{go-opt} is a library to parse command line arguments based on tag +annotations on struct fields. It came as a spin-off from +@url{https://git.sr.ht/~rjarry/aerc,aerc} to deal with its internal +commands.") + (license license:expat))) + (define-public go-git-sr-ht-sircmpwn-getopt (package (name "go-git-sr-ht-sircmpwn-getopt") -- cgit v1.3 From bddbb6631702c6e5516ee6f1f7f31f1c61c2bc03 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 28 Jul 2024 00:07:38 +0100 Subject: gnu: Add go-github-com-soniakeys-quant. * gnu/packages/golang-xyz.scm (go-github-com-soniakeys-quant): New variable. Change-Id: I857c2c70f792bc5e69888eb64878299e0db94189 --- gnu/packages/golang-xyz.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index 98da7f953f..4c8f4e87f9 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -4749,6 +4749,29 @@ Use waterutil with it to work with TUN/TAP packets/frames.") "@{gitconfig} is a package to get configuration values from gitconfig.") (license license:expat))) +(define-public go-github-com-soniakeys-quant + (package + (name "go-github-com-soniakeys-quant") + (version "1.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/soniakeys/quant") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0y50h4d9l4v1dxhf99ys6fha5c7viflwdnlfxn7glf2jr49x5z78")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/soniakeys/quant")) + (home-page "https://github.com/soniakeys/quant") + (synopsis "Interface for image color quantizers") + (description + "Quant provides an interface for image color quantizers.") + (license license:expat))) + (define-public go-github-com-spf13-cobra (package (name "go-github-com-spf13-cobra") -- cgit v1.3 From 6b30312b65df6ebc34380dbadd184b008b977f99 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 28 Jul 2024 00:09:02 +0100 Subject: gnu: Add go-github-com-mattn-go-sixel. * gnu/packages/golang-xyz.scm (go-github-com-mattn-go-sixel): New variable. Change-Id: Ib5d86f6471238c90e578961485923291fdf1d308 --- gnu/packages/golang-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index 4c8f4e87f9..9f526368c8 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -3552,6 +3552,32 @@ string.") the @code{cpan} module @code{Parse::CommandLine}.") (license license:expat))) +(define-public go-github-com-mattn-go-sixel + (package + (name "go-github-com-mattn-go-sixel") + (version "0.0.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mattn/go-sixel") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0icv1mcavdw867s47kwvd16q19h2a4znph850lyq18d5z00kpjjs")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/mattn/go-sixel")) + (propagated-inputs + (list go-github-com-soniakeys-quant)) + (home-page "https://github.com/mattn/go-sixel") + (synopsis "DRCS/Sixel Encoder/Decoder") + (description + "This package implements functionality to encode and decode +@acronym{DRCS,Dynamically Redefinable Character Sets} Sixel.") + (license license:expat))) + (define-public go-github-com-mattn-go-sqlite3 (package (name "go-github-com-mattn-go-sqlite3") -- cgit v1.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') 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 @@ parser.") (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 @@ parser.") (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.3 From d650834c63cf3bbade064262f78acb0fc5c72259 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 28 Jul 2024 00:13:45 +0100 Subject: gnu: Add go-git-sr-ht-rockorager-vaxis. * gnu/packages/golang-xyz.scm (go-git-sr-ht-rockorager-vaxis): New variable. Change-Id: I7f8815d9c840f204ea9f7cec3a8c73175f096f31 --- gnu/packages/golang-xyz.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index 9f526368c8..24cf0ec329 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -321,6 +321,42 @@ annotations on struct fields. It came as a spin-off from commands.") (license license:expat))) +(define-public go-git-sr-ht-rockorager-vaxis + (package + (name "go-git-sr-ht-rockorager-vaxis") + (version "0.9.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.sr.ht/~rockorager/vaxis") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0pmi4bigqgrfdlk9d6ia3jxgcr4iadiyynf6bny9fdc3yyppcxic")))) + (build-system go-build-system) + (arguments + (list + #:import-path "git.sr.ht/~rockorager/vaxis")) + (native-inputs + (list go-github-com-stretchr-testify)) + (propagated-inputs + (list go-github-com-containerd-console + go-github-com-creack-pty + go-github-com-mattn-go-runewidth + go-github-com-mattn-go-sixel + go-github-com-rivo-uniseg + go-golang-org-x-exp + go-golang-org-x-image + go-golang-org-x-sys)) + (home-page "https://git.sr.ht/~rockorager/vaxis") + (synopsis "TUI library for Golang") + (description + "Package vaxis is a terminal user interface for modern terminals. It +supports supports modern terminal features, such as styled underlines and +graphics. A widgets package is provided with some useful widgets.") + (license license:asl2.0))) + (define-public go-git-sr-ht-sircmpwn-getopt (package (name "go-git-sr-ht-sircmpwn-getopt") -- cgit v1.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') 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 @@ can be used to build IMAP clients and servers.") (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 @@ can be used to build IMAP clients and servers.") (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.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') 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 @@ defined by RFC 5321.") (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 @@ defined by RFC 5321.") (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.3 From 5a2910d20ddcda4cb5b3d5c47cb0f4e660f6186d Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 28 Jul 2024 00:40:44 +0100 Subject: gnu: aerc: Fix indentation. * gnu/packages/mail.scm (aerc): Fix indentation. Change-Id: I9422a40880ec15f30b7ee2863d843c3334f3a974 --- gnu/packages/mail.scm | 96 +++++++++++++++++++++++++-------------------------- 1 file changed, 48 insertions(+), 48 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 3dbc5bcb2a..b37fdd8c8b 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -5020,11 +5020,11 @@ remote SMTP server.") #:build-flags #~(list "-tags=notmuch" (string-append - "-ldflags=-X main.Version=" #$version - " -X git.sr.ht/~rjarry/aerc/config.libexecDir=" - #$output "/libexec/aerc" - " -X git.sr.ht/~rjarry/aerc/config.shareDir=" - #$output "/share/aerc")) + "-ldflags=-X main.Version=" #$version + " -X git.sr.ht/~rjarry/aerc/config.libexecDir=" + #$output "/libexec/aerc" + " -X git.sr.ht/~rjarry/aerc/config.shareDir=" + #$output "/share/aerc")) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-paths @@ -5045,8 +5045,8 @@ remote SMTP server.") (substitute* "commands/z.go" (("\"zoxide\"") (string-append - "\"" (search-input-file inputs "bin/zoxide") - "\"")))) + "\"" (search-input-file inputs "bin/zoxide") + "\"")))) (substitute* (list "lib/crypto/gpg/gpg.go" "lib/crypto/gpg/gpg_test.go" "lib/crypto/gpg/gpgbin/keys.go" @@ -5068,47 +5068,47 @@ remote SMTP server.") (string-append "PREFIX=" #$output))))))) (inputs (append - (list gnupg - go-github-com-zenhack-go-notmuch - go-golang-org-x-oauth2 - go-github-com-xo-terminfo - go-github-com-stretchr-testify - go-github-com-riywo-loginshell - go-github-com-pkg-errors - go-github-com-mitchellh-go-homedir - go-github-com-miolini-datacounter - go-github-com-mattn-go-runewidth - go-github-com-mattn-go-isatty - go-github-com-lithammer-fuzzysearch - go-github-com-kyoh86-xdg - go-github-com-imdario-mergo - go-github-com-google-shlex - go-github-com-go-ini-ini - go-github-com-gdamore-tcell-v2 - go-github-com-gatherstars-com-jwz - go-github-com-fsnotify-fsnotify - go-github-com-emersion-go-smtp - go-github-com-emersion-go-sasl - go-github-com-emersion-go-pgpmail - go-github-com-emersion-go-message - go-github-com-emersion-go-maildir - go-github-com-emersion-go-imap-sortthread - go-github-com-emersion-go-imap - go-github-com-emersion-go-msgauth - go-github-com-emersion-go-mbox - go-github-com-ddevault-go-libvterm - go-github-com-danwakefield-fnmatch - go-github-com-creack-pty - go-github-com-arran4-golang-ical - go-github-com-protonmail-go-crypto - go-github-com-syndtr-goleveldb - go-git-sr-ht-sircmpwn-getopt - go-git-sr-ht-rockorager-tcell-term - python - python-vobject) - (if (supported-package? zoxide) - (list zoxide) - '()))) + (list gnupg + go-github-com-zenhack-go-notmuch + go-golang-org-x-oauth2 + go-github-com-xo-terminfo + go-github-com-stretchr-testify + go-github-com-riywo-loginshell + go-github-com-pkg-errors + go-github-com-mitchellh-go-homedir + go-github-com-miolini-datacounter + go-github-com-mattn-go-runewidth + go-github-com-mattn-go-isatty + go-github-com-lithammer-fuzzysearch + go-github-com-kyoh86-xdg + go-github-com-imdario-mergo + go-github-com-google-shlex + go-github-com-go-ini-ini + go-github-com-gdamore-tcell-v2 + go-github-com-gatherstars-com-jwz + go-github-com-fsnotify-fsnotify + go-github-com-emersion-go-smtp + go-github-com-emersion-go-sasl + go-github-com-emersion-go-pgpmail + go-github-com-emersion-go-message + go-github-com-emersion-go-maildir + go-github-com-emersion-go-imap-sortthread + go-github-com-emersion-go-imap + go-github-com-emersion-go-msgauth + go-github-com-emersion-go-mbox + go-github-com-ddevault-go-libvterm + go-github-com-danwakefield-fnmatch + go-github-com-creack-pty + go-github-com-arran4-golang-ical + go-github-com-protonmail-go-crypto + go-github-com-syndtr-goleveldb + go-git-sr-ht-sircmpwn-getopt + go-git-sr-ht-rockorager-tcell-term + python + python-vobject) + (if (supported-package? zoxide) + (list zoxide) + '()))) (native-inputs (list scdoc)) (home-page "https://git.sr.ht/~rjarry/aerc") (synopsis "Email client for the terminal") -- cgit v1.3 From 51fec36901b60d0f779b8f7f17d01e2b05733d0e Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 28 Jul 2024 00:44:14 +0100 Subject: gnu: aerc: Adjust inputs. * gnu/packages/mail.scm (aerc): Move all Golang packages from [inputs] to [native-inputs] and sort alphabetically. Change-Id: Ie2a55f761f57050f877d6a8861eb380c958e8814 --- gnu/packages/mail.scm | 75 ++++++++++++++++++++++++++------------------------- 1 file changed, 38 insertions(+), 37 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index b37fdd8c8b..fff10a9ff8 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -5069,50 +5069,51 @@ remote SMTP server.") (inputs (append (list gnupg - go-github-com-zenhack-go-notmuch - go-golang-org-x-oauth2 - go-github-com-xo-terminfo - go-github-com-stretchr-testify - go-github-com-riywo-loginshell - go-github-com-pkg-errors - go-github-com-mitchellh-go-homedir - go-github-com-miolini-datacounter - go-github-com-mattn-go-runewidth - go-github-com-mattn-go-isatty - go-github-com-lithammer-fuzzysearch - go-github-com-kyoh86-xdg - go-github-com-imdario-mergo - go-github-com-google-shlex - go-github-com-go-ini-ini - go-github-com-gdamore-tcell-v2 - go-github-com-gatherstars-com-jwz - go-github-com-fsnotify-fsnotify - go-github-com-emersion-go-smtp - go-github-com-emersion-go-sasl - go-github-com-emersion-go-pgpmail - go-github-com-emersion-go-message - go-github-com-emersion-go-maildir - go-github-com-emersion-go-imap-sortthread - go-github-com-emersion-go-imap - go-github-com-emersion-go-msgauth - go-github-com-emersion-go-mbox - go-github-com-ddevault-go-libvterm - go-github-com-danwakefield-fnmatch - go-github-com-creack-pty - go-github-com-arran4-golang-ical - go-github-com-protonmail-go-crypto - go-github-com-syndtr-goleveldb - go-git-sr-ht-sircmpwn-getopt - go-git-sr-ht-rockorager-tcell-term python python-vobject) (if (supported-package? zoxide) (list zoxide) '()))) - (native-inputs (list scdoc)) + (native-inputs + (list go-git-sr-ht-rockorager-tcell-term + go-git-sr-ht-sircmpwn-getopt + go-github-com-arran4-golang-ical + go-github-com-creack-pty + go-github-com-danwakefield-fnmatch + go-github-com-ddevault-go-libvterm + go-github-com-emersion-go-imap + go-github-com-emersion-go-imap-sortthread + go-github-com-emersion-go-maildir + go-github-com-emersion-go-mbox + go-github-com-emersion-go-message + go-github-com-emersion-go-msgauth + go-github-com-emersion-go-pgpmail + go-github-com-emersion-go-sasl + go-github-com-emersion-go-smtp + go-github-com-fsnotify-fsnotify + go-github-com-gatherstars-com-jwz + go-github-com-gdamore-tcell-v2 + go-github-com-go-ini-ini + go-github-com-google-shlex + go-github-com-imdario-mergo + go-github-com-kyoh86-xdg + go-github-com-lithammer-fuzzysearch + go-github-com-mattn-go-isatty + go-github-com-mattn-go-runewidth + go-github-com-miolini-datacounter + go-github-com-mitchellh-go-homedir + go-github-com-pkg-errors + go-github-com-protonmail-go-crypto + go-github-com-riywo-loginshell + go-github-com-stretchr-testify + go-github-com-syndtr-goleveldb + go-github-com-xo-terminfo + go-github-com-zenhack-go-notmuch + go-golang-org-x-oauth2 + scdoc)) (home-page "https://git.sr.ht/~rjarry/aerc") (synopsis "Email client for the terminal") - (description "@code{aerc} is a textual email client for terminals. It + (description "@code{aerc} is a textual email client for terminals. It features: @enumerate @item First-class support for using patches and @code{git send-email} -- cgit v1.3 From 5cb835a8396fa1d25a2791a70cfadcd3ac8dbd76 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 28 Jul 2024 01:00:17 +0100 Subject: gnu: aerc: Update to 0.18.1. * gnu/packages/mail.scm (aerc): Update to 0.18.1. [arguments]: <#:phases>: Adjust 'patch-paths phase to replace all occurrences of "sh" in all found *.go files. [inputs]: Add notmuch. [native-inputs]: Remove go-git-sr-ht-rockorager-tcell-term, go-git-sr-ht-sircmpwn-getopt, go-github-com-creack-pty, go-github-com-ddevault-go-libvterm, go-github-com-gdamore-tcell-v2, go-github-com-google-shlex, go-github-com-imdario-mergo, go-github-com-kyoh86-xdg, go-github-com-miolini-datacounter, go-github-com-mitchellh-go-homedir, go-github-com-xo-terminfo, and go-github-com-zenhack-go-notmuch; add go-git-sr-ht-rjarry-go-opt, go-git-sr-ht-rockorager-go-jmap, go-git-sr-ht-rockorager-vaxis, go-golang-org-x-image, go-golang-org-x-sys, and go-golang-org-x-tools. Change-Id: I4cd6de3fb90b33a1b421612c804ee2b01f6c8078 --- gnu/packages/mail.scm | 37 ++++++++++++++----------------------- 1 file changed, 14 insertions(+), 23 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index fff10a9ff8..acb8f3598b 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -5002,7 +5002,7 @@ remote SMTP server.") (define-public aerc (package (name "aerc") - (version "0.15.2") + (version "0.18.1") (source (origin (method git-fetch) (uri (git-reference @@ -5011,7 +5011,7 @@ remote SMTP server.") (file-name (git-file-name name version)) (sha256 (base32 - "1gbprx0i8d13q974n5hsys6lllav5cpll3cwrr1hfw6307hc001r")))) + "1gj8m8xvqaf0lsnk4h1n9d0qhwi8d3mm0w9zhw16v888n7rll9fb")))) (build-system go-build-system) (arguments (list #:import-path "git.sr.ht/~rjarry/aerc" @@ -5029,14 +5029,10 @@ remote SMTP server.") #~(modify-phases %standard-phases (add-after 'unpack 'patch-paths (lambda* (#:key import-path inputs #:allow-other-keys) - (with-directory-excursion - (string-append "src/" import-path) - (substitute* (list "config/config.go" - "lib/templates/template.go" - "widgets/compose.go" - "widgets/msgviewer.go" - "worker/maildir/worker.go" - "worker/notmuch/worker.go") + (with-directory-excursion (string-append "src/" import-path) + (substitute* (find-files "." "\\.go$") + ;; Patch all occurrences to "sh" with absolute path to + ;; the shell available in Guix. (("\"sh\"") (string-append "\"" (search-input-file inputs "bin/sh") @@ -5069,18 +5065,19 @@ remote SMTP server.") (inputs (append (list gnupg + notmuch ; Failing to build without it. python python-vobject) (if (supported-package? zoxide) (list zoxide) '()))) (native-inputs - (list go-git-sr-ht-rockorager-tcell-term - go-git-sr-ht-sircmpwn-getopt + (list go-git-sr-ht-rjarry-go-opt + go-git-sr-ht-rockorager-go-jmap + go-git-sr-ht-rockorager-vaxis + go-github-com-protonmail-go-crypto go-github-com-arran4-golang-ical - go-github-com-creack-pty go-github-com-danwakefield-fnmatch - go-github-com-ddevault-go-libvterm go-github-com-emersion-go-imap go-github-com-emersion-go-imap-sortthread go-github-com-emersion-go-maildir @@ -5092,24 +5089,18 @@ remote SMTP server.") go-github-com-emersion-go-smtp go-github-com-fsnotify-fsnotify go-github-com-gatherstars-com-jwz - go-github-com-gdamore-tcell-v2 go-github-com-go-ini-ini - go-github-com-google-shlex - go-github-com-imdario-mergo - go-github-com-kyoh86-xdg go-github-com-lithammer-fuzzysearch go-github-com-mattn-go-isatty go-github-com-mattn-go-runewidth - go-github-com-miolini-datacounter - go-github-com-mitchellh-go-homedir go-github-com-pkg-errors - go-github-com-protonmail-go-crypto go-github-com-riywo-loginshell go-github-com-stretchr-testify go-github-com-syndtr-goleveldb - go-github-com-xo-terminfo - go-github-com-zenhack-go-notmuch + go-golang-org-x-image go-golang-org-x-oauth2 + go-golang-org-x-sys + go-golang-org-x-tools scdoc)) (home-page "https://git.sr.ht/~rjarry/aerc") (synopsis "Email client for the terminal") -- cgit v1.3 From f7f125ba5fbed09289b6b98673b709664d2a01ea Mon Sep 17 00:00:00 2001 From: Jean SIMARD Date: Sat, 27 Jul 2024 13:07:52 +0000 Subject: gnu: go-github-com-protonmail-go-crypto: Update to 1.0.0. * gnu/packages/golang-crypto.scm (go-github-com-protonmail-go-crypto): Update to 1.0.0. Adjust package style. [inputs]: Add go-github-com-cloudflare-circl. Change-Id: I775c32f7da0e1983c085ddaf24f7767909bdaebc Signed-off-by: Sharlatan Hellseher --- gnu/packages/golang-crypto.scm | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm index 8d26aff08e..10259d7929 100644 --- a/gnu/packages/golang-crypto.scm +++ b/gnu/packages/golang-crypto.scm @@ -1202,32 +1202,35 @@ algorithm.") (define-public go-github-com-protonmail-go-crypto (package (name "go-github-com-protonmail-go-crypto") - (version "0.0.0-20220623141421-5afb4c282135") + (version "1.0.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/ProtonMail/go-crypto") - (commit (go-version->git-ref version)))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "05qxdbn8wdk901z5kw2r3jdrag58nxlcsy0p8xd6rq0d71sw94wy")))) + (base32 "11q94983r6zjrdvflpikms4773a9s5vb9gg4qw1rj5800yhhah0n")))) (build-system go-build-system) (arguments - (list #:import-path "github.com/ProtonMail/go-crypto" - #:tests? #f ; Source-only package. - #:phases - #~(modify-phases %standard-phases - ;; Source-only package. - (delete 'build)))) + (list + #:import-path "github.com/ProtonMail/go-crypto" + #:tests? #f ; Source-only package. + #:phases + #~(modify-phases %standard-phases + ;; Source-only package. + (delete 'build)))) (propagated-inputs - (list go-golang-org-x-crypto)) + (list go-github-com-cloudflare-circl + go-golang-org-x-crypto)) (home-page "https://github.com/ProtonMail/go-crypto") (synopsis "Fork of x/crypto with up-to-date OpenPGP implementation") - (description "This package provides cryptography for Go. This version of -the package is a fork that adds a more up-to-date OpenPGP implementation. It -is completely backwards compatible with @code{golang.org/x/crypto}, the -official package.") + (description + "This package provides cryptography for Go. This version of the package +is a fork that adds a more up-to-date OpenPGP implementation. It is +completely backwards compatible with @code{golang.org/x/crypto}, the official +package.") (license license:bsd-3))) (define-public go-github-com-quic-go-qtls-go1-20 -- cgit v1.3 From f400b64826caf6f5454cbcb1c7e891c870afb02f Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 27 Jul 2024 22:44:38 +0100 Subject: gnu: go-github-com-protonmail-go-crypto: Enable tests. * gnu/packages/golang-crypto.scm (go-github-com-protonmail-go-crypto): Enable tests. [arguments]: <#:phases>: Add custom 'check phase. Change-Id: I93f022ddc0f1145e136a13ba3e8e5a8cb86538c3 --- gnu/packages/golang-crypto.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm index 10259d7929..5bd593e801 100644 --- a/gnu/packages/golang-crypto.scm +++ b/gnu/packages/golang-crypto.scm @@ -1216,11 +1216,16 @@ algorithm.") (arguments (list #:import-path "github.com/ProtonMail/go-crypto" - #:tests? #f ; Source-only package. #:phases #~(modify-phases %standard-phases - ;; Source-only package. - (delete 'build)))) + ;; 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-cloudflare-circl go-golang-org-x-crypto)) -- cgit v1.3 From a4b1e5d348ba86b3d245e3647034c3e826f141c5 Mon Sep 17 00:00:00 2001 From: Jean SIMARD Date: Sat, 27 Jul 2024 13:07:57 +0000 Subject: gnu: Add go-github-com-boltdb-bolt. * gnu/packages/golang.scm (go-github-com-boltdb-bolt): New variable. Change-Id: I931688d0c32fc16a50cb58d4a7fef627d4e584a5 Signed-off-by: Sharlatan Hellseher --- gnu/packages/golang-xyz.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index 24cf0ec329..d06ca7a25a 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -35,6 +35,7 @@ ;;; Copyright © 2023 Wilko Meyer ;;; Copyright © 2024 Artyom V. Poptsov ;;; Copyright © 2024 Herman Rimm +;;; Copyright © 2024 Jean Simard ;;; Copyright © 2024 Jesse Eisses ;;; Copyright © 2024 Luis Higino ;;; Copyright © 2024 Troy Figiel @@ -1179,6 +1180,35 @@ information and periodically output metrics") quantiles over an unbounded data stream within low memory and CPU bounds.") (license license:bsd-2))) +;; XXX: This repository has been archived by the owner on Mar 9, 2019. It is +;; now read-only. +(define-public go-github-com-boltdb-bolt + (package + (name "go-github-com-boltdb-bolt") + (version "1.3.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/boltdb/bolt") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0z7j06lijfi4y30ggf2znak2zf2srv2m6c68ar712wd2ys44qb3r")))) + (build-system go-build-system) + (arguments + (list + #:tests? #f ;tests are broken in upstream + #:import-path "github.com/boltdb/bolt")) + (home-page "https://github.com/boltdb/bolt") + (synopsis "Embedded key/value database for Golang") + (description + "Bolt is a pure Go key/value store inspired by +@url{http://symas.com/mdb/, Howard Chu's LMDB project}. The goal of the +project is to provide a simple, fast, and reliable database for projects that +don't require a full database server such as Postgres or MySQL.") + (license license:expat))) + (define-public go-github-com-briandowns-spinner (package (name "go-github-com-briandowns-spinner") -- cgit v1.3 From ac42af9adfbae1bb6eafc12c4153de458da8a12f Mon Sep 17 00:00:00 2001 From: Jean SIMARD Date: Sat, 27 Jul 2024 13:08:06 +0000 Subject: gnu: Add go-github-com-emersion-go-bcrypt. * gnu/packages/golang-crypto.scm (go-github-com-emersion-go-bcrypt): New variable. Change-Id: Ib627f26eebe1e530668d5b8f971d082fb0ebbe77 Signed-off-by: Sharlatan Hellseher --- gnu/packages/golang-crypto.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm index 5bd593e801..43b1356d3f 100644 --- a/gnu/packages/golang-crypto.scm +++ b/gnu/packages/golang-crypto.scm @@ -22,6 +22,7 @@ ;;; Copyright © 2023, 2024 Artyom V. Poptsov ;;; Copyright © 2024 Jesse Eisses ;;; Copyright © 2024 Troy Figiel +;;; Copyright © 2024 Jean Simard ;;; ;;; This file is part of GNU Guix. ;;; @@ -524,6 +525,32 @@ and encrypting JSON Web Tokens (JWT). It relies only on the standard library.") (license license:expat))) +(define-public go-github-com-emersion-go-bcrypt + (package + (name "go-github-com-emersion-go-bcrypt") + (version "0.0.0-20170822072041-6e724a1baa63") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emersion/go-bcrypt") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1pchrgs05w30iqbh4d6iys4wvlyajsdwchp5mkf59amgsbyjaqgm")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/emersion/go-bcrypt")) + (propagated-inputs + (list go-golang-org-x-crypto)) + (home-page "https://github.com/emersion/go-bcrypt") + (synopsis "Extract of bcrypt from golang.org/x/crypto/bcrypt") + (description + "This package provides an extract @code{bcrypt} from +@code{golang.org/x/crypto/bcrypt}.") + (license license:bsd-3))) + (define-public go-github-com-emersion-go-pgpmail (package (name "go-github-com-emersion-go-pgpmail") -- cgit v1.3 From 1d4b72006e3704c954c8f3ccaaae37db5ff4000e Mon Sep 17 00:00:00 2001 From: Jean SIMARD Date: Sat, 27 Jul 2024 23:07:32 +0100 Subject: gnu: Add go-github-com-emersion-go-vcard. * gnu/packages/golang-xyz.scm (go-github-com-emersion-go-vcard): New variable. Signed-off-by: Sharlatan Hellseher Change-Id: I9bc4a69f51ac847718efcc0d891b9420096cc34e --- gnu/packages/golang-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index d06ca7a25a..13472e529c 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -1930,6 +1930,30 @@ scanner API made public.") for @code{Set}, @code{Get}, @code{Delete} and @code{Len}.") (license license:expat))) +(define-public go-github-com-emersion-go-vcard + (package + (name "go-github-com-emersion-go-vcard") + (version "0.0.0-20230815062825-8fda7d206ec9") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emersion/go-vcard") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "12n5jinj5xzdfl9jhqvjbzxvj32bw310mdw4q5rjv35pk566zixl")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/emersion/go-vcard")) + (home-page "https://github.com/emersion/go-vcard") + (synopsis "Parse and format vCard in Golang") + (description + "This package implements functionality to parse and format vCard as +specified in @url{https://datatracker.ietf.org/doc/html/rfc6350, RFC 6350}.") + (license license:expat))) + (define-public go-github-com-errata-ai-ini (package (name "go-github-com-errata-ai-ini") -- cgit v1.3 From 22b617992b8b1d0ffedb0b4d8c24800e4aab1f09 Mon Sep 17 00:00:00 2001 From: Jean SIMARD Date: Sat, 27 Jul 2024 23:13:46 +0100 Subject: gnu: Add go-github-com-teambition-rrule-go. * gnu/packages/golang-xyz.scm (go-github-com-teambition-rrule-go): New variable. Signed-off-by: Sharlatan Hellseher Change-Id: I93ea767548d00dd95a570baa358a0a36c81a44bc --- gnu/packages/golang-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index 13472e529c..b2db051f10 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -4981,6 +4981,31 @@ well as a program to generate applications and command files.") storage system.") (license license:bsd-2))) +(define-public go-github-com-teambition-rrule-go + (package + (name "go-github-com-teambition-rrule-go") + (version "1.8.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/teambition/rrule-go") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1fnbava35w9z60carny5b7whd4nkv6hrf9g43wwg8d88gfij9zj2")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/teambition/rrule-go")) + (home-page "https://github.com/teambition/rrule-go") + (synopsis "Recurrence rules for calendar dates for Golang") + (description + "This package provides a functionality to work with recurrence rules for +calendar dates. It offers a complete implementation of the +@url{https://www.ietf.org/rfc/rfc2445.txt,RFC 2445} specification.") + (license license:expat))) + (define-public go-github-com-thejerf-suture (package (name "go-github-com-thejerf-suture") -- cgit v1.3 From 7ac644f9962b7c7dbd6418111cbfef7f11b7c703 Mon Sep 17 00:00:00 2001 From: Jean SIMARD Date: Sat, 27 Jul 2024 23:19:15 +0100 Subject: gnu: Add go-github-com-emersion-go-ical. * gnu/packages/golang-xyz.scm (go-github-com-emersion-go-ical): New variable. Signed-off-by: Sharlatan Hellseher Change-Id: I60b52f51c7f2404f47990ef1728d5ccf38b98515 --- gnu/packages/golang-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index b2db051f10..90e2c8e72d 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -1930,6 +1930,31 @@ scanner API made public.") for @code{Set}, @code{Get}, @code{Delete} and @code{Len}.") (license license:expat))) +(define-public go-github-com-emersion-go-ical + (package + (name "go-github-com-emersion-go-ical") + (version "0.0.0-20240127095438-fc1c9d8fb2b6") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emersion/go-ical") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "01cn9kggkdalb6xp2nrka01gs40zs8v6h5bq8d2m8wrdcsy5b36v")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/emersion/go-ical")) + (propagated-inputs (list go-github-com-teambition-rrule-go)) + (home-page "https://github.com/emersion/go-ical") + (synopsis "iCalendar library for Golang") + (description + "This package implements @url{https://tools.ietf.org/html/rfc5545, RFC +5545} iCalendar specification.") + (license license:expat))) + (define-public go-github-com-emersion-go-vcard (package (name "go-github-com-emersion-go-vcard") -- cgit v1.3 From f73dbde86280472fd163bcbebf88f9b20b7f7a71 Mon Sep 17 00:00:00 2001 From: Jean SIMARD Date: Sat, 27 Jul 2024 23:26:52 +0100 Subject: gnu: Add go-github-com-emersion-go-webdav. * gnu/packages/golang-xyz.scm (go-github-com-emersion-go-webdav): New variable. Signed-off-by: Sharlatan Hellseher Change-Id: I7062a025e386727c45a8bffce8f059c736111f05 --- gnu/packages/golang-xyz.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index 90e2c8e72d..71bfeb0be5 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -1979,6 +1979,42 @@ for @code{Set}, @code{Get}, @code{Delete} and @code{Len}.") specified in @url{https://datatracker.ietf.org/doc/html/rfc6350, RFC 6350}.") (license license:expat))) +(define-public go-github-com-emersion-go-webdav + (package + (name "go-github-com-emersion-go-webdav") + (version "0.5.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emersion/go-webdav") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1ay0x3c1frkj4z3j17s42yvf1hgmg8223qmsyr41yxwz88zsvjlj")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/emersion/go-webdav" + #:phases + #~(modify-phases %standard-phases + (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-emersion-go-ical + go-github-com-emersion-go-vcard)) + (home-page "https://github.com/emersion/go-webdav") + (synopsis "WebDAV, CalDAV and CardDAV implementations in Golang") + (description + "This package provides Golang modules implementing WebDAV +@url{https://tools.ietf.org/html/rfc4918, RFC 4918}, CalDAV +@url{https://tools.ietf.org/html/rfc4791, RFC 4791} and CardDAV +@url{https://tools.ietf.org/html/rfc6352, RFC 6352} specifications.") + (license license:expat))) + (define-public go-github-com-errata-ai-ini (package (name "go-github-com-errata-ai-ini") -- cgit v1.3 From 2fc74bbc0e0c731add80b3c2b099242aff583ffb Mon Sep 17 00:00:00 2001 From: Jean SIMARD Date: Sat, 27 Jul 2024 13:08:31 +0000 Subject: gnu: Add hydroxide. * gnu/packages/mail.scm (hydroxide): New variable. Change-Id: Ic20d8d3d22afc4a580094bed64d0aa5059a1a9cf Signed-off-by: Sharlatan Hellseher --- gnu/packages/mail.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index acb8f3598b..5a77a8818a 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -56,6 +56,7 @@ ;;; Copyright © 2023 Arjan Adriaanse ;;; Copyright © 2023 Wilko Meyer ;;; Copyright © 2024 Benjamin Slade +;;; Copyright © 2024 Jean Simard ;;; ;;; This file is part of GNU Guix. ;;; @@ -5117,3 +5118,41 @@ features: ;; (license license:gpl3+))) + +(define-public hydroxide + (package + (name "hydroxide") + (version "0.2.29") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emersion/hydroxide") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "11gbikrgm7nf0zjav64202wsnr9pvrmslm2rzg9d9rbvwdqcq1jl")))) + (build-system go-build-system) + (arguments + (list + #:install-source? #f + #:import-path "github.com/emersion/hydroxide/cmd/hydroxide" + #:unpack-path "github.com/emersion/hydroxide")) + (native-inputs + (list go-github-com-protonmail-go-crypto + go-github-com-boltdb-bolt + go-github-com-emersion-go-bcrypt + go-github-com-emersion-go-imap + go-github-com-emersion-go-mbox + go-github-com-emersion-go-message + go-github-com-emersion-go-smtp + go-github-com-emersion-go-vcard + go-github-com-emersion-go-webdav + go-golang-org-x-crypto + go-golang-org-x-term)) + (home-page "https://github.com/emersion/hydroxide") + (synopsis "ProtonMail CardDAV, IMAP and SMTP bridge") + (description + "This package implements a functionality to translate standard +protocols (SMTP, IMAP, CardDAV) into ProtonMail API requests.") + (license license:expat))) -- cgit v1.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') 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 @@ all types of configuration needs and formats.") (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 @@ all types of configuration needs and formats.") (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.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') 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 @@ updating files, like @command{tail -f}.") (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 @@ updating files, like @command{tail -f}.") (file-name (git-file-name name version)) (sha256 (base32 - "12i402dxq5js4npnncg043vx874h6nk4ffn4gswcccxrp6h10ivz")))) + "1jz7nyq88i9fwfpp7krl046q62kjn6lb9j4r932bxnpypl1hwc49")))) (build-system go-build-system) (arguments (list -- cgit v1.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') 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 @@ filters for Go.") (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 @@ filters for Go.") (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.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') 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 @@ aware of your profiles and configuration in ~/.aws/config.") (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 @@ aware of your profiles and configuration in ~/.aws/config.") (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.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') 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 @@ terminal.") (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.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') 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 @@ serialiser for Go.") (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 @@ serialiser for Go.") (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.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') 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 @@ format.") (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 @@ format.") (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.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') 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 @@ optimized for sparse nodes of @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 @@ useful during debugging, to avoid wrapping long output lines in the 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.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') 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 @@ and stop increasing when a certain threshold is met.") 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 @@ a cron spec parser and job runner.") "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.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') 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 @@ and stop increasing when a certain threshold is met.") 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 @@ defined by RFC 5321.") (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.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') 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 @@ used to build IMAP clients and servers.") (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 @@ a cron spec parser and job runner.") "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.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') 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 @@ used to build IMAP clients and servers.") @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 @@ defined by RFC 5321.") (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.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') 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 @@ used to build IMAP clients and servers.") "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 @@ filters for Go.") "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.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') 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 @@ files.") 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 @@ defined by RFC 5321.") (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.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') 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 @@ Multipurpose Internet Mail Extensions in Go.") 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 @@ defined by RFC 5321.") (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.3 From 1434e3aeeab176d6271f912066a0b4eb18bd7759 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 28 Jul 2024 22:44:14 +0100 Subject: gnu: go-github-com-emersion-go-msgauth: Enable tests. * gnu/packages/golang-web.scm (go-github-com-emersion-go-msgauth): Enable tests. [arguments]: <#:phases>: Add custom 'check phase. Change-Id: I126a688146bc4e47980f4046fd3118008520fe70 --- gnu/packages/golang-web.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 02c1262b0d..4d9f0c0882 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -914,11 +914,16 @@ for Go.") (arguments (list #:import-path "github.com/emersion/go-msgauth" - #:tests? #f ; Source-only package. #:phases #~(modify-phases %standard-phases - ;; Source-only package. - (delete 'build)))) + ;; XXX: Run all tests, 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-golang-org-x-crypto go-github-com-emersion-go-milter -- cgit v1.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') 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 @@ for Go.") "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 @@ a cron spec parser and job runner.") 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.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') 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 @@ for Go.") "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 @@ a cron spec parser and job runner.") "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.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') 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 @@ in the style of communicating sequential processes (@dfn{CSP}).") (package (inherit go-1.21) (name "go") - (version "1.22.2") + (version "1.22.5") (source (origin (method git-fetch) @@ -960,7 +960,7 @@ in the style of communicating sequential processes (@dfn{CSP}).") (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.3