me
/
guix
Archived
1
0
Fork 0
Commit Graph

86 Commits (c4620565e87a9a5f02caacf07b70f9e12c5cf93c)

Author SHA1 Message Date
Maxim Cournoyer e35383a76f
gnu: docker: Replace tini by tini-static.
The dynamically linked tini could fail in some environments, causing 'docker
run' to exit with the following unhelpful error message:

  standard_init_linux.go:219: exec user process caused: no such file or
  directory

Use the statically linked tini binary instead, which should work everywhere.

* gnu/packages/docker.scm (docker)[phases]{patch-paths}: Replace 'tini' by
'tini-static'.
2021-06-10 00:57:00 -04:00
Maxim Cournoyer 352f23f71c
gnu: tini: Update to 0.19.0 and provide tini-static.
* gnu/packages/docker.scm (tini): Update to 0.19.0.  Remove trailing #t.
[phases]: Remove argument.
[configure-flags]: New argument, to clear the CMAKE_INSTALL_RPATH option.
2021-06-10 00:57:00 -04:00
Maxim Cournoyer 7bf82f5ede
gnu: containerd: Update to 1.4.4.
* gnu/packages/docker.scm (containerd): Update to 1.4.4.  Delete
trailing #t.
[arguments]: Set a MAKE-FLAGS binding.
[phases]{patch-paths}: Patch the reference to 'unpigz'.
{build, install}: Use the MAKE-FLAGS variable.
[inputs]: Add pigz.
* gnu/packages/patches/containerd-test-with-go1.13.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Un-register it.
2021-04-02 23:33:42 -04:00
Léo Le Bouter 9d74b66de7
gnu: docker-cli: Fix source hash.
This is a follow-up to commit 83cda00bc6.

* gnu/packages/docker.scm (docker-cli): Fix source hash caused by cascading
%docker-version variable changes.
2021-03-11 04:36:22 +01:00
Léo Le Bouter 9b52ae19b1
gnu: containerd: Update to 1.3.10 [security fixes].
* gnu/packages/docker.scm (containerd): Update to 1.3.10.
2021-03-10 23:37:52 +01:00
Léo Le Bouter 83cda00bc6
gnu: docker: Update to 19.03.15 [security fixes].
* gnu/packages/docker.scm (%docker-version): Bump to 19.03.15.
(docker-libnetwork): Bump to 19.03-1.55e924b.
(docker):
[source]: Set git-reference url to 'https://github.com/moby/moby'.
[arguments]<#:phases>: Modify 'delete-failing-tests phase to delete
'signal_linux_test.go'.
2021-03-10 23:37:52 +01:00
Oleg Pykhalov b42bb5ca6c
gnu: docker: Update to 19.03.13.
* gnu/packages/docker.scm (docker, docker-cli): Update to 19.03.13.
2021-02-08 03:27:42 +03:00
Marius Bakke 2920e88413
gnu: python-docker: Propagate runtime dependency.
* gnu/packages/docker.scm (python-docker)[inputs]: Move
PYTHON-WEBSOCKET-CLIENT from here ...
[propagated-inputs]: ... to here.
2020-11-21 01:21:31 +01:00
Maxim Cournoyer a35f3a4233
gnu: cqfd: Update to 5.2.1.
* gnu/packages/docker.scm (cqfd): Update to 5.2.1.
2020-11-14 11:41:07 -05:00
Oleg Pykhalov 719246a51d
gnu: containerd: Don't 'chdir' in build phases.
This fixes breaks the 'install-license-files' phase added in
6b793fa662 and is generally not good
practice.

* gnu/packages/docker.scm (containerd): [arguments]: Use
'with-directory-excursion' instead of 'chdir' in build phases.
2020-10-16 20:02:51 +03:00
Efraim Flashner 83fc59b46b
gnu: docker-cli: Fix build.
This is a follow-up to 6b793fa662.

