From 65ef7381c8d7108291844bef144296176b3deede Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 1 Nov 2024 19:27:43 +0100
Subject: [PATCH] nixosTests.postgresql-jit: avoid manual imports

Same reasoning as commit before.
---
 nixos/tests/postgresql-jit.nix          | 15 +++++----------
 pkgs/servers/sql/postgresql/generic.nix |  6 +-----
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/nixos/tests/postgresql-jit.nix b/nixos/tests/postgresql-jit.nix
index f4b1d07a7faf..fb598972ba0f 100644
--- a/nixos/tests/postgresql-jit.nix
+++ b/nixos/tests/postgresql-jit.nix
@@ -1,20 +1,15 @@
 { system ? builtins.currentSystem
 , config ? {}
 , pkgs ? import ../.. { inherit system config; }
-, package ? null
 }:
 
 with import ../lib/testing-python.nix { inherit system pkgs; };
 
 let
   inherit (pkgs) lib;
-  packages = builtins.attrNames (import ../../pkgs/servers/sql/postgresql pkgs);
-
-  mkJitTestFromName = name:
-    mkJitTest pkgs.${name};
 
   mkJitTest = package: makeTest {
-    name = package.name;
+    name = "postgresql-jit-${package.name}";
     meta.maintainers = with lib.maintainers; [ ma27 ];
     nodes.machine = { pkgs, lib, ... }: {
       services.postgresql = {
@@ -49,7 +44,7 @@ let
     '';
   };
 in
-if package == null then
-  lib.genAttrs packages mkJitTestFromName
-else
-  mkJitTest package
+lib.concatMapAttrs (n: p: { ${n} = mkJitTest p; }) (lib.filterAttrs (n: _: lib.hasSuffix "_jit" n) pkgs.postgresqlVersions)
+// {
+  passthru.override = p: mkJitTest p;
+}
diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix
index 4a8daf3514cf..548fcd561e73 100644
--- a/pkgs/servers/sql/postgresql/generic.nix
+++ b/pkgs/servers/sql/postgresql/generic.nix
@@ -315,11 +315,7 @@ let
         postgresql-wal-receiver = nixosTests.postgresql-wal-receiver.passthru.override finalAttrs.finalPackage;
         pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
       } // lib.optionalAttrs jitSupport {
-        postgresql-jit = import ../../../../nixos/tests/postgresql-jit.nix {
-          inherit (stdenv) system;
-          pkgs = self;
-          package = this;
-        };
+        postgresql-jit = nixosTests.postgresql-jit.passthru.override finalAttrs.finalPackage;
       };
     };