Merge pull request #96422 from marsam/fix-act-darwin

act: use go 1.14 on darwin
This commit is contained in:
Mario Rodas 2020-08-26 22:55:25 -05:00 committed by GitHub
commit c5f5462eb4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -579,7 +579,10 @@ in
acpica-tools = callPackage ../tools/system/acpica-tools { }; acpica-tools = callPackage ../tools/system/acpica-tools { };
act = callPackage ../development/tools/misc/act {}; 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;
};
actdiag = with python3.pkgs; toPythonApplication actdiag; actdiag = with python3.pkgs; toPythonApplication actdiag;