From 40a20e6af106bcbe586175945e803605a3a9269e Mon Sep 17 00:00:00 2001
From: Ashish SHUKLA <ashish.is@lostca.se>
Date: Fri, 13 Sep 2024 07:17:08 +0530
Subject: [PATCH 1/3] tailscale: 1.72.1 -> 1.74.0

- switch to go 1.23.0

Changes: https://tailscale.com/changelog#2024-09-12
---
 pkgs/servers/tailscale/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix    | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix
index d222563fa0fd..10b88a04c707 100644
--- a/pkgs/servers/tailscale/default.nix
+++ b/pkgs/servers/tailscale/default.nix
@@ -15,7 +15,7 @@
 }:
 
 let
-  version = "1.72.1";
+  version = "1.74.0";
 in
 buildGoModule {
   pname = "tailscale";
@@ -25,7 +25,7 @@ buildGoModule {
     owner = "tailscale";
     repo = "tailscale";
     rev = "v${version}";
-    hash = "sha256-b1o3UHotVs5/+cpMx9q8bvt6BSM2QamLDUNyBNfb58A=";
+    hash = "sha256-KTg1rxyCgvZAwkGxhFXLff5UggKlqa6VLMItK81JV2k=";
   };
 
   patches = [
@@ -37,7 +37,7 @@ buildGoModule {
     })
   ];
 
-  vendorHash = "sha256-M5e5dE1gGW3ly94r3SxCsBmVwbBmhVtaVDW691vxG/8=";
+  vendorHash = "sha256-HJEgBs2GOzXvRa95LdwySQmG4/+QwupFDBGrQT6Y2vE=";
 
   nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ] ++ [ installShellFiles ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c12c64eac07b..2a7ad34c5564 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25777,7 +25777,9 @@ with pkgs;
 
   systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { };
 
-  tailscale = callPackage ../servers/tailscale { };
+  tailscale = callPackage ../servers/tailscale {
+    buildGoModule = buildGo123Module;
+  };
 
   tailscale-systray = callPackage ../applications/misc/tailscale-systray { };
 

From be7fd2597ae6dd3013a524581cf1bf76514ef502 Mon Sep 17 00:00:00 2001
From: Ashish SHUKLA <ashish.is@lostca.se>
Date: Sat, 14 Sep 2024 14:17:51 +0530
Subject: [PATCH 2/3] tailscale-gitops-pusher: switch to Go 1.23

---
 pkgs/by-name/ta/tailscale-gitops-pusher/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ta/tailscale-gitops-pusher/package.nix b/pkgs/by-name/ta/tailscale-gitops-pusher/package.nix
index f0ddde526f0b..17ba3aa9e4b2 100644
--- a/pkgs/by-name/ta/tailscale-gitops-pusher/package.nix
+++ b/pkgs/by-name/ta/tailscale-gitops-pusher/package.nix
@@ -1,9 +1,9 @@
 { lib
 , tailscale
-, buildGoModule
+, buildGo123Module
 }:
 
-buildGoModule {
+buildGo123Module {
   inherit (tailscale) version src vendorHash CGO_ENABLED;
   pname = "tailscale-gitops-pusher";
 

From 2fac910347e0d133e535a7f8f7687c112cd7928b Mon Sep 17 00:00:00 2001
From: Ashish SHUKLA <ashish.is@lostca.se>
Date: Sat, 14 Sep 2024 14:18:05 +0530
Subject: [PATCH 3/3] tailscale-nginx-auth: switch to Go 1.23

---
 pkgs/by-name/ta/tailscale-nginx-auth/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ta/tailscale-nginx-auth/package.nix b/pkgs/by-name/ta/tailscale-nginx-auth/package.nix
index 455374e03de8..919a2e77a66b 100644
--- a/pkgs/by-name/ta/tailscale-nginx-auth/package.nix
+++ b/pkgs/by-name/ta/tailscale-nginx-auth/package.nix
@@ -1,6 +1,6 @@
-{ lib, stdenv, buildGoModule, tailscale }:
+{ lib, stdenv, buildGo123Module, tailscale }:
 
-buildGoModule {
+buildGo123Module {
   pname = "tailscale-nginx-auth";
   inherit (tailscale) version src vendorHash;