From 2417141031a1499a379a9af1a6be93cb6d769b71 Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Mon, 15 Jun 2026 11:21:27 +0530
Subject: [PATCH] foks-server: convert to an alias

foks: add versionCheckHook

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
(cherry picked from commit f35179843a3afd5f535810a1970ba85d54b5444f)
---
 pkgs/by-name/fo/foks-server/package.nix | 24 -------------------
 pkgs/by-name/fo/foks/package.nix        | 32 ++++++++++++++++++-------
 pkgs/top-level/all-packages.nix         |  2 ++
 3 files changed, 26 insertions(+), 32 deletions(-)
 delete mode 100644 pkgs/by-name/fo/foks-server/package.nix

diff --git a/pkgs/by-name/fo/foks-server/package.nix b/pkgs/by-name/fo/foks-server/package.nix
deleted file mode 100644
index 2834f572ba2f..000000000000
--- a/pkgs/by-name/fo/foks-server/package.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  foks,
-}:
-foks.overrideAttrs (
-  finalAttrs: prevAttrs: {
-    pname = "${foks.pname}-server";
-    subPackages = [ "server/foks-server" ];
-
-    postPatch = ''
-      cd ./server/web/templates
-      templ generate
-      cd -
-    '';
-
-    postInstall = ''
-      ln -s $out/bin/{foks-server,git-remote-foks}
-    '';
-
-    nativeBuildInputs = (prevAttrs.nativeBuildInputs or [ ]) ++ [
-      foks.passthru.templ
-      foks
-    ];
-  }
-)
diff --git a/pkgs/by-name/fo/foks/package.nix b/pkgs/by-name/fo/foks/package.nix
index 321041e9e657..e0da01bc3184 100644
--- a/pkgs/by-name/fo/foks/package.nix
+++ b/pkgs/by-name/fo/foks/package.nix
@@ -2,17 +2,27 @@
   lib,
   stdenv,
   buildGoModule,
+  buildPackages,
   fetchFromGitHub,
+  versionCheckHook,
 
   pcsclite,
   pkg-config,
-  templ,
+  foks, # self
+
+  server ? false,
 }:
+let
+  client = !server;
+  pname = if server then "foks-server" else "foks";
+  subPackages = if server then [ "server/foks-server" ] else [ "client/foks" ];
+in
 buildGoModule (finalAttrs: {
-  pname = "foks";
+  inherit pname;
   version = "0.1.7";
 
   __structuredAttrs = true;
+  strictDeps = true;
 
   src = fetchFromGitHub {
     owner = "foks-proj";
@@ -25,24 +35,29 @@ buildGoModule (finalAttrs: {
 
   postPatch = ''
     cd ./server/web/templates
-    ${finalAttrs.passthru.templ}/bin/templ generate
+    templ generate
     cd -
   '';
 
-  subPackages = [ "client/foks" ];
+  inherit subPackages;
   excludedPackages = [ "server" ];
 
-  buildInputs = lib.optionals (stdenv.hostPlatform.isLinux) [ pcsclite ];
+  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pcsclite ];
   nativeBuildInputs = [
     pkg-config
+    finalAttrs.passthru.templ
   ];
 
-  postInstall = ''
+  postInstall = lib.optionalString client ''
     ln -s $out/bin/{foks,git-remote-foks}
   '';
 
+  doInstallCheck = true;
+  versionCheckProgramArg = "version";
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
   passthru = {
-    templ = templ.overrideAttrs (old: {
+    templ = buildPackages.templ.overrideAttrs (old: {
       pname = "templ-foks";
       version = "0.3.833";
       src = old.src.override {
@@ -50,6 +65,7 @@ buildGoModule (finalAttrs: {
       };
       vendorHash = "sha256-OPADot7Lkn9IBjFCfbrqs3es3F6QnWNjSOHxONjG4MM=";
     });
+    server = foks.override { server = true; };
   };
 
   meta = {
@@ -59,6 +75,6 @@ buildGoModule (finalAttrs: {
     changelog = "https://github.com/foks-proj/go-foks/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ poptart ];
-    mainProgram = "foks";
+    mainProgram = pname;
   };
 })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 99a323485426..5009f7d19a8f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9839,6 +9839,8 @@ with pkgs;
 
   rstudio-server = rstudio.override { server = true; };
 
+  foks-server = foks.server;
+
   inherit (callPackages ../applications/radio/rtl-sdr { })
     rtl-sdr-librtlsdr
     rtl-sdr-osmocom