From 071ec50522997eb78c35d3365ccb367f41c987e8 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 5 Aug 2021 15:29:28 +1000 Subject: [PATCH] buildGo117{Module,Package}: disable, go_1_17: disable on x86_64-darwin (cherry picked from commit 9675a865c9c3eeec36c06361f7215e109925654c) --- pkgs/development/compilers/go/1.17.nix | 2 ++ pkgs/top-level/all-packages.nix | 24 ++++++++++++++++++------ 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/go/1.17.nix b/pkgs/development/compilers/go/1.17.nix index f13e7774a51..84bb70a4cf3 100644 --- a/pkgs/development/compilers/go/1.17.nix +++ b/pkgs/development/compilers/go/1.17.nix @@ -274,5 +274,7 @@ stdenv.mkDerivation rec { license = licenses.bsd3; maintainers = teams.golang.members; platforms = platforms.linux ++ platforms.darwin; + # requires >=10.13 stdenv on x86_64-darwin + badPlatforms = [ "x86_64-darwin" ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c6b79014e5e..2455870e553 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18724,9 +18724,15 @@ in buildGo116Package = callPackage ../development/go-packages/generic { go = buildPackages.go_1_16; }; - buildGo117Package = callPackage ../development/go-packages/generic { - go = buildPackages.go_1_17; - }; + # go_1_17 has go module changes which may not be portable + # across different go versions and/or platforms, + # it also requires >=10.13 stdenv on darwin which + # is not currently available for x86_64-darwin + # + # do not uncomment this without approval from the go CODEOWNERS + #buildGo117Package = callPackage ../development/go-packages/generic { + # go = buildPackages.go_1_17; + #}; buildGoPackage = buildGo116Package; @@ -18739,9 +18745,15 @@ in buildGo116Module = callPackage ../development/go-modules/generic { go = buildPackages.go_1_16; }; - buildGo117Module = callPackage ../development/go-modules/generic { - go = buildPackages.go_1_17; - }; + # go_1_17 has go module changes which may not be portable + # across different go versions and/or platforms, + # it also requires >=10.13 stdenv on darwin which + # is not currently available for x86_64-darwin + # + # do not uncomment this without approval from the go CODEOWNERS + #buildGo117Module = callPackage ../development/go-modules/generic { + # go = buildPackages.go_1_17; + #}; buildGoModule = buildGo116Module;