From 863fd89f038f1fcdbb5b4027c5daf04825cdf544 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Mon, 8 Dec 2025 11:39:30 +0100
Subject: [PATCH 1/2] release.nix: remove pkgs-lib-tests

this is already included as `tests.pkgs-lib`
---
 pkgs/top-level/release.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index db6955850668..6e70d80c7cac 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -112,7 +112,6 @@ let
     manual = pkgs.nixpkgs-manual.override { inherit nixpkgs; };
     metrics = import ./metrics.nix { inherit pkgs nixpkgs; };
     lib-tests = import ../../lib/tests/release.nix { inherit pkgs; };
-    pkgs-lib-tests = import ../pkgs-lib/tests { inherit pkgs; };
 
     darwin-tested =
       if supportDarwin.x86_64 || supportDarwin.aarch64 then

From 6a11d4a70b8e415d0f1387963040f62574106076 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Mon, 8 Dec 2025 11:51:16 +0100
Subject: [PATCH 2/2] tests.pkgs-lib: expose the tests included in it

---
 pkgs/pkgs-lib/tests/default.nix | 14 ++++++++------
 pkgs/test/default.nix           |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/pkgs-lib/tests/default.nix b/pkgs/pkgs-lib/tests/default.nix
index d7957a589c90..5b8bc99e992d 100644
--- a/pkgs/pkgs-lib/tests/default.nix
+++ b/pkgs/pkgs-lib/tests/default.nix
@@ -51,10 +51,12 @@ let
 in
 
 # It has to be a link farm for inclusion in the hydra unstable jobset.
-pkgs.linkFarm "pkgs-lib-formats-tests" (
-  mapAttrsToList (k: v: {
-    name = k;
-    path = v;
-  }) (flatten "" structured)
-)
+{
+  formats-tests = pkgs.linkFarm "pkgs-lib-formats-tests" (
+    mapAttrsToList (k: v: {
+      name = k;
+      path = v;
+    }) (flatten "" structured)
+  );
+}
 // structured
diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix
index 8864de64dc76..4c613135e977 100644
--- a/pkgs/test/default.nix
+++ b/pkgs/test/default.nix
@@ -219,7 +219,7 @@ in
     };
   };
 
-  pkgs-lib = recurseIntoAttrs (import ../pkgs-lib/tests { inherit pkgs; });
+  pkgs-lib = recurseIntoAttrs (callPackage ../pkgs-lib/tests { });
 
   buildFHSEnv = recurseIntoAttrs (callPackages ./buildFHSEnv { });