Commit Graph

44 Commits

Author SHA1 Message Date
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
Maxim Cournoyer c627932639
gnu: docker: Fix indentation.
* gnu/packages/docker.scm (docker): Fix indentation using Emacs.
2019-05-05 21:20:58 -04:00
Maxim Cournoyer 0b94911add
gnu: Add docker-libnetwork-cmd-proxy.
* gnu/packages/docker.scm (docker-libnetwork-cmd-proxy): New variable.
2019-05-05 20:14:15 -04:00
Maxim Cournoyer 9c0244abbd
gnu: Add docker-libnetwork.
* gnu/packages/docker.scm (docker-libnetwork): New private variable.
2019-05-05 20:14:15 -04:00
Tobias Geerinckx-Rice 0e84987f50
gnu: docker, docker-cli: Update to 18.09.5.
* gnu/packages/docker.scm (%docker-version): Update to 18.09.5.
2019-04-16 22:40:04 +02:00
Danny Milosavljevic 516f6f55eb
gnu: docker: Use fewer modprobes.
Fixes <https://bugs.gnu.org/34333>.
Reported by Allan Adair <allan@adair.io>.

* gnu/packages/patches/docker-use-fewer-modprobes.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/docker.scm (docker)[source]: Use it.
2019-03-25 20:27:57 +01:00
Tobias Geerinckx-Rice a333cbf194
gnu: containerd: Update to 1.2.5.
* gnu/packages/docker.scm (containerd): Update to 1.2.5.
2019-03-14 23:18:49 +01:00
Tobias Geerinckx-Rice 947849010d
gnu: docker, docker-cli: Update to 18.09.3.
* gnu/packages/docker.scm (%docker-version): Update to 18.09.3.
2019-03-14 23:18:49 +01:00
Leo Famulari e3900a4d64
build-system/go: Build with a filesystem union of Go dependencies.
This basically changes (guix build-system go) so that instead of looking
up its dependencies in a list of directories in $GOPATH, all the
Go dependencies are symlinked into a single directory.

Fixes <https://bugs.gnu.org/33620>.

