diff options
author | Sharlatan Hellseher <sharlatanus@gmail.com> | 2025-02-26 21:28:55 +0000 |
---|---|---|
committer | Sharlatan Hellseher <sharlatanus@gmail.com> | 2025-05-26 16:50:24 +0100 |
commit | 907b726b86f055d5e158c50a46e9570961ca0357 (patch) | |
tree | 5c5cef3305502b517c9a5868427395acdfd4803d | |
parent | 26325888c1f6604a0cf25f74c9d75455909b3bf9 (diff) |
gnu: go-github-com-go-md2man: Package executable separately.
* gnu/packages/golang-xyz.scm (go-github-com-go-md2man) [arguments]
<skip-build?>: Preserve the package for source only inputs.
(go-md2man): New variable.
* gnu/packages/check.scm (checkmake): [native-inputs]: Remove
go-github-com-go-md2man; add go-md2man.
* gnu/packages/containers.scm (buildah, podman): Likewise.
* gnu/packages/hardware.scm (brillo): Likewise.
* gnu/packages/printers.scm (ipp-usb): Likewise.
* gnu/packages/virtualization.scm (runc, skopeo): Likewise.
Change-Id: I753364633786574c603a978da75a57090d706b27
-rw-r--r-- | gnu/packages/check.scm | 4 | ||||
-rw-r--r-- | gnu/packages/containers.scm | 10 | ||||
-rw-r--r-- | gnu/packages/golang-xyz.scm | 19 | ||||
-rw-r--r-- | gnu/packages/hardware.scm | 2 | ||||
-rw-r--r-- | gnu/packages/printers.scm | 2 | ||||
-rw-r--r-- | gnu/packages/virtualization.scm | 7 |
6 files changed, 30 insertions, 14 deletions
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index db770b37ae..657969b759 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -413,9 +413,9 @@ source code editors and IDEs.") (native-inputs (list go-github-com-docopt-docopt-go go-github-com-go-ini-ini - go-github-com-go-md2man go-github-com-olekukonko-tablewriter - go-github-com-stretchr-testify)) + go-github-com-stretchr-testify + go-md2man)) (home-page "https://github.com/mrtazz/checkmake") (synopsis "Linter and analyzer for @file{Makefile}") (description diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index 91203df4c2..091850865e 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -489,8 +489,7 @@ Its main purpose is to support the key usage by @code{docker-init}: #~(list (string-append "CC=" #$(cc-for-target)) (string-append "PREFIX=" #$output) (string-append "HELPER_BINARIES_DIR=" #$output "/_guix") - (string-append "GOMD2MAN=" - #$go-github-com-go-md2man "/bin/go-md2man") + (string-append "GOMD2MAN=" #$go-md2man "/bin/go-md2man") (string-append "BUILDFLAGS=-trimpath")) #:tests? #f ; /sys/fs/cgroup not set up in guix sandbox #:test-target "test" @@ -575,7 +574,7 @@ Its main purpose is to support the key usage by @code{docker-init}: bats git-minimal/pinned go-1.22 - go-github-com-go-md2man + go-md2man gnu-gettext ; for envsubst mandoc pkg-config @@ -643,8 +642,7 @@ being rootless and not requiring any daemon to be running.") #:make-flags #~(list (string-append "CC=" #$(cc-for-target)) (string-append "PREFIX=" #$output) - (string-append "GOMD2MAN=" - #$go-github-com-go-md2man "/bin/go-md2man")) + (string-append "GOMD2MAN=" #$go-md2man "/bin/go-md2man")) #:tests? #f ; /sys/fs/cgroup not set up in guix sandbox #:test-target "test-unit" #:phases @@ -702,7 +700,7 @@ being rootless and not requiring any daemon to be running.") (native-inputs (list bats go-1.23 - go-github-com-go-md2man + go-md2man pkg-config)) (synopsis "Build @acronym{OCI, Open Container Initiative} images") (description diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index 0599677dfd..c213ad8978 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -3968,6 +3968,7 @@ it effectively reuses the JSON struct tags as well as the custom JSON methods (build-system go-build-system) (arguments (list + #:skip-build? #t #:import-path "github.com/cpuguy83/go-md2man")) (propagated-inputs (list go-github-com-russross-blackfriday-v2)) @@ -19498,6 +19499,24 @@ Jsonnet C++implementation.") (string-append (package-description go-github-com-vburenin-ifacemaker) " This package provides a command line interface (CLI) tool.")))) +(define-public go-md2man + (package/inherit go-github-com-go-md2man + (name "go-md2man") + (arguments + (substitute-keyword-arguments + (package-arguments go-github-com-go-md2man) + ((#:tests? _ #t) #f) + ((#:install-source? _ #t) #f) + ((#:skip-build? _ #t) #f))) + (native-inputs + (package-propagated-inputs go-github-com-go-md2man)) + (propagated-inputs '()) + (inputs '()) + (description + (string-append (package-description go-github-com-go-md2man) + "\nThis package provides a command line interface (CLI) +tool.")))) + (define-public go-msgio (package (inherit go-github-com-libp2p-go-msgio) diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index 91a021f2f0..6587189e0f 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -188,7 +188,7 @@ sets, and tools to deal with register databases.") (map (lambda (target) (apply invoke "make" target make-flags)) '("install.udev" "install.polkit"))))))) - (native-inputs (list go-github-com-go-md2man)) + (native-inputs (list go-md2man)) (supported-systems (lset-difference string=? %supported-systems %hurd-systems)) (home-page "https://gitlab.com/cameronnemo/brillo") diff --git a/gnu/packages/printers.scm b/gnu/packages/printers.scm index be13c2a10c..6c70590234 100644 --- a/gnu/packages/printers.scm +++ b/gnu/packages/printers.scm @@ -82,7 +82,7 @@ (list avahi libusb)) (native-inputs (list go-github-com-openprinting-goipp - go-github-com-go-md2man + go-md2man pkg-config)) (home-page "https://github.com/OpenPrinting/ipp-usb") (synopsis "HTTP reverse proxy, backed by the IPP-over-USB connection") diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 28dd3202df..c6656d9f47 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -2317,7 +2317,7 @@ main monitor/GPU.") (invoke "make" "install" "install-bash" "install-man" (string-append "PREFIX=" out))))))))) (native-inputs - (list go-github-com-go-md2man pkg-config)) + (list go-md2man pkg-config)) (inputs (list libseccomp)) (synopsis "Open container initiative runtime") @@ -2394,7 +2394,7 @@ Open Container Initiative (OCI) image layout and its tagged images.") (build-system gnu-build-system) (native-inputs (list go-1.22 - go-github-com-go-md2man + go-md2man pkg-config)) (inputs (list bash-minimal @@ -2413,8 +2413,7 @@ Open Container Initiative (OCI) image layout and its tagged images.") "PREFIX=" (string-append "DESTDIR=" #$output) "GOGCFLAGS=-trimpath" - (string-append "GOMD2MAN=" - #$go-github-com-go-md2man "/bin/go-md2man")) + (string-append "GOMD2MAN=" #$go-md2man "/bin/go-md2man")) #:tests? #f ; The tests require Docker #:test-target "test-unit" #:imported-modules |