From 1c02cdae7b1556b74e23f70d4c344d59f0fcf09c Mon Sep 17 00:00:00 2001
From: Edgar Pireyn <edgar@pireyn.be>
Date: Sun, 3 May 2026 15:03:31 +0200
Subject: [PATCH 1/2] frp: 0.66.0 -> 0.69.1

This update refactors the packaging of the dashboard (now compiled
using npm). It is therefore built in the dashboard.nix file and
used in the package's preBuild phase.
---
 pkgs/by-name/fr/frp/dashboard.nix | 34 +++++++++++++++++++++++++++++++
 pkgs/by-name/fr/frp/package.nix   | 22 +++++++++++++-------
 2 files changed, 49 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/by-name/fr/frp/dashboard.nix

diff --git a/pkgs/by-name/fr/frp/dashboard.nix b/pkgs/by-name/fr/frp/dashboard.nix
new file mode 100644
index 000000000000..facbdd467ea7
--- /dev/null
+++ b/pkgs/by-name/fr/frp/dashboard.nix
@@ -0,0 +1,34 @@
+{
+  buildNpmPackage,
+  frp,
+}:
+let
+  builder =
+    name:
+    buildNpmPackage {
+      pname = "${name}-dashboard";
+      inherit (frp) version src;
+
+      sourceRoot = "source/web";
+
+      preBuild = ''
+        pushd ${name}
+      '';
+
+      installPhase = ''
+        runHook preInstall
+        cp -r dist $out
+        runHook postInstall
+      '';
+
+      npmDepsHash = "sha256-XuqQPfywzK81anAD1pAl1TMQqb1+hH2QxLwuTn7zCPU=";
+
+      meta = frp.meta // {
+        description = "Dashboard for frp";
+      };
+    };
+in
+{
+  frpc = builder "frpc";
+  frps = builder "frps";
+}
diff --git a/pkgs/by-name/fr/frp/package.nix b/pkgs/by-name/fr/frp/package.nix
index a5e1ddbfb695..7766e6ce5ca6 100644
--- a/pkgs/by-name/fr/frp/package.nix
+++ b/pkgs/by-name/fr/frp/package.nix
@@ -1,22 +1,24 @@
 {
   buildGoModule,
+  callPackage,
   lib,
   fetchFromGitHub,
   nixosTests,
 }:
-
+let
+  web = callPackage ./dashboard.nix { };
+in
 buildGoModule (finalAttrs: {
   pname = "frp";
-  version = "0.66.0";
-
+  version = "0.69.1";
   src = fetchFromGitHub {
     owner = "fatedier";
     repo = "frp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-GFvXdhX7kA43kppWWdL7KhummUCqpa1cQ7V2d9ISGfo=";
+    hash = "sha256-3tOOgnzZZ05En5NMLbp4UFNazX950Jbosvszmjf947c=";
   };
 
-  vendorHash = "sha256-m5ECF0cgp2LfsTKey02MHz5TfqfzOCT5cU5trUfrOjY=";
+  vendorHash = "sha256-JrkIztnmhEYAogr4pDWrPu9/j+C0VLpEyNbh2UK5UcY=";
 
   doCheck = false;
 
@@ -25,8 +27,14 @@ buildGoModule (finalAttrs: {
     "cmd/frps"
   ];
 
-  passthru.tests = {
-    frp = nixosTests.frp;
+  preBuild = ''
+    cp -r ${web.frpc} web/frpc/dist
+    cp -r ${web.frps} web/frps/dist
+  '';
+
+  passthru = {
+    tests.frp = nixosTests.frp;
+    inherit web;
   };
 
   meta = {

From d8123742614a8a56dfe2d7cca4af27e190a9ab8a Mon Sep 17 00:00:00 2001
From: Edgar Pireyn <edgar@pireyn.be>
Date: Sat, 13 Jun 2026 22:56:31 +0200
Subject: [PATCH 2/2] frp: add self as maintainer

---
 pkgs/by-name/fr/frp/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/fr/frp/package.nix b/pkgs/by-name/fr/frp/package.nix
index 7766e6ce5ca6..25b5cde69a00 100644
--- a/pkgs/by-name/fr/frp/package.nix
+++ b/pkgs/by-name/fr/frp/package.nix
@@ -47,5 +47,6 @@ buildGoModule (finalAttrs: {
     '';
     homepage = "https://github.com/fatedier/frp";
     license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ epireyn ];
   };
 })