* guix/build/go-build-system.scm (setup-go-environment): New variable.
(setup-environment, install-source): Remove variables.
(unpack): Unpack the source relative to $GOPATH.
(install): Do not install the compiled objects in the 'pkg' directory.
Install the source code in this phase, and only install the source of
the package named by IMPORT-PATH.
* doc/guix.texi (Build Systems): Adjust accordingly.
* gnu/packages/docker.scm (docker): Import (guix build union) on the build side
and adjust to build phase name changes in (guix build-system go).
* gnu/packages/shellutils.scm (direnv): Likewise.
* gnu/packages/databases.scm (mongo-tools)[arguments]:
Set '#:install-source #f'.
* gnu/packages/music.scm (demlo)[arguments]: Move the 'install-scripts'
phase after the 'install' phase.
2019-03-14 15:34:26 -04:00
Tobias Geerinckx-Rice 6c77b5a9f7
gnu: containerd: Update to 1.2.4.
* gnu/packages/docker.scm (containerd): Update to 1.2.4.
2019-02-19 09:54:34 +01:00
Tobias Geerinckx-Rice 74bf1b5da5
gnu: docker: Fix build on btrfs.
* gnu/packages/docker.scm (docker)[arguments]: Skip another test that
requires root privileges.
2019-02-19 09:54:33 +01:00
Leo Famulari ea7cddaac7
gnu: Docker: Update to 18.09.2.
* gnu/packages/docker.scm (%docker-version, docker, docker-cli): Update to
18.09.2.
(docker)[arguments]: Adjust to the Debian-specific 'iptables-legacy' lookup in
the 'patch-paths' phase.
2019-02-12 12:53:12 -05:00
Maxim Cournoyer 975a953bfd
gnu: Add cqfd.
* gnu/packages/docker.scm (cqfd): New variable.
2019-02-05 09:33:39 -05:00
Tobias Geerinckx-Rice 26b7d23aa6
gnu: containerd: Update to 1.2.2.
* gnu/packages/docker.scm (containerd): Update to 1.2.2.
2019-02-04 09:39:12 +01:00
Tobias Geerinckx-Rice 17d25019fd
gnu: docker-cli: Use HTTPS home page.
* gnu/packages/docker.scm (docker-cli)[home-page]: Use HTTPS.
2019-02-04 09:39:12 +01:00
Ricardo Wurmus 44d10b1f72
gnu: Separate Python core packages from the rest.
* gnu/packages/python.scm: Move hundreds of package definitions from here...
* gnu/packages/python-xyz.scm: ...to this new module.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
* gnu/packages/ada.scm,
gnu/packages/admin.scm,
gnu/packages/android.scm,
gnu/packages/audio.scm,
gnu/packages/backup.scm,
gnu/packages/benchmark.scm,
gnu/packages/bioinformatics.scm,
gnu/packages/bittorrent.scm,
gnu/packages/calendar.scm,
gnu/packages/check.scm,
gnu/packages/chemistry.scm,
gnu/packages/cluster.scm,
gnu/packages/compression.scm,
gnu/packages/connman.scm,
gnu/packages/crypto.scm,
gnu/packages/cups.scm,
gnu/packages/databases.scm,
gnu/packages/dav.scm,
gnu/packages/direct-connect.scm,
gnu/packages/disk.scm,
gnu/packages/django.scm,
gnu/packages/dlang.scm,
gnu/packages/docker.scm,
gnu/packages/ebook.scm,
gnu/packages/elf.scm,
gnu/packages/emacs.scm,
gnu/packages/emulators.scm,
gnu/packages/engineering.scm,
gnu/packages/enlightenment.scm,
gnu/packages/finance.scm,
gnu/packages/fltk.scm,
gnu/packages/fontutils.scm,
gnu/packages/freedesktop.scm,
gnu/packages/game-development.scm,
gnu/packages/games.scm,
gnu/packages/geo.scm,
gnu/packages/gl.scm,
gnu/packages/glib.scm,
gnu/packages/gnome.scm,
gnu/packages/gnupg.scm,
gnu/packages/gnuzilla.scm,
gnu/packages/graph.scm,
gnu/packages/graphics.scm,
gnu/packages/graphviz.scm,
gnu/packages/gtk.scm,
gnu/packages/ham-radio.scm,
gnu/packages/image-processing.scm,
gnu/packages/image-viewers.scm,
gnu/packages/image.scm,
gnu/packages/irc.scm,
gnu/packages/jrnl.scm,
gnu/packages/julia.scm,
gnu/packages/kde-frameworks.scm,
gnu/packages/key-mon.scm,
gnu/packages/libffi.scm,
gnu/packages/libreoffice.scm,
gnu/packages/libusb.scm,
gnu/packages/lirc.scm,
gnu/packages/logging.scm,
gnu/packages/machine-learning.scm,
gnu/packages/mail.scm,
gnu/packages/mate.scm,
gnu/packages/maths.scm,
gnu/packages/medical.scm,
gnu/packages/messaging.scm,
gnu/packages/monitoring.scm,
gnu/packages/mp3.scm,
gnu/packages/mpd.scm,
gnu/packages/music.scm,
gnu/packages/networking.scm,
gnu/packages/nutrition.scm,
gnu/packages/openldap.scm,
gnu/packages/openstack.scm,
gnu/packages/package-management.scm,
gnu/packages/password-utils.scm,
gnu/packages/patchutils.scm,
gnu/packages/pdf.scm,
gnu/packages/photo.scm,
gnu/packages/polkit.scm,
gnu/packages/protobuf.scm,
gnu/packages/python-crypto.scm,
gnu/packages/python-web.scm,
gnu/packages/qt.scm,
gnu/packages/rdf.scm,
gnu/packages/ruby.scm,
gnu/packages/search.scm,
gnu/packages/selinux.scm,
gnu/packages/serialization.scm,
gnu/packages/shells.scm,
gnu/packages/simulation.scm,
gnu/packages/ssh.scm,
gnu/packages/statistics.scm,
gnu/packages/storage.scm,
gnu/packages/sync.scm,
gnu/packages/terminals.scm,
gnu/packages/textutils.scm,
gnu/packages/time.scm,
gnu/packages/tls.scm,
gnu/packages/tor.scm,
gnu/packages/tryton.scm,
gnu/packages/version-control.scm,
gnu/packages/video.scm,
gnu/packages/virtualization.scm,
gnu/packages/vpn.scm,
gnu/packages/web-browsers.scm,
gnu/packages/web.scm,
gnu/packages/wicd.scm,
gnu/packages/xdisorg.scm,
gnu/packages/xorg.scm: Update module references.
2019-01-15 14:46:44 +01:00
Danny Milosavljevic f370509096
gnu: docker-cli: Don't install the same executable twice.
Reported by Meiyo Peng <meiyo.peng@gmail.com>.

