From 7a744669982668ac83d45a26a39b4f447a85050c Mon Sep 17 00:00:00 2001 From: Tom DNetto Date: Fri, 29 Jul 2022 10:02:55 -0700 Subject: [PATCH] shell.nix: update Go toolchain to 1.19 Signed-off-by: Tom DNetto --- shell.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/shell.nix b/shell.nix index cb8d44204..5157bc2f3 100644 --- a/shell.nix +++ b/shell.nix @@ -12,8 +12,8 @@ { pkgs ? import {}, - tailscale-go-rev ? "710a0d861098c07540ad073bb73a42ce81bf54a8", - tailscale-go-sha ? "sha256-hnyddxiyqMFHGwV3I4wkBcYNd56schYFi0SL5/0PnMI=", + tailscale-go-rev ? "fabd769a3703c88780c5a7fb543577992d5074d1", + tailscale-go-sha ? "sha256-BvwZ/90izw0Ip3lh8eNkJvU46LKnOOhEXF0axkBi/Es=", }: let tailscale-go = pkgs.lib.overrideDerivation pkgs.go_1_18 (attrs: rec { @@ -28,6 +28,10 @@ let nativeBuildInputs = attrs.nativeBuildInputs ++ [ pkgs.git ]; # Remove dependency on xcbuild as that causes iOS/macOS builds to fail. 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 = ""; # Our forked tailscale reads this env var to embed the git hash # into the Go build version.