diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-11-15 20:11:35 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-11-15 20:11:35 +0100 |
| commit | f056553c6b8ffa36f4ce9fb1c3602a8f4b1de242 (patch) | |
| tree | 80c815216a3717cf00b615c9cb8840c113eaf79f /gnu/packages/docker.scm | |
| parent | 2c9d34166983565120f831284df57a07e2edd2f9 (diff) | |
| parent | 528b52390d216d8a8cd13dfcd1e6e40a6448e6c2 (diff) | |
| download | guix-f056553c6b8ffa36f4ce9fb1c3602a8f4b1de242.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/docker.scm')
| -rw-r--r-- | gnu/packages/docker.scm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 69325449a1..70d2062448 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -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 |