Skip to content

go_1_16: init at 1.16#107937

Merged
zowoq merged 1 commit intoNixOS:masterfrom
c00w:go_1_16
Feb 16, 2021
Merged

go_1_16: init at 1.16#107937
zowoq merged 1 commit intoNixOS:masterfrom
c00w:go_1_16

Conversation

@c00w
Copy link
Contributor

@c00w c00w commented Dec 30, 2020 •
edited
Loading

This allows us to sort out go1.16 in time for its release.

Changes are minor - I ended up just patching the ssl certs at the root
file, rather than trying to keep up with the various darwin changes.

The externalnetwork test helper location changed, to so I had to update
that patch as well.

Motivation for this change

go1.16beta1 is available - go1.16 should drop in febuary.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added 6.topic: golang Go is a high-level general purpose programming language that is statically typed and compiled. 8.has: package (new) This PR adds a new package labels Dec 30, 2020
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Dec 30, 2020
zowoq
zowoq reviewed Jan 1, 2021
View reviewed changes
@ofborg ofborg bot requested a review from zowoq January 6, 2021 07:48
@zowoq
Copy link
Contributor

zowoq commented Jan 6, 2021

Built on darwin.

@c00w
Copy link
Contributor Author

c00w commented Jan 11, 2021

@kalbasit @Mic92 - any thoughts / chance you can merge?

zowoq
zowoq reviewed Jan 11, 2021
View reviewed changes
@ofborg ofborg bot requested a review from zowoq January 11, 2021 07:16
@zowoq
Copy link
Contributor

zowoq commented Jan 29, 2021

Updated to 1.16rc1 and applied two treewide changes to match go_1_* on master:

  • pkgconfig -> pkg-config
  • stdenv.lib -> lib

@zowoq zowoq changed the title go_1_16: init at 1.16beta1 go_1_16: init at 1.16rc1 Jan 29, 2021
@zowoq
Copy link
Contributor

zowoq commented Jan 30, 2021

Updated the GO_NO_VENDOR_CHECKS patch for 1.16 that it's in master.

cc @adisbladis

@bobrik
Copy link
Contributor

bobrik commented Feb 7, 2021

Either this or #112248 will need a rebase once one of them is merged.

bobrik
bobrik reviewed Feb 7, 2021
View reviewed changes
pkgs/development/compilers/go/1.16.nix Outdated
Copy link
Contributor

@bobrik bobrik Feb 7, 2021

Choose a reason for hiding this comment

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

I think you also need the following for 1.16 (plus xcbuild in inputs):

propagatedBuildInputs = optionals stdenv.isDarwin [ xcbuild ];

See: golang/go@7e25bdb

Otherwise you won't be able to link packages inside of Nix build environment:

/nix/store/61kpq6gcyp94j87ni6i12vl4vpmsgb02-go-1.16rc1/share/go/pkg/tool/darwin_amd64/link: /nix/store/61kpq6gcyp94j87ni6i12vl4vpmsgb02-go-1.16rc1/share/go/pkg/tool/darwin_amd64/link: running dsymutil failed: exec: "xcrun": executable file not found in $PATH

Go will still work outside of Nix if you run go, because it will find /usr/bin/xcrun from developer tools.

@kalbasit
Copy link
Member

kalbasit commented Feb 15, 2021

Please update to reflect the removal of go_bootstrap in #113113

@bobrik
Copy link
Contributor

bobrik commented Feb 15, 2021

Changes from #112248 should also be picked up.

@bobrik bobrik mentioned this pull request Feb 16, 2021
Merged
10 tasks
@zowoq
Copy link
Contributor

zowoq commented Feb 16, 2021

Updated/rebased on master to include #112248 and #113113.

@github-actions
Copy link
Contributor

github-actions bot commented Feb 16, 2021

Failed to rebase

@bobrik
Copy link
Contributor

bobrik commented Feb 16, 2021

Good to merge now? I can address #107937 (comment) in a separate PR.

@zowoq
Copy link
Contributor

zowoq commented Feb 16, 2021

Good to merge now?

I was going to wait until 1.16 is released and merge that.

@bobrik
Copy link
Contributor

bobrik commented Feb 16, 2021

Seems reasonable to incorporate my change to not break darwin down to road then.

@bobrik
Copy link
Contributor

bobrik commented Feb 16, 2021

Today is the day: https://github.com/golang/go/releases/tag/go1.16.

The source file is already available at the expected URL, even if https://golang.org/dl/ is not yet updated.

@c00w @zowoq
go_1_16: init at 1.16
d203aa4 
Changes are minor - I ended up just patching the ssl certs at the root
file, rather than trying to keep up with the various darwin changes.

The externalnetwork test helper location changed, to so I had to update
that patch as well.

- Add xcbuild as propagatedBuildInput on darwin golang/go@7e25bdb
@zowoq
Copy link
Contributor

zowoq commented Feb 16, 2021

... even if https://golang.org/dl/ is not yet updated.

It's been updated.

Seems reasonable to incorporate my change ...

Added xcbuild.

@zowoq zowoq changed the title go_1_16: init at 1.16rc1 go_1_16: init at 1.16 Feb 16, 2021
@bobrik
Copy link
Contributor

bobrik commented Feb 16, 2021

LGTM.

@zowoq
Copy link
Contributor

zowoq commented Feb 16, 2021

Built on x86_64-{darwin,linux}

@zowoq zowoq merged commit 9eb88a2 into NixOS:master Feb 16, 2021
@lobre lobre mentioned this pull request Mar 14, 2021
Closed
@zowoq zowoq mentioned this pull request Jan 4, 2025
Merged
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@adisbladis adisbladis adisbladis approved these changes

@kalbasit kalbasit Awaiting requested review from kalbasit

@Mic92 Mic92 Awaiting requested review from Mic92

@Frostman Frostman Awaiting requested review from Frostman

@mdlayher mdlayher Awaiting requested review from mdlayher

@rvolosatovs rvolosatovs Awaiting requested review from rvolosatovs

@cstrahan cstrahan Awaiting requested review from cstrahan

@zowoq zowoq Awaiting requested review from zowoq

+1 more reviewer

@bobrik bobrik bobrik approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

6.topic: golang Go is a high-level general purpose programming language that is statically typed and compiled. 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@c00w @zowoq @bobrik @kalbasit @adisbladis @Mic92