Merge pull request #144644 from r-burns/go
go_1_17: enable on x86_64-darwin
This commit is contained in:
commit
2606cb0fc2
|
@ -273,7 +273,5 @@ 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" ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -20232,9 +20232,8 @@ with pkgs;
|
|||
go = buildPackages.go_1_16;
|
||||
};
|
||||
# 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
|
||||
# across different go versions and/or platforms:
|
||||
# https://github.com/NixOS/nixpkgs/issues/144667
|
||||
#
|
||||
# do not uncomment this without approval from the go CODEOWNERS
|
||||
#buildGo117Package = callPackage ../development/go-packages/generic {
|
||||
|
@ -20250,9 +20249,8 @@ with pkgs;
|
|||
go = buildPackages.go_1_16;
|
||||
};
|
||||
# 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
|
||||
# across different go versions and/or platforms:
|
||||
# https://github.com/NixOS/nixpkgs/issues/144667
|
||||
#
|
||||
# do not uncomment this without approval from the go CODEOWNERS
|
||||
#buildGo117Module = callPackage ../development/go-modules/generic {
|
||||
|
|
Loading…
Reference in a new issue