* gnu/packages/docker.scm (docker-cli)[arguments]<#:phases>[install]:
Don't install the same executable twice.
2019-01-15 13:32:09 +01:00
Danny Milosavljevic ffcd282702
gnu: docker: Booby-trap "Command" and "LookPath" calls.
* gnu/packages/docker.scm (docker)[arguments]<#:phases>[patch-paths]:
Booby-trap "Command" and "LookPath" calls.
2019-01-10 21:29:53 +01:00
Danny Milosavljevic 6b6a25d4d2
gnu: docker: Fix more paths.
* gnu/packages/docker.scm (docker)[inputs]: Add dbus, git.
[arguments]<#:phases>[patch-paths]: Use them.
2019-01-10 05:40:53 +01:00
Danny Milosavljevic 8cd958608c
gnu: docker: Disable tests requiring elevated permissions.
* gnu/packages/docker.scm (docker)[arguments]<#:phases>[delete-failing-tests]:
Disable tests requiring elevated permissions.
2019-01-10 04:46:29 +01:00
Danny Milosavljevic 8b487bf84f
gnu: containerd: Fix more paths.
* gnu/packages/docker.scm (containerd)[inputs]: Add util-linux.
[arguments]<#:phases>[patch-paths]: Fix more paths.
2019-01-10 04:34:57 +01:00
Danny Milosavljevic 58adcaa19f
gnu: docker: Fix more paths.
* gnu/packages/docker.scm (docker)[inputs]: Add util-linux.
[arguments]<#:phases>[patch-paths]: Fix more paths.
2019-01-10 04:33:47 +01:00
Danny Milosavljevic 65a7e35cb5
gnu: docker: Substitute LookPath of literals generally.
* gnu/packages/docker.scm (docker)[arguments]<#:phases>[patch-paths]:
Substitute LookPath of literals generally.
2019-01-10 03:12:32 +01:00
Danny Milosavljevic e9b316453e
gnu: Add docker-cli.
* gnu/packages/docker.scm (docker-cli): New variable.
2019-01-10 03:01:12 +01:00
Danny Milosavljevic f87ea24a82
gnu: Add docker.
* gnu/packages/docker.scm (docker): New variable.
* gnu/packages/patches/docker-engine-test-noinstall.patch: New file.
* gnu/packages/patches/docker-fix-tests.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add them.
2019-01-10 02:49:14 +01:00
Danny Milosavljevic 40c7476af8
gnu: containerd: Update synopsis.
* gnu/packages/docker.scm (containerd)[synopsis]: Modify.
2019-01-07 19:13:04 +01:00
Danny Milosavljevic 54891e850a
gnu: containerd: Enable tests.
* gnu/packages/docker.scm (containerd)[arguments]: Remove #:tests?.
2019-01-07 19:12:14 +01:00
Ricardo Wurmus 1f1e338ad4
gnu: Add missing use-module clause.
This is a follow-up to 4e5b8f7215.

