From 92d3296cb603418f889523152a09f3925a6ca0b7 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Wed, 20 Aug 2025 14:37:44 -0700 Subject: [PATCH 1/2] tailscale: use finalAttrs style --- pkgs/by-name/ta/tailscale/package.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/ta/tailscale/package.nix b/pkgs/by-name/ta/tailscale/package.nix index 91772517b429..6c932520f2f3 100644 --- a/pkgs/by-name/ta/tailscale/package.nix +++ b/pkgs/by-name/ta/tailscale/package.nix @@ -22,12 +22,9 @@ tailscale-nginx-auth, }: -let - version = "1.86.4"; -in -buildGoModule { +buildGoModule (finalAttrs: { pname = "tailscale"; - inherit version; + version = "1.86.4"; outputs = [ "out" @@ -37,7 +34,7 @@ buildGoModule { src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-cYj04DtoYKejygz1Euir/6/Eq1M046nzzhqSfpTi0OE="; }; @@ -70,8 +67,8 @@ buildGoModule { ldflags = [ "-w" "-s" - "-X tailscale.com/version.longStamp=${version}" - "-X tailscale.com/version.shortStamp=${version}" + "-X tailscale.com/version.longStamp=${finalAttrs.version}" + "-X tailscale.com/version.shortStamp=${finalAttrs.version}" ]; tags = [ @@ -223,7 +220,7 @@ buildGoModule { meta = { homepage = "https://tailscale.com"; description = "Node agent for Tailscale, a mesh VPN built on WireGuard"; - changelog = "https://github.com/tailscale/tailscale/releases/tag/v${version}"; + changelog = "https://tailscale.com/changelog#client"; license = lib.licenses.bsd3; mainProgram = "tailscale"; maintainers = with lib.maintainers; [ @@ -234,4 +231,4 @@ buildGoModule { ryan4yin ]; }; -} +}) From 45a869267bfa242b3439c840ca44f79543cc1912 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Wed, 20 Aug 2025 14:38:07 -0700 Subject: [PATCH 2/2] tailscale: add philiptaron as maintainer I'm part of the [Tailscale Insiders](https://tailscale.com/blog/tailscale-insiders-update-seattle-meetup-news) team and am passionate about making Tailscale on Nix and NixOS the best it can be. --- pkgs/by-name/ta/tailscale/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ta/tailscale/package.nix b/pkgs/by-name/ta/tailscale/package.nix index 6c932520f2f3..e3533687a464 100644 --- a/pkgs/by-name/ta/tailscale/package.nix +++ b/pkgs/by-name/ta/tailscale/package.nix @@ -227,6 +227,7 @@ buildGoModule (finalAttrs: { mbaillie jk mfrw + philiptaron pyrox0 ryan4yin ];