guix_mirror_bot pushed a commit to branch master
in repository guix.
commit f5b7e394475f1b5dfbaaa77d71df00619972846c
Author: Sharlatan Hellseher <[email protected]>
AuthorDate: Thu Feb 12 12:33:11 2026 +0000
gnu: umoci: Update to 0.6.0.
* gnu/packages/virtualization.scm (umoci): Update to 0.6.0.
[native-inputs]: Remove go-github-com-opencontainers-image-spec-1.0.2,
and go-github-com-vbatts-go-mtree; add
go-github-com-containerd-platforms, go-github-com-cyphar-go-mtree, and
go-github-com-opencontainers-image-spec.
* gnu/packages/golang-xyz.scm (go-github-com-cyphar-go-mtree): New variable.
(go-github-com-opencontainers-image-spec-1.0.2): Delete variable.
Change-Id: I2145fb3414eef0be5e563fab9d34b5f35574c696
---
gnu/packages/golang-xyz.scm | 68 ++++++++++++++++++++++++++---------------
gnu/packages/virtualization.scm | 11 ++++---
2 files changed, 50 insertions(+), 29 deletions(-)
diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index e29e3c4b55..245fe9a666 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -6282,6 +6282,50 @@ provide a @code{PoC} implementation to make the
@code{SecureJoin} proposal
more tangible.")
(license license:bsd-3)))
+;; For [email protected], remove when a fresh version is released.
+(define-public go-github-com-cyphar-go-mtree
+ (let ((commit "54003baae6e5e009853fa0b67da7ad43cdc9059a")
+ (revision "0"))
+ (hidden-package
+ (package
+ (name "go-github-com-cyphar-go-mtree")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/cyphar/go-mtree";)
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1z063grsqawnpmwv2m3gm4pfssm5ynzssvn9igw5x4l237zbpl52"))
+ (modules '((guix build utils)))
+ (snippet
+ #~(begin
+ ;; Module name has been changed upstream.
+ (substitute* (find-files "." "\\.go$")
+ (("github.com/vbatts/go-mtree")
+ "github.com/vbatts/go-mtree"))))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/vbatts/go-mtree"))
+ (native-inputs
+ (list go-github-com-davecgh-go-spew))
+ (propagated-inputs
+ (list go-github-com-fatih-color
+ go-github-com-sirupsen-logrus
+ go-github-com-urfave-cli-v2
+ go-golang-org-x-crypto
+ go-golang-org-x-sys))
+ (home-page "https://github.com/cyphar/go-mtree";)
+ (synopsis "File systems verification utility and library")
+ (description
+ "This package is alternative fork of
+@url{https://github.com/vbatts/go-mtree} required for @code{umoci} version
+1.6.0.")
+ (license license:bsd-3)))))
+
(define-public go-github-com-d4l3k-messagediff
(package
(name "go-github-com-d4l3k-messagediff")
@@ -18987,30 +19031,6 @@ digests with little effort.")
container image format spec (OCI Image Format).")
(license license:asl2.0)))
-;; For [email protected], remove when a fresh version is released.
-(define-public go-github-com-opencontainers-image-spec-1.0.2
- (hidden-package
- (package
- (inherit go-github-com-opencontainers-image-spec)
- (name "go-github-com-opencontainers-image-spec")
- (version "1.0.2")
- (source
- (origin
- (method git-fetch)
- (uri
- (git-reference
- (url "https://github.com/opencontainers/image-spec";)
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "1wcw1z39wjx338406ga86a41f5ird0yc4ab3c70nfhkpkvjjzhkm"))))
- (arguments
- (list #:skip-build? #t
- #:tests? #f
- #:import-path "github.com/opencontainers/image-spec"))
- (propagated-inputs
- (list go-github-com-pkg-errors)))))
-
(define-public go-github-com-opencontainers-runc
(package
(name "go-github-com-opencontainers-runc")
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 4b353c524f..ea661b6d63 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -2444,7 +2444,7 @@ Open Container Initiative specification.")
(define-public umoci
(package
(name "umoci")
- (version "0.5.1")
+ (version "0.6.0")
(source
(origin
(method git-fetch)
@@ -2453,7 +2453,7 @@ Open Container Initiative specification.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0446xw8jrxgf2vgi30vlihak6z9srzbkzvm4v47nm0c87fijmigs"))
+ (base32 "0m50x2q2h34g6sh786blf8r9wh098yzgwnicdlx0cgsqqwjsn0ia"))
(snippet
#~(begin
(use-modules (guix build utils))
@@ -2476,11 +2476,13 @@ Open Container Initiative specification.")
"-X github.com/opencontainers/umoci.version="
#$version))))
;; TODO: build manpages from <doc/man> with 'go-md2man'.
- (native-inputs
+ (propagated-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-cyphar-go-mtree
go-github-com-docker-go-units
go-github-com-klauspost-compress
go-github-com-klauspost-pgzip
@@ -2488,12 +2490,11 @@ Open Container Initiative specification.")
go-github-com-moby-sys-userns
go-github-com-mohae-deepcopy
go-github-com-opencontainers-go-digest
- go-github-com-opencontainers-image-spec-1.0.2
+ 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))
(home-page "https://umo.ci/";)
