From 0d4e9ed3299d304d962d1821d023f8bf4e58d02f Mon Sep 17 00:00:00 2001
From: Varun Narravula <varun@snare.dev>
Date: Fri, 12 Dec 2025 15:17:19 -0800
Subject: [PATCH 1/4] fosrl-newt: 1.5.2 -> 1.7.0

Changelog: https://github.com/fosrl/newt/compare/1.5.2...1.7.0
---
 pkgs/by-name/fo/fosrl-newt/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fo/fosrl-newt/package.nix b/pkgs/by-name/fo/fosrl-newt/package.nix
index 777df948c119..1b895ed6f25a 100644
--- a/pkgs/by-name/fo/fosrl-newt/package.nix
+++ b/pkgs/by-name/fo/fosrl-newt/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "newt";
-  version = "1.5.2";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "fosrl";
     repo = "newt";
     tag = version;
-    hash = "sha256-svMAMPK8f5cwIPzr0+WdoWzHDV1jtuO1Lm2oZIVHE6k=";
+    hash = "sha256-R6X9DOu1iGS/a4d5kmKoBZI0L5k7S0w3SHHFQnQH/ho=";
   };
 
-  vendorHash = "sha256-wNdZEfPx12T0jvCEDkz04X8N6t/pNIOXWFSTHteeZYs=";
+  vendorHash = "sha256-5Xr6mwPtsqEliKeKv2rhhp6JC7u3coP4nnhIxGMqccU=";
 
   postPatch = ''
     substituteInPlace main.go \

From 4091249bb6f53fc42327558ae4aa3fb3eb255c6e Mon Sep 17 00:00:00 2001
From: Varun Narravula <varun@snare.dev>
Date: Fri, 12 Dec 2025 15:17:54 -0800
Subject: [PATCH 2/4] fosrl-newt: use ldflags for version instead of string
 substitution

---
 pkgs/by-name/fo/fosrl-newt/package.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/by-name/fo/fosrl-newt/package.nix b/pkgs/by-name/fo/fosrl-newt/package.nix
index 1b895ed6f25a..48df8202eac1 100644
--- a/pkgs/by-name/fo/fosrl-newt/package.nix
+++ b/pkgs/by-name/fo/fosrl-newt/package.nix
@@ -18,16 +18,12 @@ buildGoModule rec {
 
   vendorHash = "sha256-5Xr6mwPtsqEliKeKv2rhhp6JC7u3coP4nnhIxGMqccU=";
 
-  postPatch = ''
-    substituteInPlace main.go \
-      --replace-fail "version_replaceme" "${version}"
-  '';
-
   nativeInstallCheckInputs = [ versionCheckHook ];
 
   ldflags = [
     "-s"
     "-w"
+    "-X=main.newtVersion=${version}"
   ];
 
   doInstallCheck = true;

From a97e60ee0f1111e8c1b827d4c3d6d049384a0cc6 Mon Sep 17 00:00:00 2001
From: Varun Narravula <varun@snare.dev>
Date: Fri, 12 Dec 2025 15:19:09 -0800
Subject: [PATCH 3/4] fosrl-newt: add automatic package update script attribute

---
 pkgs/by-name/fo/fosrl-newt/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/fo/fosrl-newt/package.nix b/pkgs/by-name/fo/fosrl-newt/package.nix
index 48df8202eac1..e9c58ca6cbac 100644
--- a/pkgs/by-name/fo/fosrl-newt/package.nix
+++ b/pkgs/by-name/fo/fosrl-newt/package.nix
@@ -3,6 +3,7 @@
   buildGoModule,
   fetchFromGitHub,
   versionCheckHook,
+  nix-update-script,
 }:
 
 buildGoModule rec {
@@ -30,6 +31,8 @@ buildGoModule rec {
 
   versionCheckProgramArg = [ "-version" ];
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Tunneling client for Pangolin";
     homepage = "https://github.com/fosrl/newt";

From c0a6aaf0640a9a743184f788444ae088dee13011 Mon Sep 17 00:00:00 2001
From: Varun Narravula <varun@snare.dev>
Date: Fri, 12 Dec 2025 15:24:32 -0800
Subject: [PATCH 4/4] fosrl-newt: add water-sucks to maintainers

---
 pkgs/by-name/fo/fosrl-newt/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/fo/fosrl-newt/package.nix b/pkgs/by-name/fo/fosrl-newt/package.nix
index e9c58ca6cbac..5cce3cb1d2c8 100644
--- a/pkgs/by-name/fo/fosrl-newt/package.nix
+++ b/pkgs/by-name/fo/fosrl-newt/package.nix
@@ -42,6 +42,7 @@ buildGoModule rec {
       fab
       jackr
       sigmasquadron
+      water-sucks
     ];
     mainProgram = "newt";
   };