guix_mirror_bot pushed a commit to branch master
in repository guix.
commit 6c8a61e49d3d20ff185dade490abd103d584b6a8
Author: Sharlatan Hellseher <[email protected]>
AuthorDate: Sun Oct 11 21:42:20 2026 +0100
gnu: runc: Inherit from the source variant.
* gnu/packages/containers.scm (runc): Inherit from
go-github-com-opencontainers-runc.
---
gnu/packages/containers.scm | 92 +++++++++++++--------------------------------
1 file changed, 26 insertions(+), 66 deletions(-)
diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm
index 0ea277f8257..823a69464db 100644
--- a/gnu/packages/containers.scm
+++ b/gnu/packages/containers.scm
@@ -3735,75 +3735,36 @@ user_namespaces(7)}.
@end itemize")))
(define-public runc
- ;; TODO: Inheerit form go-github-com-opencontainers-runc when it's moved
- ;; here.
- (package
+ (package/inherit go-github-com-opencontainers-runc
(name "runc")
- (version "1.5.2")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/opencontainers/runc";)
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "01y0mp31iywr7kh0cfnn9h2mya2lhasybmlirh156apmmw82gq8c"))
- (snippet
- #~(begin
- (use-modules (guix build utils))
- (delete-file-recursively "vendor")))))
- (build-system go-build-system)
(arguments
- (list
- ;; XXX: 20/139 tests fail due to missing /var, cgroups and apparmor in
- ;; the build environment.
- #:tests? #f
- #:install-source? #f
- #:import-path "github.com/opencontainers/runc"
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'patch-source
- (lambda* (#:key import-path #:allow-other-keys)
- (substitute* (string-append "src/" import-path "/Makefile")
- (("/bin/bash") (which "bash")))))
- (replace 'build
- (lambda* (#:key import-path #:allow-other-keys)
- (with-directory-excursion (string-append "src/" import-path)
- (invoke "make" "all" "man"))))
- (replace 'install
- (lambda* (#:key import-path outputs #:allow-other-keys)
- (with-directory-excursion (string-append "src/" import-path)
- (invoke "make" "install" "install-bash" "install-man"
- (string-append "PREFIX=" #$output))))))))
+ (substitute-keyword-arguments arguments
+ ((#:import-path _) "github.com/opencontainers/runc")
+ ((#:install-source? _ #t) #f)
+ ((#:skip-build? _ #t) #f)
+ ((#:tests? _ #t) #f)
+ ((#:phases phases '%standard-phases)
+ #~(modify-phases #$phases
+ (add-after 'unpack 'patch-source
+ (lambda* (#:key import-path #:allow-other-keys)
+ (substitute* (string-append "src/" import-path "/Makefile")
+ (("/bin/bash") (which "bash")))))
+ (replace 'build
+ (lambda* (#:key import-path #:allow-other-keys)
+ (with-directory-excursion (string-append "src/" import-path)
+ (invoke "make" "all" "man"))))
+ (replace 'install
+ (lambda* (#:key import-path outputs #:allow-other-keys)
+ (with-directory-excursion (string-append "src/" import-path)
+ (invoke "make" "install" "install-bash" "install-man"
+ (string-append "PREFIX=" #$output)))))))))
(native-inputs
- (list go-cyphar-com-go-pathrs
- go-github-com-checkpoint-restore-go-criu-v8
- go-github-com-containerd-console
- go-github-com-coreos-go-systemd-v22
- go-github-com-cyphar-filepath-securejoin
- go-github-com-docker-go-units
- go-github-com-godbus-dbus-v5
- go-github-com-moby-sys-capability
- go-github-com-moby-sys-devices
- go-github-com-moby-sys-mountinfo
- go-github-com-moby-sys-user
- go-github-com-moby-sys-userns
- go-github-com-mrunalp-fileutils
- go-github-com-opencontainers-cgroups
- go-github-com-opencontainers-runtime-spec
- go-github-com-opencontainers-selinux
- go-github-com-seccomp-libseccomp-golang
- go-github-com-sirupsen-logrus
- go-github-com-urfave-cli
- go-github-com-vishvananda-netlink
- go-github-com-vishvananda-netns
- go-golang-org-x-net
- go-golang-org-x-sys
- go-md2man
- pkg-config))
+ (append
+ (modify-inputs native-inputs (prepend go-md2man pkg-config))
+ (package-propagated-inputs go-github-com-opencontainers-runc)))
(inputs
(list libseccomp))
+ (propagated-inputs '())
(synopsis "Open container initiative runtime")
(home-page "https://opencontainers.org/";)
(description
@@ -3811,8 +3772,7 @@ user_namespaces(7)}.
packaged according to the
@uref{https://github.com/opencontainers/runtime-spec/blob/master/spec.md, Open
Container Initiative (OCI) format} and is a compliant implementation of the
-Open Container Initiative specification.")
- (license license:asl2.0)))
+Open Container Initiative specification.")))
(define-public skopeo
(package
