diff options
Diffstat (limited to 'pkgs/servers/tailscale/default.nix')
| -rw-r--r-- | pkgs/servers/tailscale/default.nix | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index 40d832620c3fa..e5c9d4310cb82 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -2,6 +2,7 @@ , stdenv , buildGoModule , fetchFromGitHub +, fetchpatch , makeWrapper , getent , iproute2 @@ -9,11 +10,10 @@ , shadow , procps , nixosTests -, fetchpatch }: let - version = "1.64.2"; + version = "1.68.0"; in buildGoModule { pname = "tailscale"; @@ -23,19 +23,20 @@ buildGoModule { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - hash = "sha256-DS7C/G1Nj9gIjYwXaEeCLbtH9HbB0tRoJBDjZc/nq5g="; + hash = "sha256-GTl5RCwIoDuzbaigy0/++xaPPEMLRDbBi/z82xCDOZY="; }; - vendorHash = "sha256-pYeHqYd2cCOVQlD1r2lh//KC+732H0lj1fPDBr+W8qA="; patches = [ - # Reverts "cmd/tailscaled/tailscaled.service: revert recent hardening" + # 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/2889fabaefc50040507ead652d6d2b212f476c2b.patch"; - hash = "sha256-DPBrv7kjSVXhmptUGGzOkaP4iXi/Bym3lvqy4otL9HE="; - revert = true; + url = "https://github.com/tailscale/tailscale/commit/325ca13c4549c1af58273330744d160602218af9.patch"; + hash = "sha256-SMwqZiGNVflhPShlHP+7Gmn0v4b6Gr4VZGIF/oJAY8M="; }) ]; + vendorHash = "sha256-SUjoeOFYz6zbEgv/vND7kEXbuWlZDrUKF2Dmqsf/KVw="; + nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; CGO_ENABLED = 0; @@ -72,7 +73,7 @@ buildGoModule { meta = with lib; { homepage = "https://tailscale.com"; - description = "The node agent for Tailscale, a mesh VPN built on WireGuard"; + description = "Node agent for Tailscale, a mesh VPN built on WireGuard"; license = licenses.bsd3; mainProgram = "tailscale"; maintainers = with maintainers; [ mbaillie jk mfrw ]; |