mirror of
https://github.com/tailscale/tailscale.git
synced 2025-04-20 21:51:42 +00:00
shell.nix: update Go toolchain to 1.19
Signed-off-by: Tom DNetto <tom@tailscale.com>
This commit is contained in:
parent
44a9b0170b
commit
7a74466998
@ -12,8 +12,8 @@
|
|||||||
|
|
||||||
{
|
{
|
||||||
pkgs ? import <nixpkgs> {},
|
pkgs ? import <nixpkgs> {},
|
||||||
tailscale-go-rev ? "710a0d861098c07540ad073bb73a42ce81bf54a8",
|
tailscale-go-rev ? "fabd769a3703c88780c5a7fb543577992d5074d1",
|
||||||
tailscale-go-sha ? "sha256-hnyddxiyqMFHGwV3I4wkBcYNd56schYFi0SL5/0PnMI=",
|
tailscale-go-sha ? "sha256-BvwZ/90izw0Ip3lh8eNkJvU46LKnOOhEXF0axkBi/Es=",
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
tailscale-go = pkgs.lib.overrideDerivation pkgs.go_1_18 (attrs: rec {
|
tailscale-go = pkgs.lib.overrideDerivation pkgs.go_1_18 (attrs: rec {
|
||||||
@ -28,6 +28,10 @@ let
|
|||||||
nativeBuildInputs = attrs.nativeBuildInputs ++ [ pkgs.git ];
|
nativeBuildInputs = attrs.nativeBuildInputs ++ [ pkgs.git ];
|
||||||
# Remove dependency on xcbuild as that causes iOS/macOS builds to fail.
|
# Remove dependency on xcbuild as that causes iOS/macOS builds to fail.
|
||||||
propagatedBuildInputs = [];
|
propagatedBuildInputs = [];
|
||||||
|
# Remove custom nix patches, which are all related to fixing up
|
||||||
|
# tests. Some don't apply cleanly in 1.19.
|
||||||
|
# TODO: revert this once nix upstream has formal 1.19 support.
|
||||||
|
patches = [];
|
||||||
checkPhase = "";
|
checkPhase = "";
|
||||||
# Our forked tailscale reads this env var to embed the git hash
|
# Our forked tailscale reads this env var to embed the git hash
|
||||||
# into the Go build version.
|
# into the Go build version.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user