postgresql: reduce duplicated postgresqlWithPackages (#509714)
This commit is contained in:
@@ -651,6 +651,14 @@ let
|
||||
f:
|
||||
let
|
||||
installedExtensions = f postgresql.pkgs;
|
||||
recurse = postgresqlWithPackages {
|
||||
inherit
|
||||
buildEnv
|
||||
lib
|
||||
makeBinaryWrapper
|
||||
postgresql
|
||||
;
|
||||
};
|
||||
finalPackage = buildEnv {
|
||||
pname = "${postgresql.pname}-and-plugins";
|
||||
inherit (postgresql) version;
|
||||
@@ -692,33 +700,10 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
withJIT = postgresqlWithPackages {
|
||||
inherit
|
||||
buildEnv
|
||||
lib
|
||||
makeBinaryWrapper
|
||||
postgresql
|
||||
;
|
||||
} (_: installedExtensions ++ [ postgresql.jit ]);
|
||||
withoutJIT = postgresqlWithPackages {
|
||||
inherit
|
||||
buildEnv
|
||||
lib
|
||||
makeBinaryWrapper
|
||||
postgresql
|
||||
;
|
||||
} (_: lib.remove postgresql.jit installedExtensions);
|
||||
withJIT = recurse (_: installedExtensions ++ [ postgresql.jit ]);
|
||||
withoutJIT = recurse (_: lib.remove postgresql.jit installedExtensions);
|
||||
|
||||
withPackages =
|
||||
f':
|
||||
postgresqlWithPackages {
|
||||
inherit
|
||||
buildEnv
|
||||
lib
|
||||
makeBinaryWrapper
|
||||
postgresql
|
||||
;
|
||||
} (ps: installedExtensions ++ f' ps);
|
||||
withPackages = f': recurse (ps: installedExtensions ++ f' ps);
|
||||
};
|
||||
};
|
||||
in
|
||||
|
||||
Reference in New Issue
Block a user