From 3428dd4bef7ea4d81f6da347150281e0efb6d6c0 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Mon, 24 Jul 2023 14:26:11 +0200 Subject: [PATCH] docker: apply fix starting containers with a local connection with the CLI The change done in 4a526a901c3da5092e0ac7278ad49fe00940f0b4 was not enough to cover everything. In order for the Docker CLI to work when built with Go 1.20.6 it is also required to have the equivalent patch for the docker/cli repository. --- pkgs/applications/virtualization/docker/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 79f39f949ece..3913031e7bc2 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -188,6 +188,14 @@ rec { ++ lib.optional withSeccomp libseccomp ++ plugins; + patches = [ + (fetchpatch { + name = "fix-issue-with-go-1.20.6.patch"; + url = "https://github.com/docker/cli/pull/4441.patch"; + hash = "sha256-F4ueSbdBk1w8OqC4Dgh8+4Ql4zTjehaM368ET7k6Yx8="; + }) + ]; + postPatch = '' patchShebangs man scripts/build/ substituteInPlace ./scripts/build/.variables --replace "set -eu" ""