* gnu/packages/docker.scm (docker-cli)[arguments]: In custom 'install
phase don't change directory to install 'docker' binary.
2020-10-16 15:38:32 +03:00
Jesse Dowell 90492a9f13
gnu: docker: Compile with seccomp enabled.
* gnu/packages/docker.scm (docker)[arguments]: Adjust custom 'configure
phase to enable seccomp support.

Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
2020-09-21 13:18:25 +03:00
Jesse Dowell 87a13a5e30
gnu: docker: Synchronize docker dependencies with the current version of docker.
* gnu/packages/docker.scm (docker-libnetwork): Update to 19.03-1.026aaba.
[source]: Follow URI redirection.
[arguments]: Adjust import-path accordingly.
[home-page]: Same.
* gnu/packages/networking.scm (go-sctp): Update to 0.0.0-2.6e2cb13.
[arguments]: Skip test suite.

Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
2020-09-21 13:18:24 +03:00
Andreas Enge b8cb3eb63b
gnu: python-docker-py: Rename to python-docker.
This is a follow-up to commit 3146b6da6d.

* gnu/packages/docker.scm (python-docker-py): Rename to...
(python-docker): ...this.
(docker-compose): Adjust inputs.
* gnu/packages/android.scm (fdroidserver): Adjust inputs.
2020-09-05 12:29:36 +02:00
Marius Bakke 01655843e2
gnu: python-docker-py: Remove unused input.
* gnu/packages/docker.scm (python-docker-py)[inputs]: Remove PYTHON-IPADDRESS.
2020-07-14 21:41:37 +02:00
Ludovic Courtès b0e7b6992f
gnu: Remove ".git" from "https://github/…/….git".
Until now, 'lookup-origin' and thus 'lookup-origin-revision' in (guix
swh) would sometimes return #f for these because the ".git" URLs are
redirects to the non-".git" URLs.  Consequently, 'guix lint -c archival'
would keep saying "scheduled Software Heritage archival"; likewise, the
fallback download code would fail.