* gnu/packages/docker.scm: Add missing use-module clause.
2019-01-07 18:45:23 +01:00
Danny Milosavljevic 4e5b8f7215
gnu: Add containerd.
* gnu/packages/docker.scm (containerd): New variable.
2019-01-07 16:41:17 +01:00
Efraim Flashner b24da117e8
gnu: python-docker-py: Update to 1.10.6.
* gnu/packages/docker.scm (python-docker-py): Update to 1.10.6.
2018-07-29 20:00:33 +03:00
Efraim Flashner 42531fd3a7
gnu: Add python-docker-pycreds.
* gnu/packages/docker.scm (python-docker-pycreds): New variable.
2018-07-29 20:00:32 +03:00
Ludovic Courtès 1b2f753d9c
gnu: Move web packages from python to python-web.
This is in part to address <https://bugs.gnu.org/27284>.

* gnu/packages/python.scm (python-httplib2, python2-httplib2)
(python-sockjs-tornado, python2-sockjs-tornado)
(python-flask-babel, python2-flask-babel)
(python-html5lib, python2-html5lib)
(python-html5lib-0.9, python2-html5lib-0.9)
(python-html5-parser, python2-html5-parser)
(python-webencodings, python2-webencodings)
(python-openid, python2-openid, python-cssutils, python2-cssutils)
(python-cssselect, python2-cssutils)
(python-openid-cla, python2-openid-cla)
(python-openid-teams, python2-openid-teams)
(python-tornado, python2-tornado)
(python-tornado-http-auth, python-terminado, python2-terminado)
(python-webob, python2-webob, python-zope-event, python2-zope-event)
(python-zope-interface, python2-zope-interface)
(python-zope-exceptions, python2-zope-exceptions)
(python-zope-testing, python2-zope-testing)
(python-zope-testrunner, python2-zope-testrunner)
(python-zope-i18nmessageid, python2-zope-i18nmessageid)
(python-zope-schema, python2-zope-schema)
(python-zope-configuration, python2-zope-configuration)
(python-zope-proxy, python2-zope-proxy)
(python-zope-location, python2-zope-location)
(python-zope-security, python2-zope-security)
(python-zope-component, python2-zope-component)
(python-ndg-httpsclient, python2-ndg-httpsclient)
(python-websocket-client, python2-websocket-client)
(python-requests-toolbelt, python2-requests-toolbelt)
(python-rauth, python2-rauth, python-urllib3, python2-urllib3)
(awscli, python-wsgiproxy2, python2-wsgiproxy2)
(python-pastedeploy, python2-pastedeploy)
(python-webtest, python2-webtest, python-flask, python2-flask)
(python-flast-wtf, python2-flask-wtf)
(python-flask-multistatic, python2-flask-multistatic)
(python-cookies, python2-cookies)
(python-responses, python2-responses)
(python-geventhttpclient, python2-geventhttpclient)
(python-requests-oauthlib, python2-requests-oauthlib)
(python-url, python2-url, python-cachecontrol, python2-cachecontrol)
(python-betamax, python2-betamax)
(python-betamax-matchers, python2-betamax-matchers)
(python-s3transfer, python2-s3transfer)
(python-flask-restful, python-flask-basicauth)
(python-flask-sqlalchemy, python-flask-restplus)
(python-flask-restful-swagger, python-htmlmin, python2-htmlmin)
(python-flask-htmlmin, python2-flask-htmlmin)
(python-flask-login, python2-flask-login)
(python-oauth2client, python-flask-oidc)
(python-webassets, python-cssmin, python2-cssmin)
(python-elasticsearch, python2-elasticsearch)
(python-flask-script, python2-flask-script)
(python-flask-migrate, python2-flask-migrate)
(python-genshi, python2-genshi)
(python-flask-principal, python2-flask-principal)
(python-flask-httpauth, python2-flask-httpauth)
(python-uritemplate, python2-uritemplate): Move to...
* gnu/packages/python-web.scm: ... here.  New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
* gnu/packages/admin.scm, gnu/packages/backup.scm,
gnu/packages/dav.scm, gnu/packages/django.scm,
gnu/packages/docker.scm, gnu/packages/ebook.scm,
gnu/packages/logging.scm, gnu/packages/mail.scm,
gnu/packages/music.scm, gnu/packages/openstack.scm,
gnu/packages/package-management.scm, gnu/packages/rdf.scm,
gnu/packages/tls.scm, gnu/packages/tor.scm,
gnu/packages/tryton.scm, gnu/packages/version-control.scm,
gnu/packages/web-browsers.scm,
gnu/packages/web.scm: Adjust accordingly.
2017-11-13 23:41:01 +01:00
Hartmut Goebel 5d85493284
gnu: Remove python-setuptools and python2-setuptools from inputs (part 1b)
This patch contains the changes in all modules beside python.scm where
removing setuptools from the inputs could be achieved by removing complete
lines.

