From cf7ece2830e068ef642c50524bbad0cef4766c70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Tue, 27 May 2025 16:25:46 +0200
Subject: [PATCH] {,nixos/}pocket-id: make pocket-id-backend subpackage the
 main package

---
 nixos/modules/services/security/pocket-id.nix |  6 +--
 nixos/tests/pocket-id.nix                     |  2 +-
 pkgs/by-name/po/pocket-id/package.nix         | 38 +++++--------------
 3 files changed, 14 insertions(+), 32 deletions(-)

diff --git a/nixos/modules/services/security/pocket-id.nix b/nixos/modules/services/security/pocket-id.nix
index a551fffce9c0..c98c7e47023b 100644
--- a/nixos/modules/services/security/pocket-id.nix
+++ b/nixos/modules/services/security/pocket-id.nix
@@ -134,8 +134,8 @@ in
     ];
 
     systemd.services = {
-      pocket-id-backend = {
-        description = "Pocket ID backend";
+      pocket-id = {
+        description = "Pocket ID";
         after = [ "network.target" ];
         wantedBy = [ "multi-user.target" ];
         restartTriggers = [
@@ -149,7 +149,7 @@ in
           User = cfg.user;
           Group = cfg.group;
           WorkingDirectory = cfg.dataDir;
-          ExecStart = "${cfg.package}/bin/pocket-id-backend";
+          ExecStart = "${cfg.package}/bin/pocket-id";
           Restart = "always";
           EnvironmentFile = [
             cfg.environmentFile
diff --git a/nixos/tests/pocket-id.nix b/nixos/tests/pocket-id.nix
index 4b835c32caa9..c00ed1f497a6 100644
--- a/nixos/tests/pocket-id.nix
+++ b/nixos/tests/pocket-id.nix
@@ -27,7 +27,7 @@
       inherit (builtins) toString;
     in
     ''
-      machine.wait_for_unit("pocket-id-backend.service")
+      machine.wait_for_unit("pocket-id.service")
       machine.wait_for_open_port(${toString settings.PORT})
 
       backend_status = machine.succeed("curl -L -o /tmp/backend-output -w '%{http_code}' http://localhost:${toString settings.PORT}/api/users/me")
diff --git a/pkgs/by-name/po/pocket-id/package.nix b/pkgs/by-name/po/pocket-id/package.nix
index dcbca10bcad0..b951fdcee1be 100644
--- a/pkgs/by-name/po/pocket-id/package.nix
+++ b/pkgs/by-name/po/pocket-id/package.nix
@@ -3,12 +3,11 @@
   fetchFromGitHub,
   buildGoModule,
   buildNpmPackage,
-  stdenvNoCC,
   nixosTests,
   nix-update-script,
 }:
 
-stdenvNoCC.mkDerivation (finalAttrs: {
+buildGoModule (finalAttrs: {
   pname = "pocket-id";
   version = "1.0.0";
 
@@ -19,22 +18,17 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     hash = "sha256-cHPG4KZgfLuEDzLJ9dV4PRUlqWjd7Ji3480lrFwK6Ds=";
   };
 
-  backend = buildGoModule {
-    pname = "pocket-id-backend";
-    inherit (finalAttrs) version src;
+  sourceRoot = "${finalAttrs.src.name}/backend";
 
-    sourceRoot = "${finalAttrs.src.name}/backend";
+  vendorHash = "sha256-82kdx9ihJgqMCiUjZTONGa1nCZoxKltw8mpF0KoOdT8=";
 
-    vendorHash = "sha256-82kdx9ihJgqMCiUjZTONGa1nCZoxKltw8mpF0KoOdT8=";
+  preBuild = ''
+    cp -r ${finalAttrs.frontend}/lib/pocket-id-frontend/dist frontend/dist
+  '';
 
-    preBuild = ''
-      cp -r ${finalAttrs.frontend}/lib/pocket-id-frontend/dist frontend/dist
-    '';
-
-    preFixup = ''
-      mv $out/bin/cmd $out/bin/pocket-id-backend
-    '';
-  };
+  preFixup = ''
+    mv $out/bin/cmd $out/bin/pocket-id
+  '';
 
   frontend = buildNpmPackage {
     pname = "pocket-id-frontend";
@@ -57,25 +51,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     '';
   };
 
-  dontUnpack = true;
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/bin
-    ln -s ${finalAttrs.backend}/bin/pocket-id-backend $out/bin/pocket-id-backend
-
-    runHook postInstall
-  '';
-
   passthru = {
     tests = {
       inherit (nixosTests) pocket-id;
     };
     updateScript = nix-update-script {
       extraArgs = [
-        "--subpackage"
-        "backend"
         "--subpackage"
         "frontend"
       ];
@@ -87,6 +68,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     homepage = "https://pocket-id.org";
     changelog = "https://github.com/pocket-id/pocket-id/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.bsd2;
+    mainProgram = "pocket-id";
     maintainers = with lib.maintainers; [
       gepbird
       marcusramberg