From 046d9dbefeb11d527490584b6cfcb141fcd33fb9 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Thu, 22 May 2025 12:30:07 +0200
Subject: [PATCH 1/5] tailscale: 1.82.5 -> 1.84.0

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

diff --git a/pkgs/by-name/ta/tailscale/package.nix b/pkgs/by-name/ta/tailscale/package.nix
index d3c6b78cc1d8..fb6d96b8c303 100644
--- a/pkgs/by-name/ta/tailscale/package.nix
+++ b/pkgs/by-name/ta/tailscale/package.nix
@@ -24,7 +24,7 @@
 }:
 
 let
-  version = "1.82.5";
+  version = "1.84.0";
 in
 buildGoModule {
   pname = "tailscale";
@@ -39,10 +39,10 @@ buildGoModule {
     owner = "tailscale";
     repo = "tailscale";
     rev = "v${version}";
-    hash = "sha256-BFitj8A+TfNKTyXBB1YhsEs5NvLUfgJ2IbjB2ipf4xU=";
+    hash = "sha256-8/kDUr1OBkKuEXut7Eqd3dnm+82+9b9D+cRsn0ke/bY=";
   };
 
-  vendorHash = "sha256-SiUkN6BQK1IQmLfkfPetzvYqRu9ENK6+6txtGxegF5Y=";
+  vendorHash = "sha256-QBYCMOWQOBCt+69NtJtluhTZIOiBWcQ78M9Gbki6bN0=";
 
   nativeBuildInputs = [
     makeWrapper

From 4b78b9bee5031af00396643018feb2d2b9045c31 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Thu, 22 May 2025 12:42:02 +0200
Subject: [PATCH 2/5] tailscale: disable timeout taildrop tests

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

diff --git a/pkgs/by-name/ta/tailscale/package.nix b/pkgs/by-name/ta/tailscale/package.nix
index fb6d96b8c303..93d1e218db91 100644
--- a/pkgs/by-name/ta/tailscale/package.nix
+++ b/pkgs/by-name/ta/tailscale/package.nix
@@ -141,6 +141,10 @@ buildGoModule {
 
           # flaky: https://github.com/tailscale/tailscale/issues/11762
           "TestTwoDevicePing"
+
+          # timeout 10m
+          "TestTaildropIntegration"
+          "TestTaildropIntegration_Fresh"
         ]
         ++ lib.optionals stdenv.hostPlatform.isDarwin [
           # syscall default route interface en0 differs from netstat

From a296d255d98fcac8de4353027b84f3b6ba09650e Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Thu, 22 May 2025 13:00:40 +0200
Subject: [PATCH 3/5] tailscale: disable packet_filter_test

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

diff --git a/pkgs/by-name/ta/tailscale/package.nix b/pkgs/by-name/ta/tailscale/package.nix
index 93d1e218db91..5ded330af258 100644
--- a/pkgs/by-name/ta/tailscale/package.nix
+++ b/pkgs/by-name/ta/tailscale/package.nix
@@ -98,6 +98,10 @@ buildGoModule {
 
     # several tests hang
     rm tsnet/tsnet_test.go
+
+    # new test, probably missing import
+    # reported: https://github.com/tailscale/tailscale/issues/16051
+    rm tsnet/packet_filter_test.go
   '';
 
   checkFlags =

From 25122135e6c5976ee41c0d560c125a618ee53d6d Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Fri, 23 May 2025 18:04:56 +0200
Subject: [PATCH 4/5] tailscale: remove unused fetchpatch

---
 pkgs/by-name/ta/tailscale/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/ta/tailscale/package.nix b/pkgs/by-name/ta/tailscale/package.nix
index 5ded330af258..1e13641427d5 100644
--- a/pkgs/by-name/ta/tailscale/package.nix
+++ b/pkgs/by-name/ta/tailscale/package.nix
@@ -4,7 +4,6 @@
 
   buildGoModule,
   fetchFromGitHub,
-  fetchpatch,
 
   makeWrapper,
   installShellFiles,

From 69984d594fc4d175fd0cf0762f98801dc598b99d Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Fri, 23 May 2025 18:05:58 +0200
Subject: [PATCH 5/5] tailscale: re-enable `packet_filter_test.go`

Co-authored-by: Kenichi Kamiya <kachick1@gmail.com>
---
 pkgs/by-name/ta/tailscale/package.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ta/tailscale/package.nix b/pkgs/by-name/ta/tailscale/package.nix
index 1e13641427d5..54b850dba942 100644
--- a/pkgs/by-name/ta/tailscale/package.nix
+++ b/pkgs/by-name/ta/tailscale/package.nix
@@ -95,12 +95,10 @@ buildGoModule {
     # want but also limits the tests
     unset subPackages
 
-    # several tests hang
-    rm tsnet/tsnet_test.go
-
-    # new test, probably missing import
-    # reported: https://github.com/tailscale/tailscale/issues/16051
-    rm tsnet/packet_filter_test.go
+    # several tests hang, but keeping the file for tsnet/packet_filter_test.go
+    # packet_filter_test issue: https://github.com/tailscale/tailscale/issues/16051
+    substituteInPlace tsnet/tsnet_test.go \
+      --replace-fail 'func Test' 'func skippedTest'
   '';
 
   checkFlags =
@@ -148,6 +146,9 @@ buildGoModule {
           # timeout 10m
           "TestTaildropIntegration"
           "TestTaildropIntegration_Fresh"
+
+          # context deadline exceeded
+          "TestPacketFilterFromNetmap"
         ]
         ++ lib.optionals stdenv.hostPlatform.isDarwin [
           # syscall default route interface en0 differs from netstat