gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

postgresql: split postgresqlTestExtension into separate file

Browse Source
This commit is contained in:
Wolfgang Walther
2025-03-18 18:17:25 +01:00
parent 72b8186ff7
commit 259b4ff913
2 changed files with 33 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/sql/postgresql/generic.nix
+1 -27
View File
@@ -425,33 +425,7 @@ let
inherit (llvmPackages) llvm;
postgresql = this;
stdenv = stdenv';
postgresqlTestExtension =
{
finalPackage,
withPackages ? [ ],
...
}@extraArgs:
stdenvNoCC.mkDerivation (
{
name = "${finalPackage.name}-test-extension";
dontUnpack = true;
doCheck = true;
nativeCheckInputs = [
postgresqlTestHook
(this.withPackages (ps: [ finalPackage ] ++ (map (p: ps."${p}") withPackages)))
];
failureHook = "postgresqlStop";
postgresqlTestUserOptions = "LOGIN SUPERUSER";
passAsFile = [ "sql" ];
checkPhase = ''
runHook preCheck
psql -a -v ON_ERROR_STOP=1 -f "$sqlPath"
runHook postCheck
'';
installPhase = "touch $out";
}
// extraArgs
);
postgresqlTestExtension = newSuper.callPackage ./postgresqlTestExtension.nix { };
postgresqlBuildExtension = newSuper.callPackage ./postgresqlBuildExtension.nix { };
};
newSelf = self // scope;
pkgs/servers/sql/postgresql/postgresqlTestExtension.nix
+32
View File
@@ -0,0 +1,32 @@
{
postgresql,
postgresqlTestHook,
stdenvNoCC,
}:
{
finalPackage,
withPackages ? [ ],
...
}@extraArgs:
stdenvNoCC.mkDerivation (
{
name = "${finalPackage.name}-test-extension";
dontUnpack = true;
doCheck = true;
nativeCheckInputs = [
postgresqlTestHook
(postgresql.withPackages (ps: [ finalPackage ] ++ (map (p: ps."${p}") withPackages)))
];
failureHook = "postgresqlStop";
postgresqlTestUserOptions = "LOGIN SUPERUSER";
passAsFile = [ "sql" ];
checkPhase = ''
runHook preCheck
psql -a -v ON_ERROR_STOP=1 -f "$sqlPath"
runHook postCheck
'';
installPhase = "touch $out";
}
// extraArgs
)