From 975c94eca21ccd991d221c6752188486309d15a4 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Wed, 14 Jan 2026 15:07:08 +0100
Subject: [PATCH] radicle-node: refactor package tests

---
 pkgs/by-name/ra/radicle-node/package.nix | 74 +++++++++---------------
 1 file changed, 26 insertions(+), 48 deletions(-)

diff --git a/pkgs/by-name/ra/radicle-node/package.nix b/pkgs/by-name/ra/radicle-node/package.nix
index d1e984a74701..374c3af02edc 100644
--- a/pkgs/by-name/ra/radicle-node/package.nix
+++ b/pkgs/by-name/ra/radicle-node/package.nix
@@ -7,14 +7,11 @@
   lib,
   makeBinaryWrapper,
   man-db,
-  nixos,
   nixosTests,
   openssh,
-  radicle-node,
   runCommand,
   rustPlatform,
   stdenv,
-  testers,
   xdg-utils,
   versionCheckHook,
 }:
@@ -110,53 +107,34 @@ rustPlatform.buildRustPackage (finalAttrs: {
   '';
 
   passthru.updateScript = ./update.sh;
-  passthru.tests =
-    let
-      package = radicle-node;
-    in
-    {
-      basic =
-        runCommand "${package.name}-basic-test"
-          {
-            nativeBuildInputs = [
-              jq
-              openssh
-              radicle-node
-            ];
-          }
-          ''
-            set -e
-            export RAD_HOME="$PWD/.radicle"
-            mkdir -p "$RAD_HOME/keys"
-            ssh-keygen -t ed25519 -N "" -f "$RAD_HOME/keys/radicle" > /dev/null
-            jq -n '.node.alias |= "nix"' > "$RAD_HOME/config.json"
+  passthru.tests = {
+    basic =
+      runCommand "radicle-node-basic-test"
+        {
+          nativeBuildInputs = [
+            jq
+            openssh
+            finalAttrs.finalPackage
+          ];
+        }
+        ''
+          set -e
+          export RAD_HOME="$PWD/.radicle"
+          mkdir -p "$RAD_HOME/keys"
+          ssh-keygen -t ed25519 -N "" -f "$RAD_HOME/keys/radicle" > /dev/null
+          jq -n '.node.alias |= "nix"' > "$RAD_HOME/config.json"
 
-            rad config > /dev/null
-            rad debug | jq -e '
-                (.sshVersion | contains("${openssh.version}"))
-              and
-                (.gitVersion | contains("${gitMinimal.version}"))
-            '
+          rad config > /dev/null
+          rad debug | jq -e '
+              (.sshVersion | contains("${openssh.version}"))
+            and
+              (.gitVersion | contains("${gitMinimal.version}"))
+          '
 
-            touch $out
-          '';
-      nixos-build = lib.recurseIntoAttrs {
-        checkConfig-success =
-          (nixos {
-            services.radicle.settings = {
-              node.alias = "foo";
-            };
-          }).config.services.radicle.configFile;
-        checkConfig-failure =
-          testers.testBuildFailure
-            (nixos {
-              services.radicle.settings = {
-                node.alias = null;
-              };
-            }).config.services.radicle.configFile;
-      };
-      nixos-run = nixosTests.radicle;
-    };
+          touch $out
+        '';
+    nixos-run = nixosTests.radicle;
+  };
 
   meta = {
     description = "Radicle node and CLI for decentralized code collaboration";