diff options
| author | Mathieu Othacehe <m.othacehe@gmail.com> | 2019-11-16 09:34:27 +0100 |
|---|---|---|
| committer | Mathieu Othacehe <m.othacehe@gmail.com> | 2019-11-16 09:34:27 +0100 |
| commit | 154d97abdd16674fdebc763351f661bbcdc869a4 (patch) | |
| tree | 0277a9380edd1390f16e432283d32499ffed36d1 /gnu/packages/docker.scm | |
| parent | e4696c69d75f4fcf54c42beeb928032726bdaf7d (diff) | |
| parent | 87e7faa2ae641d8302efc8b90f1e45f43f67f6da (diff) | |
| download | guix-patches-154d97abdd16674fdebc763351f661bbcdc869a4.tar guix-patches-154d97abdd16674fdebc763351f661bbcdc869a4.tar.gz | |
Merge remote-tracking branch master into core-updates
Diffstat (limited to 'gnu/packages/docker.scm')
| -rw-r--r-- | gnu/packages/docker.scm | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 28eff0a56c..70d2062448 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -291,9 +291,9 @@ the required network abstractions for applications.") ("logrus" ,go-github-com-sirupsen-logrus) ("go-netlink" ,go-netlink) ("go-netns" ,go-netns) - ("go-golang-org-x-crypto-ssh-terminal" - ,go-golang-org-x-crypto-ssh-terminal) - ("go-golang-org-x-sys-unix" ,go-golang-org-x-sys-unix))) + ("go-golang-org-x-crypto" + ,go-golang-org-x-crypto) + ("go-golang-org-x-sys" ,go-golang-org-x-sys))) (synopsis "Docker user-space proxy") (description "A proxy running in the user space. It is used by the built-in registry server of Docker.") @@ -317,7 +317,8 @@ built-in registry server of Docker.") (patches (search-patches "docker-engine-test-noinstall.patch" "docker-fix-tests.patch" - "docker-use-fewer-modprobes.patch")))) + "docker-use-fewer-modprobes.patch" + "docker-adjust-tests-for-changes-in-go.patch")))) (build-system gnu-build-system) (arguments `(#:modules |