From 1a4bc7e1208188176eeea6b8632361845e37d317 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 8 Jun 2025 22:44:46 +0100 Subject: [PATCH] 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 58854063552252b4bdf5c7ace6efeac990894cbb..34d151c8d45c3d029bc2c0d8d7962f4f685fb668 100644 --- a/gnu/packages/golang-check.scm +++ b/gnu/packages/golang-check.scm @@ -1807,6 +1807,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 @@ -3022,14 +3024,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)