[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
12/21: gnu: podman: Use G-expressions.
From: |
guix-commits |
Subject: |
12/21: gnu: podman: Use G-expressions. |
Date: |
Thu, 8 Sep 2022 10:24:07 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 14a450ae218ee0d33d5a5a9650eba601df8321fc
Author: Zhu Zihao <all_but_last@163.com>
AuthorDate: Sun Sep 4 13:23:29 2022 +0800
gnu: podman: Use G-expressions.
* gnu/packages/containers.scm (podman)[arguments]: Use G-expressions.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
gnu/packages/containers.scm | 74 ++++++++++++++++++++++++---------------------
1 file changed, 39 insertions(+), 35 deletions(-)
diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm
index a156f4191c..32d772f16c 100644
--- a/gnu/packages/containers.scm
+++ b/gnu/packages/containers.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2021 Timmy Douglas <mail@timmydouglas.com>
;;; Copyright © 2022 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -284,41 +285,44 @@ configure network interfaces in Linux containers.")
(build-system gnu-build-system)
(arguments
- `(#:make-flags (list ,(string-append "CC=" (cc-for-target))
- (string-append "PREFIX=" %output))
- #:tests? #f ; /sys/fs/cgroup not set up in guix sandbox
- #:test-target "test"
- #:phases (modify-phases %standard-phases
- (delete 'configure)
- (add-after 'unpack 'set-env
- (lambda* (#:key inputs #:allow-other-keys)
- ;; when running go, things fail because
- ;; HOME=/homeless-shelter.
- (setenv "HOME" "/tmp")))
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (when tests?
- ;; (invoke "strace" "-f" "bin/podman" "version")
- (invoke "make" "localsystem")
- (invoke "make" "remotesystem"))))
- (add-after 'unpack 'fix-hardcoded-paths
- (lambda _
- (substitute* (find-files "libpod" "\\.go")
- (("exec.LookPath[(][\"]slirp4netns[\"][)]")
- (string-append "exec.LookPath(\""
- (which "slirp4netns") "\")")))
- (substitute* "hack/install_catatonit.sh"
- (("CATATONIT_PATH=\"[^\"]+\"")
- (string-append "CATATONIT_PATH=" (which "true"))))
- (substitute*
"vendor/github.com/containers/common/pkg/config/config_linux.go"
- (("/usr/local/libexec/podman")
- (string-append (assoc-ref %outputs "out") "/bin")))
- (substitute*
"vendor/github.com/containers/common/pkg/config/default.go"
- (("/usr/libexec/podman/conmon") (which "conmon"))
- (("/usr/local/libexec/cni")
- (string-append (assoc-ref %build-inputs "cni-plugins")
- "/bin"))
- (("/usr/bin/crun") (which "crun"))))))))
+ (list
+ #:make-flags
+ #~(list #$(string-append "CC=" (cc-for-target))
+ (string-append "PREFIX=" #$output))
+ #:tests? #f ; /sys/fs/cgroup not set up in guix sandbox
+ #:test-target "test"
+ #:phases
+ #~(modify-phases %standard-phases
+ (delete 'configure)
+ (add-after 'unpack 'set-env
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; when running go, things fail because
+ ;; HOME=/homeless-shelter.
+ (setenv "HOME" "/tmp")))
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ ;; (invoke "strace" "-f" "bin/podman" "version")
+ (invoke "make" "localsystem")
+ (invoke "make" "remotesystem"))))
+ (add-after 'unpack 'fix-hardcoded-paths
+ (lambda _
+ (substitute* (find-files "libpod" "\\.go")
+ (("exec.LookPath[(][\"]slirp4netns[\"][)]")
+ (string-append "exec.LookPath(\""
+ (which "slirp4netns") "\")")))
+ (substitute* "hack/install_catatonit.sh"
+ (("CATATONIT_PATH=\"[^\"]+\"")
+ (string-append "CATATONIT_PATH=" (which "true"))))
+ (substitute*
"vendor/github.com/containers/common/pkg/config/config_linux.go"
+ (("/usr/local/libexec/podman")
+ (string-append #$output "/bin")))
+ (substitute*
"vendor/github.com/containers/common/pkg/config/default.go"
+ (("/usr/libexec/podman/conmon") (which "conmon"))
+ (("/usr/local/libexec/cni")
+ (string-append #$(this-package-input "cni-plugins")
+ "/bin"))
+ (("/usr/bin/crun") (which "crun"))))))))
(inputs
(list btrfs-progs
cni-plugins
- branch master updated (38e8373830 -> 685dd8fb13), guix-commits, 2022/09/08
- 01/21: search-paths: Remove redundant uses of 'define-public'., guix-commits, 2022/09/08
- 02/21: search-paths: Clarify $GUIX_EXTENSIONS_PATH comment., guix-commits, 2022/09/08
- 08/21: gnu: Add man-pages-posix., guix-commits, 2022/09/08
- 10/21: gnu: Add mimalloc., guix-commits, 2022/09/08
- 14/21: gnu: Add texlive-latex-lastpage., guix-commits, 2022/09/08
- 12/21: gnu: podman: Use G-expressions.,
guix-commits <=
- 09/21: gnu: man-pages: Update to new style., guix-commits, 2022/09/08
- 19/21: gnu: dragon-drop: Update to 1.2.0., guix-commits, 2022/09/08
- 21/21: services: agetty-service-type: Add missing dash., guix-commits, 2022/09/08
- 03/21: search-paths: Tweak $SSL_CERT_DIR comment., guix-commits, 2022/09/08
- 17/21: gnu: Add texlive-latex-totcount., guix-commits, 2022/09/08
- 20/21: gnu: strawberry: Update to 1.0.9., guix-commits, 2022/09/08
- 06/21: file-systems: Open files with O_CLOEXEC., guix-commits, 2022/09/08
- 04/21: import: gnome: Reject version strings such as "43.alpha"., guix-commits, 2022/09/08
- 05/21: syscalls: Avoid repeated calls to 'syscall->procedure'., guix-commits, 2022/09/08
- 13/21: gnu: podman: Update to 4.2.0., guix-commits, 2022/09/08