me/guix
Archived
1
0
Fork 0
Code Activity

gnu: docker: Fix indentation.

Browse source 
* gnu/packages/docker.scm (docker): Fix indentation using Emacs.
This commit is contained in:
Maxim Cournoyer 2019-04-11 21:55:48 -04:00
parent 7a31d93a61
commit c627932639
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 92 additions and 92 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

184
gnu/packages/docker.scm
View file

@ -296,17 +296,17 @@ built-in registry server of Docker.")
(version %docker-version) (version %docker-version)
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/docker/engine.git") (url "https://github.com/docker/engine.git")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0cirpd9l2qazp2jyanwzvrkx2m98nksjdvn43ff38p89w6133ipb")) (base32 "0cirpd9l2qazp2jyanwzvrkx2m98nksjdvn43ff38p89w6133ipb"))
(patches (patches
(search-patches "docker-engine-test-noinstall.patch" (search-patches "docker-engine-test-noinstall.patch"
"docker-fix-tests.patch" "docker-fix-tests.patch"
"docker-use-fewer-modprobes.patch")))) "docker-use-fewer-modprobes.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:modules `(#:modules
@ -323,77 +323,77 @@ built-in registry server of Docker.")
(add-after 'unpack 'patch-paths (add-after 'unpack 'patch-paths
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "builder/builder-next/executor_unix.go" (substitute* "builder/builder-next/executor_unix.go"
(("CommandCandidates:.*runc.*") (("CommandCandidates:.*runc.*")
(string-append "CommandCandidates: []string{\"" (string-append "CommandCandidates: []string{\""
(assoc-ref inputs "runc") (assoc-ref inputs "runc")
"/sbin/runc\"},\n"))) "/sbin/runc\"},\n")))
(substitute* "vendor/github.com/containerd/go-runc/runc.go" (substitute* "vendor/github.com/containerd/go-runc/runc.go"
(("DefaultCommand = .*") (("DefaultCommand = .*")
(string-append "DefaultCommand = \"" (string-append "DefaultCommand = \""
(assoc-ref inputs "runc") (assoc-ref inputs "runc")
"/sbin/runc\"\n"))) "/sbin/runc\"\n")))
(substitute* "vendor/github.com/containerd/containerd/runtime/v1/linux/runtime.go" (substitute* "vendor/github.com/containerd/containerd/runtime/v1/linux/runtime.go"
(("defaultRuntime[ \t]*=.*") (("defaultRuntime[ \t]*=.*")
(string-append "defaultRuntime = \"" (string-append "defaultRuntime = \""
(assoc-ref inputs "runc") (assoc-ref inputs "runc")
"/sbin/runc\"\n")) "/sbin/runc\"\n"))
(("defaultShim[ \t]*=.*") (("defaultShim[ \t]*=.*")
(string-append "defaultShim = \"" (string-append "defaultShim = \""
(assoc-ref inputs "containerd") (assoc-ref inputs "containerd")
"/bin/containerd-shim\"\n"))) "/bin/containerd-shim\"\n")))
(substitute* "daemon/daemon_unix.go" (substitute* "daemon/daemon_unix.go"
(("DefaultShimBinary = .*") (("DefaultShimBinary = .*")
(string-append "DefaultShimBinary = \"" (string-append "DefaultShimBinary = \""
(assoc-ref inputs "containerd") (assoc-ref inputs "containerd")
"/bin/containerd-shim\"\n")) "/bin/containerd-shim\"\n"))
(("DefaultRuntimeBinary = .*") (("DefaultRuntimeBinary = .*")
(string-append "DefaultRuntimeBinary = \"" (string-append "DefaultRuntimeBinary = \""
(assoc-ref inputs "runc") (assoc-ref inputs "runc")
"/sbin/runc\"\n")) "/sbin/runc\"\n"))
(("DefaultRuntimeName = .*") (("DefaultRuntimeName = .*")
(string-append "DefaultRuntimeName = \"" (string-append "DefaultRuntimeName = \""
(assoc-ref inputs "runc") (assoc-ref inputs "runc")
"/sbin/runc\"\n"))) "/sbin/runc\"\n")))
(substitute* "daemon/config/config.go" (substitute* "daemon/config/config.go"
(("StockRuntimeName = .*") (("StockRuntimeName = .*")
(string-append "StockRuntimeName = \"" (string-append "StockRuntimeName = \""
(assoc-ref inputs "runc") (assoc-ref inputs "runc")
"/sbin/runc\"\n"))) "/sbin/runc\"\n")))
(substitute* "vendor/github.com/moby/buildkit/executor/runcexecutor/executor.go" (substitute* "vendor/github.com/moby/buildkit/executor/runcexecutor/executor.go"
(("var defaultCommandCandidates = .*") (("var defaultCommandCandidates = .*")
(string-append "var defaultCommandCandidates = []string{\"" (string-append "var defaultCommandCandidates = []string{\""
(assoc-ref inputs "runc") "/sbin/runc\"}"))) (assoc-ref inputs "runc") "/sbin/runc\"}")))
(let ((source-files (filter (lambda (name) (let ((source-files (filter (lambda (name)
(not (string-contains name "test"))) (not (string-contains name "test")))
(find-files "." "\\.go$")))) (find-files "." "\\.go$"))))
(let-syntax ((substitute-LookPath (let-syntax ((substitute-LookPath
(lambda (x) (lambda (x)
(syntax-case x () (syntax-case x ()
((substitute-LookPath source-text package ((substitute-LookPath source-text package
relative-path) relative-path)
#`(substitute* source-files #`(substitute* source-files
((#,(string-append "exec\\.LookPath\\(\"" ((#,(string-append "exec\\.LookPath\\(\""
(syntax->datum (syntax->datum
#'source-text) #'source-text)
"\")")) "\")"))
(string-append "\"" (string-append "\""
(assoc-ref inputs package) (assoc-ref inputs package)
relative-path relative-path
"\", error(nil)"))))))) "\", error(nil)")))))))
(substitute-Command (substitute-Command
(lambda (x) (lambda (x)
(syntax-case x () (syntax-case x ()
((substitute-LookPath source-text package ((substitute-LookPath source-text package
relative-path) relative-path)
#`(substitute* source-files #`(substitute* source-files
((#,(string-append "exec\\.Command\\(\"" ((#,(string-append "exec\\.Command\\(\""
(syntax->datum (syntax->datum
#'source-text) #'source-text)
"\"")) ; ) "\"")) ; )
(string-append "exec.Command(\"" (string-append "exec.Command(\""
(assoc-ref inputs package) (assoc-ref inputs package)
relative-path relative-path
"\"")))))))) ; ) "\"")))))))) ; )
(substitute-LookPath "ps" "procps" "/bin/ps") (substitute-LookPath "ps" "procps" "/bin/ps")
(substitute-LookPath "mkfs.xfs" "xfsprogs" "/bin/mkfs.xfs") (substitute-LookPath "mkfs.xfs" "xfsprogs" "/bin/mkfs.xfs")
(substitute-LookPath "lvmdiskscan" "lvm2" "/sbin/lvmdiskscan") (substitute-LookPath "lvmdiskscan" "lvm2" "/sbin/lvmdiskscan")
@ -415,13 +415,13 @@ built-in registry server of Docker.")
(substitute-Command "tune2fs" "e2fsprogs" "/sbin/tune2fs") (substitute-Command "tune2fs" "e2fsprogs" "/sbin/tune2fs")
(substitute-Command "blkid" "util-linux" "/sbin/blkid") (substitute-Command "blkid" "util-linux" "/sbin/blkid")
(substitute-Command "resize2fs" "e2fsprogs" "/sbin/resize2fs") (substitute-Command "resize2fs" "e2fsprogs" "/sbin/resize2fs")
; docker-mountfrom ?? ;; docker-mountfrom ??
; docker ;; docker
; docker-untar ?? ;; docker-untar ??
; docker-applyLayer ?? ;; docker-applyLayer ??
; /usr/bin/uname ;; /usr/bin/uname
; grep ;; grep
; apparmor_parser ;; apparmor_parser
(substitute-Command "ps" "procps" "/bin/ps") (substitute-Command "ps" "procps" "/bin/ps")
(substitute-Command "losetup" "util-linux" "/sbin/losetup") (substitute-Command "losetup" "util-linux" "/sbin/losetup")
(substitute-Command "uname" "coreutils" "/bin/uname") (substitute-Command "uname" "coreutils" "/bin/uname")
@ -431,24 +431,24 @@ built-in registry server of Docker.")
;; invokes other programs we don't know about and thus don't ;; invokes other programs we don't know about and thus don't
;; substitute. ;; substitute.
(substitute* source-files (substitute* source-files
;; Search for Java in PATH. ;; Search for Java in PATH.
(("\\<exec\\.Command\\(\"java\"") ; ) (("\\<exec\\.Command\\(\"java\"") ; )
"xxec.Command(\"java\"") ; ) "xxec.Command(\"java\"") ; )
;; Search for AUFS in PATH (mainline Linux doesn't support it). ;; Search for AUFS in PATH (mainline Linux doesn't support it).
(("\\<exec\\.Command\\(\"auplink\"") ; ) (("\\<exec\\.Command\\(\"auplink\"") ; )
"xxec.Command(\"auplink\"") ; ) "xxec.Command(\"auplink\"") ; )
;; Fail on other unsubstituted commands. ;; Fail on other unsubstituted commands.
(("\\<exec\\.Command\\(\"([a-zA-Z0-9][a-zA-Z0-9_-]*)\"" (("\\<exec\\.Command\\(\"([a-zA-Z0-9][a-zA-Z0-9_-]*)\""
_ executable) ; ) _ executable) ; )
(string-append "exec.Guix_doesnt_want_Command(\"" (string-append "exec.Guix_doesnt_want_Command(\""
executable "\"")) ;) executable "\"")) ;)
(("\\<xxec\\.Command") (("\\<xxec\\.Command")
"exec.Command") "exec.Command")
;; Search for ZFS in PATH. ;; Search for ZFS in PATH.
(("\\<LookPath\\(\"zfs\"\\)") "LooxPath(\"zfs\")") (("\\<LookPath\\(\"zfs\"\\)") "LooxPath(\"zfs\")")
;; Fail on other unsubstituted LookPaths. ;; Fail on other unsubstituted LookPaths.
(("\\<LookPath\\(\"") "Guix_doesnt_want_LookPath\\(\"") ; )) (("\\<LookPath\\(\"") "Guix_doesnt_want_LookPath\\(\"") ; ))
(("\\<LooxPath") "LookPath"))) (("\\<LooxPath") "LookPath")))
#t)) #t))
(add-after 'patch-paths 'delete-failing-tests (add-after 'patch-paths 'delete-failing-tests
(lambda _ (lambda _
@ -495,7 +495,7 @@ built-in registry server of Docker.")
;; But go needs to have the uncanonicalized directory name, so ;; But go needs to have the uncanonicalized directory name, so
;; store that. ;; store that.
(setenv "PWD" (string-append (getcwd) (setenv "PWD" (string-append (getcwd)
"/.gopath/src/github.com/docker/docker")) "/.gopath/src/github.com/docker/docker"))
(with-directory-excursion ".gopath/src/github.com/docker/docker" (with-directory-excursion ".gopath/src/github.com/docker/docker"
(invoke "hack/test/unit")) (invoke "hack/test/unit"))
(setenv "PWD" #f) (setenv "PWD" #f)
@ -509,7 +509,7 @@ built-in registry server of Docker.")
#t)))))) #t))))))
(inputs (inputs
`(("btrfs-progs" ,btrfs-progs) `(("btrfs-progs" ,btrfs-progs)
("containerd" ,containerd) ; for containerd-shim ("containerd" ,containerd) ; for containerd-shim
("coreutils" ,coreutils) ("coreutils" ,coreutils)
("dbus" ,dbus) ("dbus" ,dbus)
("e2fsprogs" ,e2fsprogs) ("e2fsprogs" ,e2fsprogs)
@ -525,7 +525,7 @@ built-in registry server of Docker.")
("lvm2" ,lvm2) ("lvm2" ,lvm2)
("xfsprogs" ,xfsprogs))) ("xfsprogs" ,xfsprogs)))
(native-inputs (native-inputs
`(("eudev" ,eudev) ; TODO: Should be propagated by lvm2 (.pc -> .pc) `(("eudev" ,eudev) ; TODO: Should be propagated by lvm2 (.pc -> .pc)
("go" ,go) ("go" ,go)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(synopsis "Docker container component library, and daemon") (synopsis "Docker container component library, and daemon")