* gnu/packages/admin.scm (graphios, thefuck): Remove all [inputs],
  [native-inputs] and [propagated-inputs] where python-setuptools or
  python2-setuptools are the sole entries. Remove python-setuptools and
  python2-setuptools listed on a line by its own from [inputs],
  [native-inputs] and [propagated-inputs].
* gnu/packages/backup.scm (rdiff-backup): Likewise.
* gnu/packages/bioinformatics.scm (htseq, macs, python2-pbcore, rseqc,
  multiqc): Likewise.
* gnu/packages/django.scm (python-django, python2-django,
  python-django-simple-math-captcha, python2-django-simple-math-captcha):
  Likewise.
* gnu/packages/docker.scm (python-docker-py, docker-compose): Likewise.
* gnu/packages/game-development.scm (python-pygame): Likewise.
* gnu/packages/key-mon.scm (key-mon): Likewise.
* gnu/packages/mail.scm (khard): Likewise.
* gnu/packages/music.scm (beets, python2-pyechonest): Likewise.
* gnu/packages/openstack.scm (python-bandit, python2-bandit,
  python-debtcollector, python2-debtcollector,
  python-mox3, python2-mox3,
  python-os-client-config, python2-os-client-config,
  python-oslo.config, python2-oslo.config,
  python-oslo.context, python2-oslo.context,
  python-oslo.i18n, python2-oslo.i18n,
  python-oslo.serialization, python2-oslo.serialization,
  python-oslosphinx, python2-oslosphinx,
  python-oslotest, python2-oslotest,
  python-oslo.utils, python2-oslo.utils,
  python-swiftclient, python2-swiftclient): Likewise.
* gnu/packages/pdf.scm (pdfposter): Likewise.
* gnu/packages/tls.scm (python-acme, python2-acme): Likewise.
2016-11-15 21:58:44 +01:00
Leo Famulari 68f1cdecf1 gnu: Don't use python-enum34 when building with python-3.4.
* gnu/packages/docker.scm (docker-compose)[inputs]: Remove python-enum34.
* gnu/packages/python.scm (python-parse-type)[inputs]: Likewise.
(behave)[inputs]: Likewise.
(python-cryptography)[propagated-inputs]: Likewise.
(python2-cryptography)[propagated-inputs]: Add python2-enum34.
2016-02-21 02:46:23 -05:00
David Thompson df1f1d6936 gnu: Add docker-compose.
* gnu/packages/docker.scm (docker-compose): New variable.
2016-01-14 09:17:12 -05:00
David Thompson b42c9c8124 gnu: Add python-dockerpty.
* gnu/packages/docker.scm (python-dockerpty): New variable.
2016-01-14 09:16:22 -05:00
David Thompson d020bfc2df gnu: Add python-docker-py.
* gnu/packages/docker.scm: New file.
* Makefile.am (GNU_SYSTEM_MODULES): Add it.
2016-01-14 09:16:22 -05:00