From 3458462336398a2ddc13b208eb8998d9ef999da3 Mon Sep 17 00:00:00 2001
From: jaredmontoya <49511278+jaredmontoya@users.noreply.github.com>
Date: Sat, 10 Jan 2026 22:09:23 +0100
Subject: [PATCH 1/3] wg-access-server: use finalAttrs

---
 pkgs/by-name/wg/wg-access-server/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/wg/wg-access-server/package.nix b/pkgs/by-name/wg/wg-access-server/package.nix
index ff3160091133..4c915fd9f310 100644
--- a/pkgs/by-name/wg/wg-access-server/package.nix
+++ b/pkgs/by-name/wg/wg-access-server/package.nix
@@ -8,14 +8,14 @@
   nixosTests,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "wg-access-server";
   version = "0.12.1";
 
   src = fetchFromGitHub {
     owner = "freifunkMUC";
     repo = "wg-access-server";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-AhFqEmHrx9MCdjnB/YA3qU7KsaMyLO+vo53VWUrcL8I=";
   };
 
@@ -34,12 +34,12 @@ buildGoModule rec {
   checkFlags = [ "-skip=TestDNSProxy_ServeDNS" ];
 
   ui = buildNpmPackage {
-    inherit version src;
+    inherit (finalAttrs) version src;
     pname = "wg-access-server-ui";
 
     npmDepsHash = "sha256-04AkSDSKsr20Jbx5BJy36f8kWNlzzplu/xnoDTkU8OQ=";
 
-    sourceRoot = "${src.name}/website";
+    sourceRoot = "${finalAttrs.src.name}/website";
 
     installPhase = ''
       mv build $out
@@ -48,11 +48,11 @@ buildGoModule rec {
 
   postPatch = ''
     substituteInPlace internal/services/website_router.go \
-        --replace-fail 'website/build' "${ui}"
+        --replace-fail 'website/build' "${finalAttrs.ui}"
   '';
 
   preBuild = ''
-    VERSION=v${version} go generate buildinfo/buildinfo.go
+    VERSION=v${finalAttrs.version} go generate buildinfo/buildinfo.go
   '';
 
   postInstall = ''
@@ -72,4 +72,4 @@ buildGoModule rec {
     maintainers = with lib.maintainers; [ xanderio ];
     mainProgram = "wg-access-server";
   };
-}
+})

From 4bd9c5cc52805643c46ad997e023eb2f8ac75230 Mon Sep 17 00:00:00 2001
From: jaredmontoya <49511278+jaredmontoya@users.noreply.github.com>
Date: Sat, 10 Jan 2026 22:13:22 +0100
Subject: [PATCH 2/3] wg-access-server: pin nodejs_22

---
 pkgs/by-name/wg/wg-access-server/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/wg/wg-access-server/package.nix b/pkgs/by-name/wg/wg-access-server/package.nix
index 4c915fd9f310..0a0dc6bac438 100644
--- a/pkgs/by-name/wg/wg-access-server/package.nix
+++ b/pkgs/by-name/wg/wg-access-server/package.nix
@@ -6,6 +6,7 @@
   makeWrapper,
   iptables,
   nixosTests,
+  nodejs_22,
 }:
 
 buildGoModule (finalAttrs: {
@@ -37,6 +38,8 @@ buildGoModule (finalAttrs: {
     inherit (finalAttrs) version src;
     pname = "wg-access-server-ui";
 
+    nodejs = nodejs_22;
+
     npmDepsHash = "sha256-04AkSDSKsr20Jbx5BJy36f8kWNlzzplu/xnoDTkU8OQ=";
 
     sourceRoot = "${finalAttrs.src.name}/website";

From 3bf597c14d1171cde46508940b85fa1e9d606f80 Mon Sep 17 00:00:00 2001
From: jaredmontoya <49511278+jaredmontoya@users.noreply.github.com>
Date: Sat, 10 Jan 2026 22:26:45 +0100
Subject: [PATCH 3/3] wg-access-server: 0.12.1 -> 0.13.1

---
 pkgs/by-name/wg/wg-access-server/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/wg/wg-access-server/package.nix b/pkgs/by-name/wg/wg-access-server/package.nix
index 0a0dc6bac438..387e84735ec3 100644
--- a/pkgs/by-name/wg/wg-access-server/package.nix
+++ b/pkgs/by-name/wg/wg-access-server/package.nix
@@ -11,17 +11,17 @@
 
 buildGoModule (finalAttrs: {
   pname = "wg-access-server";
-  version = "0.12.1";
+  version = "0.13.1";
 
   src = fetchFromGitHub {
     owner = "freifunkMUC";
     repo = "wg-access-server";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-AhFqEmHrx9MCdjnB/YA3qU7KsaMyLO+vo53VWUrcL8I=";
+    hash = "sha256-x4QNEn5SR6D1YIiv+mKnQlZ94jZ7BrdIxiLxBqhtBjg=";
   };
 
   proxyVendor = true; # darwin/linux hash mismatch
-  vendorHash = "sha256-YwFq0KxUctU3ElZBo/b68pyp4lJnFGL9ClKIwUzdngM=";
+  vendorHash = "sha256-pjQeF1+1gr/0pF76KNdK7GDX3pYBTqqY3xbJeMLsJIM=";
 
   env.CGO_ENABLED = 1;
 
@@ -40,7 +40,7 @@ buildGoModule (finalAttrs: {
 
     nodejs = nodejs_22;
 
-    npmDepsHash = "sha256-04AkSDSKsr20Jbx5BJy36f8kWNlzzplu/xnoDTkU8OQ=";
+    npmDepsHash = "sha256-UntV5+9E2lyp8IQGKbbnBNdd0JLvM5NsfkLvCSOgyGo=";
 
     sourceRoot = "${finalAttrs.src.name}/website";