From a2ca087a85470aed7b5bb2f90b57daf0b89ca151 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 29 Jun 2024 16:52:52 +0100 Subject: 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 --- gnu/packages/golang-xyz.scm | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'gnu/packages/golang-xyz.scm') 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 @@ (define-public go-github-com-mattn-go-zglob 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 @@ (define-public go-github-com-matttproud-golang-protobuf-extensions-pbutil (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)) -- cgit v1.2.3