From 6554cf6947f2830375d5a512aaa48b0263f586b4 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Sat, 21 Mar 2026 11:25:02 -0700
Subject: [PATCH 1/3] tailscale: 1.96.2 -> 1.96.3

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

diff --git a/pkgs/by-name/ta/tailscale/package.nix b/pkgs/by-name/ta/tailscale/package.nix
index dde5f5eda749..c437c4259b0a 100644
--- a/pkgs/by-name/ta/tailscale/package.nix
+++ b/pkgs/by-name/ta/tailscale/package.nix
@@ -25,7 +25,7 @@
 
 buildGoModule.override { go = go_1_26; } (finalAttrs: {
   pname = "tailscale";
-  version = "1.96.2";
+  version = "1.96.3";
 
   outputs = [
     "out"
@@ -36,7 +36,7 @@ buildGoModule.override { go = go_1_26; } (finalAttrs: {
     owner = "tailscale";
     repo = "tailscale";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-6taTRKYFxCNK7BUnNZ3lljqVS7AeYEfm46gmilf6eEk=";
+    hash = "sha256-zEXRhnofNxDslnvT3NiAyVjZM1V9I7i4pXzhsIVEIZo=";
   };
 
   vendorHash = "sha256-rhuWEEN+CtumVxOw6Dy/IRxWIrZ2x6RJb6ULYwXCQc4=";

From 8be23e6636eab7047f45c5eeba3d533c7765e065 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Sat, 21 Mar 2026 11:25:24 -0700
Subject: [PATCH 2/3] trayscale: 0.18.5 -> 0.18.7

Fix build with Go 1.26: the vendored gvisor in 0.18.5 had conflicting
build tags (go125.go and go126.go both compiled on Go 1.26+). Version
0.18.7 updates gvisor to a version with correct build constraints.

https://github.com/DeedleFake/trayscale/releases/tag/v0.18.7
---
 pkgs/by-name/tr/trayscale/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/tr/trayscale/package.nix b/pkgs/by-name/tr/trayscale/package.nix
index b97ceaebcc89..4be7fe47c73c 100644
--- a/pkgs/by-name/tr/trayscale/package.nix
+++ b/pkgs/by-name/tr/trayscale/package.nix
@@ -12,16 +12,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "trayscale";
-  version = "0.18.5";
+  version = "0.18.7";
 
   src = fetchFromGitHub {
     owner = "DeedleFake";
     repo = "trayscale";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-rrN0ofmKn8oSZ8jD3yMirTUSoXwqq1SJwXueG7mk0Ek=";
+    hash = "sha256-t284DpU4kmfrAgOmBZTwHYsxpl6vt7FPytv8/nsNfPM=";
   };
 
-  vendorHash = "sha256-N1FaKkOVzSdY+jTVroHDshPrzMORTWN3lzf+ugirJyw=";
+  vendorHash = "sha256-+2NoNIbB4lXcZhj2pifQpdiKZXslAhv6lxiKUThqTVc=";
 
   subPackages = [ "cmd/trayscale" ];
 

From 1ea6ee81789ef527f9f9d63b8d43c7086d637758 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Sat, 21 Mar 2026 11:25:59 -0700
Subject: [PATCH 3/3] treewide: use buildGoModule instead of
 buildGoModule.override { go = go_1_26; }

buildGoModule is already buildGo126Module, so the override is redundant.
---
 pkgs/by-name/fl/fluxcd/package.nix                  | 3 +--
 pkgs/by-name/ta/tailscale-gitops-pusher/package.nix | 3 +--
 pkgs/by-name/ta/tailscale-nginx-auth/package.nix    | 3 +--
 pkgs/by-name/ta/tailscale/package.nix               | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/fl/fluxcd/package.nix b/pkgs/by-name/fl/fluxcd/package.nix
index 3f742a5b23ce..c8944693d01a 100644
--- a/pkgs/by-name/fl/fluxcd/package.nix
+++ b/pkgs/by-name/fl/fluxcd/package.nix
@@ -6,7 +6,6 @@
   lib,
   stdenv,
   writableTmpDirAsHomeHook,
-  go_1_26,
 }:
 
 let
@@ -22,7 +21,7 @@ let
   };
 in
 
-buildGoModule.override { go = go_1_26; } rec {
+buildGoModule rec {
   pname = "fluxcd";
   inherit vendorHash version;
 
diff --git a/pkgs/by-name/ta/tailscale-gitops-pusher/package.nix b/pkgs/by-name/ta/tailscale-gitops-pusher/package.nix
index a94b4d3ade29..e8821359fff2 100644
--- a/pkgs/by-name/ta/tailscale-gitops-pusher/package.nix
+++ b/pkgs/by-name/ta/tailscale-gitops-pusher/package.nix
@@ -2,10 +2,9 @@
   lib,
   tailscale,
   buildGoModule,
-  go_1_26,
 }:
 
-buildGoModule.override { go = go_1_26; } {
+buildGoModule {
   pname = "tailscale-gitops-pusher";
   inherit (tailscale) version;
 
diff --git a/pkgs/by-name/ta/tailscale-nginx-auth/package.nix b/pkgs/by-name/ta/tailscale-nginx-auth/package.nix
index 6284eef9e68b..bdfc03cd8a68 100644
--- a/pkgs/by-name/ta/tailscale-nginx-auth/package.nix
+++ b/pkgs/by-name/ta/tailscale-nginx-auth/package.nix
@@ -2,11 +2,10 @@
   lib,
   stdenv,
   buildGoModule,
-  go_1_26,
   tailscale,
 }:
 
-buildGoModule.override { go = go_1_26; } {
+buildGoModule {
   pname = "tailscale-nginx-auth";
   inherit (tailscale) version src vendorHash;
 
diff --git a/pkgs/by-name/ta/tailscale/package.nix b/pkgs/by-name/ta/tailscale/package.nix
index c437c4259b0a..e7a7a7b53e22 100644
--- a/pkgs/by-name/ta/tailscale/package.nix
+++ b/pkgs/by-name/ta/tailscale/package.nix
@@ -3,7 +3,6 @@
   stdenv,
 
   buildGoModule,
-  go_1_26,
   fetchFromGitHub,
 
   makeWrapper,
@@ -23,7 +22,7 @@
   tailscale-nginx-auth,
 }:
 
-buildGoModule.override { go = go_1_26; } (finalAttrs: {
+buildGoModule (finalAttrs: {
   pname = "tailscale";
   version = "1.96.3";