guix_mirror_bot pushed a commit to branch master
in repository guix.
commit 78a3eb37704d73dc0978637a970f77c7d90166c9
Author: Sharlatan Hellseher <[email protected]>
AuthorDate: Thu Sep 10 14:56:41 2026 +0100
gnu: umoci: Update to 0.6.0-0.f5d1219.
* gnu/packages/containers.scm (umoci): Update to
f5d1219acaf67127ebacf6306776d3ff465735ea commit.
[native-inputs]: Replace go-github-com-cyphar-filepath-securejoin-0.4.1
with go-github-com-cyphar-filepath-securejoin; remove
go-github-com-cyphar-go-mtree; add go-github-com-vbatts-go-mtree.
* gnu/packages/golang-xyz.scm (go-github-com-cyphar-go-mtree): Delete
variable; hidden ad-hoc for umoci only.
---
gnu/packages/containers.scm | 16 +++++++++++-----
gnu/packages/golang-xyz.scm | 44 --------------------------------------------
2 files changed, 11 insertions(+), 49 deletions(-)
diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm
index e7f014c2758..a2d17ac1198 100644
--- a/gnu/packages/containers.scm
+++ b/gnu/packages/containers.scm
@@ -3956,16 +3956,22 @@ Tini is integrated with Docker.")
(define-public umoci
(package
(name "umoci")
- (version "0.6.0")
+ ;; 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 (string-append "v" version))))
+ (commit (assoc-ref properties 'commit))))
(file-name (git-file-name name version))
(sha256
- (base32 "0m50x2q2h34g6sh786blf8r9wh098yzgwnicdlx0cgsqqwjsn0ia"))
+ (base32 "06dc6jnl3wfk6vmq8cdpijvm8h6gygf0i7r4s9s8spyxlk2aph5c"))
(snippet
#~(begin
(use-modules (guix build utils))
@@ -4007,8 +4013,7 @@ Tini is integrated with Docker.")
go-github-com-apex-log
go-github-com-blang-semver-v4
go-github-com-containerd-platforms
- go-github-com-cyphar-filepath-securejoin-0.4.1
- go-github-com-cyphar-go-mtree
+ go-github-com-cyphar-filepath-securejoin
go-github-com-docker-go-units
go-github-com-klauspost-compress
go-github-com-klauspost-pgzip
@@ -4021,6 +4026,7 @@ Tini is integrated with Docker.")
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))
diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index b6b5053c41e..ba897f3b137 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -9348,50 +9348,6 @@ more tangible.")
(sha256
(base32 "0cyqbxmrn3qgq8q0v7xmm9knc8nr60s017yrhkghcwg4yqqpmr9l")))))))
-;; 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")