* gnu/packages/ada.scm,
gnu/packages/admin.scm,
gnu/packages/aidc.scm,
gnu/packages/algebra.scm,
gnu/packages/android.scm,
gnu/packages/animation.scm,
gnu/packages/arcan.scm,
gnu/packages/assembly.scm,
gnu/packages/audio.scm,
gnu/packages/authentication.scm,
gnu/packages/avr.scm,
gnu/packages/axoloti.scm,
gnu/packages/backup.scm,
gnu/packages/bash.scm,
gnu/packages/benchmark.scm,
gnu/packages/bioconductor.scm,
gnu/packages/bioinformatics.scm,
gnu/packages/bittorrent.scm,
gnu/packages/boost.scm,
gnu/packages/build-tools.scm,
gnu/packages/c.scm,
gnu/packages/calendar.scm,
gnu/packages/cdrom.scm,
gnu/packages/check.scm,
gnu/packages/chemistry.scm,
gnu/packages/chez.scm,
gnu/packages/clojure.scm,
gnu/packages/code.scm,
gnu/packages/compression.scm,
gnu/packages/compton.scm,
gnu/packages/coq.scm,
gnu/packages/cpp.scm,
gnu/packages/cran.scm,
gnu/packages/crypto.scm,
gnu/packages/curl.scm,
gnu/packages/databases.scm,
gnu/packages/datastructures.scm,
gnu/packages/debug.scm,
gnu/packages/disk.scm,
gnu/packages/distributed.scm,
gnu/packages/django.scm,
gnu/packages/dlang.scm,
gnu/packages/dns.scm,
gnu/packages/docker.scm,
gnu/packages/education.scm,
gnu/packages/efi.scm,
gnu/packages/elixir.scm,
gnu/packages/emacs-xyz.scm,
gnu/packages/embedded.scm,
gnu/packages/emulators.scm,
gnu/packages/engineering.scm,
gnu/packages/erlang.scm,
gnu/packages/fabric-management.scm,
gnu/packages/file-systems.scm,
gnu/packages/finance.scm,
gnu/packages/firmware.scm,
gnu/packages/flashing-tools.scm,
gnu/packages/fonts.scm,
gnu/packages/fontutils.scm,
gnu/packages/fpga.scm,
gnu/packages/game-development.scm,
gnu/packages/games.scm,
gnu/packages/genealogy.scm,
gnu/packages/genimage.scm,
gnu/packages/geo.scm,
gnu/packages/gimp.scm,
gnu/packages/gl.scm,
gnu/packages/gnome-xyz.scm,
gnu/packages/gnome.scm,
gnu/packages/gnuzilla.scm,
gnu/packages/golang.scm,
gnu/packages/gpodder.scm,
gnu/packages/graph.scm,
gnu/packages/graphics.scm,
gnu/packages/graphviz.scm,
gnu/packages/groff.scm,
gnu/packages/groovy.scm,
gnu/packages/gtk.scm,
gnu/packages/guile-xyz.scm,
gnu/packages/guile.scm,
gnu/packages/hardware.scm,
gnu/packages/haskell-apps.scm,
gnu/packages/haskell-xyz.scm,
gnu/packages/hexedit.scm,
gnu/packages/i2p.scm,
gnu/packages/ibus.scm,
gnu/packages/image-processing.scm,
gnu/packages/image-viewers.scm,
gnu/packages/image.scm,
gnu/packages/ipfs.scm,
gnu/packages/java-graphics.scm,
gnu/packages/java-maths.scm,
gnu/packages/java.scm,
gnu/packages/javascript.scm,
gnu/packages/jrnl.scm,
gnu/packages/julia.scm,
gnu/packages/jupyter.scm,
gnu/packages/kodi.scm,
gnu/packages/language.scm,
gnu/packages/lego.scm,
gnu/packages/less.scm,
gnu/packages/libusb.scm,
gnu/packages/linux.scm,
gnu/packages/lirc.scm,
gnu/packages/lisp-xyz.scm,
gnu/packages/llvm.scm,
gnu/packages/logging.scm,
gnu/packages/lolcode.scm,
gnu/packages/lua.scm,
gnu/packages/lxde.scm,
gnu/packages/lxqt.scm,
gnu/packages/machine-learning.scm,
gnu/packages/mail.scm,
gnu/packages/markup.scm,
gnu/packages/maths.scm,
gnu/packages/maven.scm,
gnu/packages/mes.scm,
gnu/packages/messaging.scm,
gnu/packages/monitoring.scm,
gnu/packages/mpd.scm,
gnu/packages/music.scm,
gnu/packages/networking.scm,
gnu/packages/node-xyz.scm,
gnu/packages/ocaml.scm,
gnu/packages/ocr.scm,
gnu/packages/onc-rpc.scm,
gnu/packages/opencl.scm,
gnu/packages/opencog.scm,
gnu/packages/pantheon.scm,
gnu/packages/password-utils.scm,
gnu/packages/patchutils.scm,
gnu/packages/pdf.scm,
gnu/packages/perl6.scm,
gnu/packages/phabricator.scm,
gnu/packages/popt.scm,
gnu/packages/printers.scm,
gnu/packages/prolog.scm,
gnu/packages/protobuf.scm,
gnu/packages/pulseaudio.scm,
gnu/packages/python-crypto.scm,
gnu/packages/python-web.scm,
gnu/packages/python-xyz.scm,
gnu/packages/qt.scm,
gnu/packages/radio.scm,
gnu/packages/rails.scm,
gnu/packages/rdf.scm,
gnu/packages/rednotebook.scm,
gnu/packages/rpc.scm,
gnu/packages/rsync.scm,
gnu/packages/ruby.scm,
gnu/packages/rust.scm,
gnu/packages/scheme.scm,
gnu/packages/screen.scm,
gnu/packages/security-token.scm,
gnu/packages/selinux.scm,
gnu/packages/serialization.scm,
gnu/packages/shells.scm,
gnu/packages/shellutils.scm,
gnu/packages/simh.scm,
gnu/packages/sml.scm,
gnu/packages/ssh.scm,
gnu/packages/statistics.scm,
gnu/packages/stenography.scm,
gnu/packages/sync.scm,
gnu/packages/syncthing.scm,
gnu/packages/synergy.scm,
gnu/packages/telephony.scm,
gnu/packages/terminals.scm,
gnu/packages/tex.scm,
gnu/packages/texinfo.scm,
gnu/packages/text-editors.scm,
gnu/packages/textutils.scm,
gnu/packages/time.scm,
gnu/packages/tmux.scm,
gnu/packages/tor.scm,
gnu/packages/toys.scm,
gnu/packages/version-control.scm,
gnu/packages/video.scm,
gnu/packages/vim.scm,
gnu/packages/virtualization.scm,
gnu/packages/vlang.scm,
gnu/packages/vnc.scm,
gnu/packages/vpn.scm,
gnu/packages/web-browsers.scm,
gnu/packages/web.scm,
gnu/packages/wireservice.scm,
gnu/packages/wm.scm,
gnu/packages/wxwidgets.scm,
gnu/packages/xdisorg.scm,
gnu/packages/xml.scm,
gnu/packages/xorg.scm,
tests/lint.scm: Remove trailing ".git" from 'git-reference' URL.
2020-07-12 23:08:15 +02:00
Tobias Geerinckx-Rice 0e2353731c
gnu: docker, docker-cli: Update to 19.03.12.
* gnu/packages/docker.scm (%docker-version): Update to 19.03.12.
(docker, docker-cli): Update hashes.
2020-07-01 03:54:56 +02:00
Katherine Cox-Buday 6e9f882608
gnu: go: Update to 1.14.4.
* gnu/packages/golang.scm (go): Update to 1.14.4.
* gnu/packages/docker.scm (docker)[arguments]: Fix build with go@1.14.4.

