From 3ba43bda1d574f441500c2b4d89d00c5e61d5e86 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Fri, 10 Oct 2025 08:45:06 -0700
Subject: [PATCH] openssh: make the NixOS tests for openssh test the actual
 derivation being built

---
 pkgs/tools/networking/openssh/common.nix | 28 ++++++++++++++++--------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/networking/openssh/common.nix b/pkgs/tools/networking/openssh/common.nix
index ccf4964539cc..5b672b6d6b7a 100644
--- a/pkgs/tools/networking/openssh/common.nix
+++ b/pkgs/tools/networking/openssh/common.nix
@@ -235,15 +235,25 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru = {
     inherit withKerberos;
-    tests = {
-      borgbackup-integration = nixosTests.borgbackup;
-      nixosTest = nixosTests.openssh;
-      initrd-network-openssh = nixosTests.initrd-network-ssh;
-      openssh = finalAttrs.finalPackage.overrideAttrs (previousAttrs: {
-        pname = previousAttrs.pname + "-test";
-        doCheck = true;
-      });
-    };
+    tests =
+      let
+        withThisSsh =
+          test:
+          test.extendNixOS {
+            module = {
+              services.openssh.package = lib.mkForce finalAttrs.finalPackage;
+            };
+          };
+      in
+      {
+        borgbackup-integration = withThisSsh nixosTests.borgbackup;
+        nixosTest = withThisSsh nixosTests.openssh;
+        initrd-network-openssh = withThisSsh nixosTests.initrd-network-ssh;
+        openssh = finalAttrs.finalPackage.overrideAttrs (previousAttrs: {
+          pname = previousAttrs.pname + "-test";
+          doCheck = true;
+        });
+      };
   };
 
   meta = {