[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/07: gnu: docker: Refer to xz by its absolute path.
From: |
guix-commits |
Subject: |
07/07: gnu: docker: Refer to xz by its absolute path. |
Date: |
Sun, 5 May 2019 21:42:42 -0400 (EDT) |
apteryx pushed a commit to branch master
in repository guix.
commit 59781b32d85a634de04ed015ba72db00f13b6dcc
Author: Maxim Cournoyer <address@hidden>
Date: Sat Apr 13 22:58:55 2019 -0400
gnu: docker: Refer to xz by its absolute path.
* gnu/packages/docker.scm (docker)[inputs]: Add xz.
[phases]{patch-paths}: Patch the reference to xz.
---
gnu/packages/docker.scm | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm
index 50ff1b6..669d082 100644
--- a/gnu/packages/docker.scm
+++ b/gnu/packages/docker.scm
@@ -368,6 +368,9 @@ built-in registry server of Docker.")
(string-append "var userlandProxyCommandName = \""
(assoc-ref inputs "docker-proxy")
"/bin/proxy\"\n")))
+ (substitute* "pkg/archive/archive.go"
+ (("string\\{\"xz")
+ (string-append "string{\"" (assoc-ref inputs "xz") "/bin/xz")))
(let ((source-files (filter (lambda (name)
(not (string-contains name "test")))
(find-files "." "\\.go$"))))
@@ -528,7 +531,8 @@ built-in registry server of Docker.")
("runc" ,runc)
("util-linux" ,util-linux)
("lvm2" ,lvm2)
- ("xfsprogs" ,xfsprogs)))
+ ("xfsprogs" ,xfsprogs)
+ ("xz" ,xz)))
(native-inputs
`(("eudev" ,eudev) ; TODO: Should be propagated by lvm2 (.pc -> .pc)
("go" ,go)
- branch master updated (7a31d93 -> 59781b3), guix-commits, 2019/05/05
- 03/07: gnu: docker: Harmonize LookPath regexes., guix-commits, 2019/05/05
- 02/07: gnu: docker: Cleanup extraneous comments., guix-commits, 2019/05/05
- 04/07: gnu: docker: Make macros use a relative path as argument., guix-commits, 2019/05/05
- 05/07: gnu: docker: Optimize substitution macros., guix-commits, 2019/05/05
- 01/07: gnu: docker: Fix indentation., guix-commits, 2019/05/05
- 07/07: gnu: docker: Refer to xz by its absolute path.,
guix-commits <=
- 06/07: gnu: docker: Patch the reference to the docker proxy., guix-commits, 2019/05/05