diff options
| author | Sharlatan Hellseher <sharlatanus@gmail.com> | 2024-06-29 16:52:52 +0100 |
|---|---|---|
| committer | Sharlatan Hellseher <sharlatanus@gmail.com> | 2024-06-29 16:52:52 +0100 |
| commit | a2ca087a85470aed7b5bb2f90b57daf0b89ca151 (patch) | |
| tree | 3bc5a1e1150e5c359ab8b47b1f99543e0dc48e3c /gnu | |
| parent | 088d174fd99335cb516f7cddd2d2d240fd8fa7ce (diff) | |
| download | guix-a2ca087a85470aed7b5bb2f90b57daf0b89ca151.tar.gz guix-a2ca087a85470aed7b5bb2f90b57daf0b89ca151.zip | |
gnu: go-github-com-matttproud-golang-protobuf-extensions-pbutil: Rename variable.
* gnu/packages/golang-xyz.scm (go-github-com-matttproud-golang-protobuf-extensions-pbutil):
Rename variable to go-github-com-matttproud-golang-protobuf-extensions-v2 as seen in go.mod.
[arguments]: <#:unpack-path>: Remove it. <#:import-path>: Swap to
"github.com/matttproud/golang_protobuf_extensions/v2".
<#:phases>: Add custom 'check phase. Remove 'build phase.
* gnu/packages/golang.scm (go-github-com-prometheus-common)
[propagated-inputs]: Remove
go-github-com-matttproud-golang-protobuf-extensions-pbutil.
Add go-github-com-matttproud-golang-protobuf-extensions-v2.
Change-Id: Icf9db2997a47be4f0babec10edcb01a578a7a7e7
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/golang-xyz.scm | 17 | ||||
| -rw-r--r-- | gnu/packages/golang.scm | 2 |
2 files changed, 14 insertions, 5 deletions
diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index 118fe4f558..dafa4b2904 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -2702,9 +2702,9 @@ the @code{cpan} module @code{Parse::CommandLine}.") other directories. It is optimized for filewalking.") (license license:expat))) -(define-public go-github-com-matttproud-golang-protobuf-extensions-pbutil +(define-public go-github-com-matttproud-golang-protobuf-extensions-v2 (package - (name "go-github-com-matttproud-golang-protobuf-extensions-pbutil") + (name "go-github-com-matttproud-golang-protobuf-extensions-v2") (version "2.0.0") (source (origin @@ -2720,8 +2720,17 @@ other directories. It is optimized for filewalking.") (build-system go-build-system) (arguments (list - #:import-path "github.com/matttproud/golang_protobuf_extensions/v2/pbutil" - #:unpack-path "github.com/matttproud/golang_protobuf_extensions/v2")) + #:import-path "github.com/matttproud/golang_protobuf_extensions/v2" + #:phases + #~(modify-phases %standard-phases + ;; XXX: Activate when go-build-system supports submodules. + (delete 'build) + ;; 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" "./...")))))))) (propagated-inputs (list go-github-com-golang-protobuf go-google-golang-org-protobuf)) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 7f8e7734fc..64d3ab22fb 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7599,7 +7599,7 @@ formatting information, rather than the current locale name.") (delete 'build)))) (propagated-inputs (list go-github-com-golang-protobuf - go-github-com-matttproud-golang-protobuf-extensions-pbutil + go-github-com-matttproud-golang-protobuf-extensions-v2 go-github-com-prometheus-client-model)) (synopsis "Prometheus metrics") (description "This package provides tools for reading and writing |