Signed-off-by: Christopher Baines <mail@cbaines.net>
2020-06-26 11:49:49 +01:00
Tobias Geerinckx-Rice c6f557636a
gnu: docker, docker-cli: Update to 19.03.11.
* gnu/packages/docker.scm (%docker-version): Update to 19.03.11.
(docker, docker-cli): Update hashes.
2020-06-07 18:43:38 +02:00
Tobias Geerinckx-Rice 98a76dd8f3
gnu: docker, docker-cli: Update to 19.03.9.
* gnu/packages/docker.scm (%docker-version): Update to 19.03.9.
(docker, docker-cli): Update hashes.
2020-06-05 19:33:10 +02:00
Danny Milosavljevic f523eaba7b
gnu: docker: Remove references to go.
Fixes <https://bugs.gnu.org/41406>.

* gnu/packages/docker.scm (docker)[arguments]<#:phases>[remove-go-references]:
New phase.
2020-05-19 21:04:47 +02:00
Danny Milosavljevic 451c38b7d6
gnu: docker: Provide version string to docker service.
Fixes <https://bugs.gnu.org/40368>.
Reported by Pierre Neidhardt <mail@ambrevar.xyz>.

* gnu/packages/docker.scm (docker)[configure]: Provide version string.
[install]: Install versioned binary.
2020-04-02 12:46:52 +02:00
Michael Rohleder 15c3aa0911
gnu: docker-compose: Update to 1.25.4.
Fixes <https://bugs.gnu.org/40015>.

