postgresql.withPackages: support withJIT and withoutJIT

This allows using postgresql.withPackages in the nixos module, which
calls withJIT and without JIT.

Supersedes NixOS#351968

Author: wolfgangwalther

pkgs/servers/sql/postgresql/generic.nix

@@ -228,8 +228,7 @@ let
       withPackages = postgresqlWithPackages {
                        inherit makeWrapper buildEnv;
                        postgresql = this;
-                     }
-                     this.pkgs;
+                     };
 
       tests = {
         postgresql-wal-receiver = import ../../../../nixos/tests/postgresql-wal-receiver.nix {
@@ -272,9 +271,9 @@ let
     };
   });
 
-  postgresqlWithPackages = { postgresql, makeWrapper, buildEnv }: pkgs: f: buildEnv {
-    name = "postgresql-and-plugins-${postgresql.version}";
-    paths = f pkgs ++ [
+  postgresqlWithPackages = { postgresql, makeWrapper, buildEnv }: f: buildEnv {
+    name = "${postgresql.pname}-and-plugins-${postgresql.version}";
+    paths = f postgresql.pkgs ++ [
         postgresql
         postgresql.lib
         postgresql.man   # in case user installs this into environment
@@ -299,6 +298,14 @@ let
 
     passthru.version = postgresql.version;
     passthru.psqlSchema = postgresql.psqlSchema;
+    passthru.withJIT = postgresqlWithPackages {
+      inherit buildEnv makeWrapper;
+      postgresql = postgresql.withJIT;
+    } f;
+    passthru.withoutJIT = postgresqlWithPackages {
+      inherit buildEnv makeWrapper;
+      postgresql = postgresql.withoutJIT;
+    } f;
   };
 
 in