diff options
Diffstat (limited to 'pkgs/servers/tailscale/default.nix')
-rw-r--r-- | pkgs/servers/tailscale/default.nix | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index 20637c70129f0..216add099af5c 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -2,6 +2,7 @@ , stdenv , buildGoModule , fetchFromGitHub +, fetchpatch , makeWrapper , getent , iproute2 @@ -12,7 +13,7 @@ }: let - version = "1.64.2"; + version = "1.66.4"; in buildGoModule { pname = "tailscale"; @@ -22,9 +23,19 @@ buildGoModule { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - hash = "sha256-DS7C/G1Nj9gIjYwXaEeCLbtH9HbB0tRoJBDjZc/nq5g="; + hash = "sha256-ETBca3qKO2iS30teIF5sr/oyJdRSKFqLFVO3+mmm7bo="; }; - vendorHash = "sha256-pYeHqYd2cCOVQlD1r2lh//KC+732H0lj1fPDBr+W8qA="; + + patches = [ + # Fix "tailscale ssh" when built with ts_include_cli tag + # https://github.com/tailscale/tailscale/pull/12109 + (fetchpatch { + url = "https://github.com/tailscale/tailscale/commit/325ca13c4549c1af58273330744d160602218af9.patch"; + hash = "sha256-SMwqZiGNVflhPShlHP+7Gmn0v4b6Gr4VZGIF/oJAY8M="; + }) + ]; + + vendorHash = "sha256-Hd77xy8stw0Y6sfk3/ItqRIbM/349M/4uf0iNy1xJGw="; nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; |