* gnu/packages/docker.scm (docker-compose): Update to 1.25.4.

Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
2020-03-19 20:45:00 +01:00
Danny Milosavljevic f255a193be
gnu: docker: Update to 19.03.7.
* gnu/packages/docker.scm (docker): Update to 19.03.7.
(docker-cli): Update to 19.03.7.
2020-03-11 12:07:19 +01:00
Tobias Geerinckx-Rice dd6114dfc5
gnu: containerd: Use HTTPS home page.
* gnu/packages/docker.scm (containerd)[home-page]: Use HTTPS.
2020-02-21 18:33:40 +01:00
Jack Hill 13c8e747e8
gnu: containerd: Fix test failure with Go 1.13.
* gnu/packages/docker.scm (containerd)[source]: Add patch.
* gnu/packages/patches/containerd-test-with-go1.13.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add patch.
2020-02-15 14:31:33 +01:00
Danny Milosavljevic eef2027928
gnu: docker: Remove failing tests.
* gnu/packages/docker.scm (docker)[arguments]<#:phases>[delete-failing-tests]:
Modify.
2020-02-10 18:59:49 +01:00
Danny Milosavljevic 5b050bc259
gnu: docker: Remove failing test.
* gnu/packages/docker.scm (docker)[arguments]<#:phases>[delete-failing-tests]:
Modify.
2020-02-10 17:25:35 +01:00
Danny Milosavljevic 8c7eb58453
gnu: docker: Update to 19.03.5.
* gnu/packages/docker.scm (docker-cli): Update to 19.03.5.
(docker)[source]: Remove patches.
[arguments]<#:phases>[patch-paths]: Modify.
[native-inputs]: Add gotestsum.
* gnu/packages/patches/docker-adjust-tests-for-changes-in-go.patch: Delete
file.
* gnu/packages/patches/docker-engine-test-noinstall.patch: Delete file.
* gnu/packages/patches/docker-use-fewer-modprobes.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove them.
2020-02-10 17:00:24 +01:00
Oleg Pykhalov 449dc8b749
gnu: docker-cli: Install shell completion.
* gnu/packages/docker.scm (docker-cli)[arguments]: Install shell completion.
2019-12-08 10:39:09 +03:00
Oleg Pykhalov a349835edb
gnu: docker: Adjust tests for changes in go.
* gnu/packages/patches/docker-adjust-tests-for-changes-in-go.patch: New file.
* gnu/local.mk (dist_patch_DATA): Use this.
* gnu/packages/docker.scm (docker): Use this.
2019-11-03 14:48:21 +03:00
Leo Famulari 561d391ba8
gnu: Go standard library 'x' packages: Consolidate.
* gnu/packages/golang.scm (go-golang-org-x-text, go-golang-org-x-sys, go-golang-org-x-net,
go-golang-org-x-time): New variables.
(go-golang.org-x-crypto-ssh-terminal, go-golang-org-x-crypto-bcrypt,
go-golang-org-x-crypto-blowfish, go-golang-org-x-crypto-pbkdf2,
go-golang-org-x-crypto-tea, go-golang-org-x-crypto-salsa20,
go-golang-org-x-crypto-cast5, go-golang-org-x-crypto-twofish,
go-golang-org-x-crypto-xtea, go-golang-org-x-crypto-ed25519,
go-golang-org-x-crypto-ripemd160, go-golang-org-x-crypto-blake2s,
go-golang-org-x-crypto-sha3, go-golang-org-x-text-encoding,
go-golang-org-x-text-transform, go-golang-org-x-text-unicode-norm,
go-golang-org-x-net-ipv4, go-golang-org-x-net-bpf, go-golang-org-x-net-context,
go-golang-org-x-net-internal-socks, go-golang-org-x-net-internal-socket,
go-golang-org-x-net-internal-iana, go-golang-org-x-net-ipv6,
go-golang-org-x-net-proxy, go-golang-org-x-sys-cpu, go-golang-org-x-sys-unix,
go-golang-org-x-time-rate): Remove variables.
(go-github-com-sirupsen-logrus, go-github-com-docker-distribution,
go-github-com-libp2p-go-libp2p-crypto,
go-github-com-multiformats-go-multihash,
go-github-com-libp2p-go-libp2p-peer,
go-github-com-libp2p-go-libp2p-metrics,
go-github-com-multiformats-go-multiaddr,
go-github-com-multiformats-go-multiaddr-net,
go-github-com-mattn-go-isatty, go-github-com-gdamore-encoding,
go-github-com-gdamore-tcell): Adjust accordingly.
* gnu/packages/docker.scm (docker-libnetwork-cmd-proxy): Likewise.
* gnu/packages/databases.scm (mongo-tools): Likewise.
* gnu/packages/ipfs.scm (go-github-com-ipfs-go-ipfs-api, gx, gx-go): Likewise.
* gnu/packages/web.scm (poussetaches): Likewise.
* gnu/packages/terminals.scm (go-github-com-junegunn-fzf,
go-github.com-howeyc-gopass): Likewise.
(go-golang.org-x-crypto-ssh-terminal): Remove variable.
* gnu/packages/syncthing.scm (syncthing,
go-github-com-oschwald-geoip2-golang,
go-github-com-oschwald-maxminddb-golang,
go-github-com-syncthing-notify): Adjust accordingly.
* gnu/packages/linux.scm (go-netlink): Likewise.
2019-10-29 11:03:12 -04:00
Maxim Cournoyer b8e7e20841
gnu: docker: Add support for tini.
* gnu/packages/docker.scm (docker)[inputs]: Add tini.
[phases]{patch-paths}: Patch the path of the default init binary.
2019-09-05 09:38:23 +09:00
Maxim Cournoyer 92086eeda3
gnu: Add tini.
* gnu/packages/docker.scm (tini): New variable.
2019-09-05 09:38:22 +09:00
Tobias Geerinckx-Rice 35600cd9a0
gnu: docker-compose: Remove inputs for old Python versions.
* gnu/packages/docker.scm (docker-compose)[inputs]:
Remove python2-backport-ssl-match-hostname and python-ipaddress.
2019-08-05 01:06:58 +02:00
Tobias Geerinckx-Rice d12578f2e2
gnu: python-docker-py: Propagate dependencies.
* gnu/packages/docker.scm (python-docker-py)[inputs]:
Move python-docker-pycreds and python-paramiko from here…
[propagated-inputs]: …to here.
(docker-compose)[inputs]: Remove them.
2019-08-05 01:06:58 +02:00
Tobias Geerinckx-Rice e643d90f0f
gnu: docker-compose: Remove Windows-specific input.
* gnu/packages/docker.scm (docker-compose)[inputs]:
Remove python-colorama.
2019-08-05 01:06:57 +02:00
Marius Bakke e920037793
gnu: docker-cli: Print a usable version string.
* gnu/packages/docker.scm (docker-cli)[arguments]<#:phases>: Set the VERSION
variable before building the package.
2019-08-04 13:33:42 +02:00
Jacob MacDonald f24276de9a
gnu: docker-compose: Update to 1.24.1.
* gnu/packages/docker.scm (docker-compose): Update to 1.24.1.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2019-07-13 15:13:53 +02:00
Jacob MacDonald 3146b6da6d
gnu: python-docker-py: Update to 3.7.3.
* gnu/packages/docker.scm (python-docker-py): Update to 3.7.3.
[inputs]: Use PYTHON-REQUESTS-2.20 instead of PYTHON-REQUESTS.
Add PYTHON-DOCKER-PYCREDS, PYTHON-IPADDRESS, PYTHON-PARAMIKO, and
PYTHON-URLLIB3-1.24.

