colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #144644 from r-burns/go

Browse Source 
go_1_17: enable on x86_64-darwin
This commit is contained in:
Domen Kožar 2021-11-06 13:48:14 -06:00 committed by GitHub
commit 2606cb0fc2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/go/1.17.nix
View File

@ -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" ];
};
}

10
pkgs/top-level/all-packages.nix
View File

@ -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 {