From 9ae60c874749f2bdbfb1ffb1249621f050410ad7 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 6 Oct 2020 04:20:00 +0000 Subject: [PATCH] act: build with go 1.15 on darwin Fix on the latest docker-for-mac stable (2.4.0.0) --- pkgs/top-level/all-packages.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 551df77d2c5..b08c9fbfe0b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -583,10 +583,7 @@ in acpica-tools = callPackage ../tools/system/acpica-tools { }; - act = callPackage ../development/tools/misc/act { - # go 1.15 cannot connect to docker-for-mac https://github.com/docker/for-mac/issues/4855 - buildGoModule = if stdenv.isDarwin then buildGo114Module else buildGoModule; - }; + act = callPackage ../development/tools/misc/act { }; actdiag = with python3.pkgs; toPythonApplication actdiag;