guix_mirror_bot pushed a commit to branch master
in repository guix.
commit 77084f8b476910880e79df5370c6803611c80008
Author: Sharlatan Hellseher <[email protected]>
AuthorDate: Sun Oct 11 21:33:45 2026 +0100
gnu: umoci: Inherit from the source variant.
* gnu/packages/containers.scm (umoci): Inherit from
go-github-com-opencontainers-umoci.
---
gnu/packages/containers.scm | 108 +++++++++++++-------------------------------
1 file changed, 32 insertions(+), 76 deletions(-)
diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm
index a2d17ac1198..f176d6b9ba3 100644
--- a/gnu/packages/containers.scm
+++ b/gnu/packages/containers.scm
@@ -3954,85 +3954,41 @@ Tini is integrated with Docker.")
(license license:expat)))
(define-public umoci
- (package
+ (package/inherit go-github-com-opencontainers-umoci
(name "umoci")
- ;; 0.6.0 (2025-10-15); to support latest
- ;; go-github-com-cyphar-filepath-securejoin.
- (properties '((commit . "f5d1219acaf67127ebacf6306776d3ff465735ea")
- (revision . "0")))
- (version (git-version "0.6.0"
- (assoc-ref properties 'revision)
- (assoc-ref properties 'commit)))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/opencontainers/umoci";)
- (commit (assoc-ref properties 'commit))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "06dc6jnl3wfk6vmq8cdpijvm8h6gygf0i7r4s9s8spyxlk2aph5c"))
- (snippet
- #~(begin
- (use-modules (guix build utils))
- (delete-file-recursively "vendor")))))
- (build-system go-build-system)
(arguments
- (list
- #:install-source? #f
- #:import-path "github.com/opencontainers/umoci/cmd/umoci"
- #:unpack-path "github.com/opencontainers/umoci"
- #:test-flags
- ;; Two tests fail with error: unpack config.json: convert spec to
- ;; rootless: inspecting mount flags of /etc/resolv.conf: no such file or
- ;; directory
- #~(list "-skip" (string-append "TestUnpackManifestCustomLayer"
- "|TestUnpackStartFromDescriptor"))
- #:test-subdirs #~(list "../../...") ;test the whole library
- #:build-flags
- #~(list (string-append "-ldflags="
- "-X github.com/opencontainers/umoci.version="
- #$version))
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'install 'build-and-install-man-pages
- (lambda* (#:key unpack-path #:allow-other-keys)
- (with-directory-excursion
- (string-append "src/" unpack-path "/doc/man")
- (mkdir-p (string-append #$output "/share/man/man1"))
- (for-each
- (lambda (file)
- (let* ((file (string-drop-right file 3)) ;cut .md
- (in-md (string-append file ".md"))
- (out-man (string-append #$output
- "/share/man/man1/" file)))
- (invoke "go-md2man" "-in" in-md "-out" out-man)))
- (find-files "." "\\.md$"))))))))
+ (substitute-keyword-arguments arguments
+ ((#:build-flags _ #~(list))
+ #~(list (string-append "-ldflags="
+ "-X github.com/opencontainers/umoci.version="
+ #$(package-version this-package))))
+ ((#:import-path _) "github.com/opencontainers/umoci/cmd/umoci")
+ ((#:install-source? _ #t) #f)
+ ((#:skip-build? _ #t) #f)
+ ((#:tests? _ #t) #f)
+ ((#:unpack-path _ "") "github.com/opencontainers/umoci")
+ ((#:phases phases '%standard-phases)
+ #~(modify-phases #$phases
+ (add-after 'install 'build-and-install-man-pages
+ (lambda* (#:key unpack-path #:allow-other-keys)
+ (with-directory-excursion
+ (string-append "src/" unpack-path "/doc/man")
+ (mkdir-p (string-append #$output "/share/man/man1"))
+ (for-each
+ (lambda (file)
+ (let* ((file (string-drop-right file 3)) ;cut .md
+ (in-md (string-append file ".md"))
+ (out-man (string-append #$output
+ "/share/man/man1/" file)))
+ (invoke "go-md2man" "-in" in-md "-out" out-man)))
+ (find-files "." "\\.md$")))))))))
(native-inputs
- (list go-github-com-adalogics-go-fuzz-headers
- go-github-com-apex-log
- go-github-com-blang-semver-v4
- go-github-com-containerd-platforms
- go-github-com-cyphar-filepath-securejoin
- go-github-com-docker-go-units
- go-github-com-klauspost-compress
- go-github-com-klauspost-pgzip
- go-github-com-moby-sys-user
- go-github-com-moby-sys-userns
- go-github-com-mohae-deepcopy
- go-github-com-opencontainers-go-digest
- go-github-com-opencontainers-image-spec
- go-github-com-opencontainers-runtime-spec
- go-github-com-rootless-containers-proto-go-proto
- go-github-com-stretchr-testify
- go-github-com-urfave-cli
- go-github-com-vbatts-go-mtree
- go-golang-org-x-sys
- go-google-golang-org-protobuf
- go-md2man))
- (home-page "https://umo.ci/";)
+ (append
+ (modify-inputs native-inputs (prepend go-md2man))
+ (package-propagated-inputs go-github-com-opencontainers-umoci)))
+ (propagated-inputs '())
+ (inputs '())
(synopsis "Tool for modifying Open Container images")
(description
"@command{umoci} is a tool that allows for high-level modification of an
-Open Container Initiative (OCI) image layout and its tagged images.")
- (license license:asl2.0)))
+Open Container Initiative (OCI) image layout and its tagged images.")))