Co-authored-by: Ludovic Courtès <ludo@gnu.org>
2019-07-13 15:13:53 +02:00
Jacob MacDonald 8bb591d426
gnu: python-dockerpty: Update to 0.4.1.
* gnu/packages/docker.scm (python-dockerpty): Update to 0.4.1.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2019-07-13 15:13:53 +02:00
Jacob MacDonald d59d56b2ad
gnu: python-docker-pycreds: Update to 0.4.0.
* gnu/packages/docker.scm (python-docker-pycreds): Update to 0.4.0.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2019-07-13 15:13:53 +02:00
Tobias Geerinckx-Rice 914bba2809
gnu: docker-compose: Add required Python dependencies.
* gnu/packages/python-xyz.scm (python-jsonschema-2.6):
New old public variable.
* gnu/packages/docker.scm (docker-compose)[inputs]:
Add python-docker-pycreds and use python-jsonschema-2.6.
2019-06-16 19:44:42 +02:00
Maxim Cournoyer 112fd34fee
gnu: cqfd: Update to 5.1.0.
* gnu/packages/docker.scm (cqfd): Update to 5.1.0.
[description]: Fix typo.
2019-05-13 21:50:34 -04:00
Maxim Cournoyer 59781b32d8
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.
2019-05-05 21:21:02 -04:00
Maxim Cournoyer 80fec17f39
gnu: docker: Patch the reference to the docker proxy.
* gnu/packages/docker.scm (docker)[inputs]: Add docker-libnetwork-cmd-proxy.
* gnu/packages/docker.scm (docker)[phases]{patch-paths}: Patch proxy.go to
refer to the docker-proxy binary by its absolute path.
2019-05-05 21:21:02 -04:00
Maxim Cournoyer a01d54f3bd
gnu: docker: Optimize substitution macros.
This change halves the time needed to patch the paths.

* gnu/packages/docker.scm (docker)[phases]{patch-paths}: Allow passing
multiple SOURCE-TEXT, PACKAGE and RELATIVE-PATH tuples so that the rewrite
rules can be generated and processed by a single use of the SUBSTITUTE*
macro.  Rename SUBSTITUTE-LOOKPATH to SUBSTITUTE-LOOKPATH* and
substitute-Command to SUBSTITUTE-COMMAND* to denote the change.  Adapt the
uses of SUBSTITUTE-LOOKPATH* and SUBSTITUTE-COMMAND*.
2019-05-05 21:21:02 -04:00
Maxim Cournoyer 079f0eb3d2
gnu: docker: Make macros use a relative path as argument.
* gnu/packages/docker.scm (docker)[phases]: Move implementation detail inside
the SUBSTITUTE-LOOKPATH and SUBSTITUTE-COMMAND macros definition, so that the
relative path argument can be given as a relative path.
2019-05-05 21:21:01 -04:00
Maxim Cournoyer 3f280d3950
gnu: docker: Harmonize LookPath regexes.
* gnu/packages/docker.scm (docker)[phases]: In the patch-paths phase, update
the regexes used by SUBSTITUTE-LOOKPATH and SUBSTITUTE-COMMAND to match at the
start of the word, like it's done later.
2019-05-05 21:21:01 -04:00
Maxim Cournoyer 1b14e1bccd
gnu: docker: Cleanup extraneous comments.
* gnu/packages/docker.scm (docker): Remove "parenthesis-balancing" comments.
2019-05-05 21:21:01 -04:00