guix_mirror_bot pushed a commit to branch go-team in repository guix. commit 4e5247fcf46893b69b62b69244eb593fea8b497e Author: Sharlatan Hellseher <sharlata...@gmail.com> AuthorDate: Sun Jun 8 22:44:46 2025 +0100
gnu: go-ginkgo: Fix build. * gnu/packages/golang-check.scm (go-github-com-onsi-ginkgo-v2) [native-inputs]: Add go-go-uber-org-automaxprocs. (go-ginkgo): Swap to PACKAGE/INHERIT. [arguments]: Substitute instead of overwrite. [native-inputs]: Merge native and propagated inputs from go-github-com-onsi-ginkgo-v2. [propagated-inputs]: Drop all. [inputs]: Likewise. Change-Id: Ie5184de7ed2176a955ac5c089da37606b145ac7a --- gnu/packages/golang-check.scm | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm index 42ddc726ef..be794e97f4 100644 --- a/gnu/packages/golang-check.scm +++ b/gnu/packages/golang-check.scm @@ -1598,6 +1598,8 @@ Gomega matcher library.") ;; XXX: Most of the tests hang, find out why, keeping bare minimal ;; amount. #~(list "dsl/..." "extensions/globals" "."))) + (native-inputs + (list go-go-uber-org-automaxprocs)) ; for the CLI (propagated-inputs (list go-github-com-go-logr-logr go-github-com-go-task-slim-sprig-v3 @@ -2822,14 +2824,20 @@ thoroughly ;;; (define-public go-ginkgo - (package - (inherit go-github-com-onsi-ginkgo-v2) + (package/inherit go-github-com-onsi-ginkgo-v2 (name "ginkgo") (arguments - (list - #:import-path "github.com/onsi/ginkgo/ginkgo" - #:unpack-path "github.com/onsi/ginkgo" - #:install-source? #f)) + (substitute-keyword-arguments + (package-arguments go-github-com-onsi-ginkgo-v2) + ((#:tests? _ #t) #f) + ((#:install-source? _ #t) #f) + ((#:import-path _) "github.com/onsi/ginkgo/ginkgo") + ((#:unpack-path _ "") "github.com/onsi/ginkgo"))) + (native-inputs + (append (package-native-inputs go-github-com-onsi-ginkgo-v2) + (package-propagated-inputs go-github-com-onsi-ginkgo-v2))) + (propagated-inputs '()) + (inputs '()) (description (string-append (package-description go-github-com-onsi-ginkgo-v2) " This package provides an command line interface (CLI)