From 56e5ab1eaa6014ad9258b8aa2a32b229217f90aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Thu, 4 Jul 2024 15:02:46 +0200
Subject: [PATCH 1/2] tailscale-nginx-auth: re-use most from tailscale package

---
 .../ta/tailscale-nginx-auth/package.nix       | 22 ++-----------------
 1 file changed, 2 insertions(+), 20 deletions(-)

diff --git a/pkgs/by-name/ta/tailscale-nginx-auth/package.nix b/pkgs/by-name/ta/tailscale-nginx-auth/package.nix
index a68167b4c51e..bb572cb84797 100644
--- a/pkgs/by-name/ta/tailscale-nginx-auth/package.nix
+++ b/pkgs/by-name/ta/tailscale-nginx-auth/package.nix
@@ -1,31 +1,13 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, stdenv, buildGoModule, tailscale }:
 
-let
-  version = "1.68.1";
-in
 buildGoModule {
   pname = "tailscale-nginx-auth";
-  inherit version;
-
-  src = fetchFromGitHub {
-    owner = "tailscale";
-    repo = "tailscale";
-    rev = "v${version}";
-    hash = "sha256-ZAzro69F7ovfdqzRss/U7puh1T37bkEtUXabCYc5LwU=";
-  };
-  vendorHash = "sha256-SUjoeOFYz6zbEgv/vND7kEXbuWlZDrUKF2Dmqsf/KVw=";
+  inherit (tailscale) version src vendorHash ldflags;
 
   CGO_ENABLED = 0;
 
   subPackages = [ "cmd/nginx-auth" ];
 
-  ldflags = [
-    "-w"
-    "-s"
-    "-X tailscale.com/version.longStamp=${version}"
-    "-X tailscale.com/version.shortStamp=${version}"
-  ];
-
   postInstall = lib.optionalString stdenv.isLinux ''
     mv $out/bin/nginx-auth $out/bin/tailscale.nginx-auth
     sed -i -e "s#/usr/sbin#$out/bin#" ./cmd/nginx-auth/tailscale.nginx-auth.service

From f8cbb648de522cfd16e6b9e5ebd30d024ebb6844 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Thu, 4 Jul 2024 15:10:45 +0200
Subject: [PATCH 2/2] tailscale: test tailscale-nginx-auth

---
 pkgs/by-name/ta/tailscale-nginx-auth/package.nix | 9 ++++++++-
 pkgs/servers/tailscale/default.nix               | 2 ++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ta/tailscale-nginx-auth/package.nix b/pkgs/by-name/ta/tailscale-nginx-auth/package.nix
index bb572cb84797..455374e03de8 100644
--- a/pkgs/by-name/ta/tailscale-nginx-auth/package.nix
+++ b/pkgs/by-name/ta/tailscale-nginx-auth/package.nix
@@ -2,12 +2,19 @@
 
 buildGoModule {
   pname = "tailscale-nginx-auth";
-  inherit (tailscale) version src vendorHash ldflags;
+  inherit (tailscale) version src vendorHash;
 
   CGO_ENABLED = 0;
 
   subPackages = [ "cmd/nginx-auth" ];
 
+  ldflags = [
+    "-w"
+    "-s"
+    "-X tailscale.com/version.longStamp=${tailscale.version}"
+    "-X tailscale.com/version.shortStamp=${tailscale.version}"
+  ];
+
   postInstall = lib.optionalString stdenv.isLinux ''
     mv $out/bin/nginx-auth $out/bin/tailscale.nginx-auth
     sed -i -e "s#/usr/sbin#$out/bin#" ./cmd/nginx-auth/tailscale.nginx-auth.service
diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix
index 9eb168751fa8..de407fb44325 100644
--- a/pkgs/servers/tailscale/default.nix
+++ b/pkgs/servers/tailscale/default.nix
@@ -11,6 +11,7 @@
 , procps
 , nixosTests
 , installShellFiles
+, tailscale-nginx-auth
 }:
 
 let
@@ -76,6 +77,7 @@ buildGoModule {
 
   passthru.tests = {
     inherit (nixosTests) headscale;
+    inherit tailscale-nginx-auth;
   };
 
   meta = with lib; {