Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

go_1_15: 1.15.12 -> 1.15.13, go_1_16: 1.16.4 -> 1.16.5 #125597

Merged
merged 4 commits into from
Jun 4, 2021
Merged

go_1_15: 1.15.12 -> 1.15.13, go_1_16: 1.16.4 -> 1.16.5 #125597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ebc1971
go_1_15: disable on aarch64-darwin
zowoq May 27, 2021
a742a37
go_1_15: 1.15.12 -> 1.15.13
zowoq Jun 4, 2021
994173d
go_1_16: 1.16.4 -> 1.16.5
zowoq Jun 4, 2021
cd6a930
go: add runHooks to bootstrap binary
zowoq Jun 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions pkgs/development/compilers/go/1.15.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ let

inherit (lib) optionals optionalString;

version = "1.15.12";
version = "1.15.13";

go_bootstrap = buildPackages.callPackage ./bootstrap.nix { };

Expand Down Expand Up @@ -45,7 +45,7 @@ stdenv.mkDerivation rec {

src = fetchurl {
url = "https://dl.google.com/go/go${version}.src.tar.gz";
sha256 = "sha256-HGkRk330onf6dOe378PQhZRJjExK3AtsSuNWYTdSgJE=";
sha256 = "sha256-mQaeciNHnM5FU/hPh0uTRfb0BF8nz1CJSJtUbaYZokQ=";
};

# perl is used for testing go vet
Expand Down Expand Up @@ -268,5 +268,6 @@ stdenv.mkDerivation rec {
license = licenses.bsd3;
maintainers = teams.golang.members;
platforms = platforms.linux ++ platforms.darwin;
badPlatforms = [ "aarch64-darwin" ];
};
}
4 changes: 2 additions & 2 deletions pkgs/development/compilers/go/1.16.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ let

inherit (lib) optionals optionalString;

version = "1.16.4";
version = "1.16.5";

go_bootstrap = buildPackages.callPackage ./bootstrap.nix { };

Expand Down Expand Up @@ -45,7 +45,7 @@ stdenv.mkDerivation rec {

src = fetchurl {
url = "https://dl.google.com/go/go${version}.src.tar.gz";
sha256 = "sha256-rk9rbioWd9MYF5hGVadiB0tTVtpQ+1hyK5kQSHDUNQM=";
sha256 = "sha256-e/p+WQjHzJ512l3fMGbXy88/2fpRlFhRMl7rwX9QuoA=";
};

# perl is used for testing go vet
Expand Down
4 changes: 3 additions & 1 deletion pkgs/development/compilers/go/binary.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ stdenv.mkDerivation rec {
dontStrip = stdenv.hostPlatform.isDarwin;

installPhase = ''
runHook preInstall
Copy link
Contributor Author

@zowoq zowoq Jun 4, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nixpkgs-hammering will probably flag this a some point, adding them in this PR as they cause a full go_* rebuild.

I'll a no-op cleanup and nixpkgs-fmt of go in a follow up PR after this is merged.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#125745

mkdir -p $out/share/go $out/bin
mv bin/* $out/bin
cp -r . $out/share/go
Expand All @@ -37,5 +38,6 @@ stdenv.mkDerivation rec {
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
$out/bin/go
'')}
'' ;
runHook postInstall
'';
}