mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-12 20:55:31 +03:00
postgresqlPackages.pgjwt: make passthru.tests work with correct package
Same reasoning as commit before.
This commit is contained in:
parent
ecffab1fda
commit
0af934adf7
2 changed files with 45 additions and 30 deletions
|
@ -1,7 +1,16 @@
|
||||||
import ./make-test-python.nix ({ pkgs, lib, ...}:
|
{ system ? builtins.currentSystem
|
||||||
|
, config ? {}
|
||||||
|
, pkgs ? import ../.. { inherit system config; }
|
||||||
|
}:
|
||||||
|
|
||||||
with pkgs; {
|
with import ../lib/testing-python.nix { inherit system pkgs; };
|
||||||
name = "pgjwt";
|
|
||||||
|
let
|
||||||
|
inherit (pkgs) lib;
|
||||||
|
|
||||||
|
makePgjwtTest = postgresqlPackage:
|
||||||
|
makeTest {
|
||||||
|
name = "pgjwt-${postgresqlPackage.name}";
|
||||||
meta = with lib.maintainers; {
|
meta = with lib.maintainers; {
|
||||||
maintainers = [ spinus willibutz ];
|
maintainers = [ spinus willibutz ];
|
||||||
};
|
};
|
||||||
|
@ -11,6 +20,7 @@ with pkgs; {
|
||||||
{
|
{
|
||||||
services.postgresql = {
|
services.postgresql = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
package = postgresqlPackage;
|
||||||
extraPlugins = ps: with ps; [ pgjwt pgtap ];
|
extraPlugins = ps: with ps; [ pgjwt pgtap ];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -29,4 +39,9 @@ with pkgs; {
|
||||||
"${pkgs.sudo}/bin/sudo -u ${sqlSU} ${pgProve}/bin/pg_prove -d postgres -v -f ${pgjwt.src}/test.sql"
|
"${pkgs.sudo}/bin/sudo -u ${sqlSU} ${pgProve}/bin/pg_prove -d postgres -v -f ${pgjwt.src}/test.sql"
|
||||||
)
|
)
|
||||||
'';
|
'';
|
||||||
})
|
};
|
||||||
|
in
|
||||||
|
lib.concatMapAttrs (n: p: { ${n} = makePgjwtTest p; }) pkgs.postgresqlVersions
|
||||||
|
// {
|
||||||
|
passthru.override = p: makePgjwtTest p;
|
||||||
|
}
|
||||||
|
|
|
@ -19,8 +19,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
|
|
||||||
passthru.updateScript = unstableGitUpdater { };
|
passthru.updateScript = unstableGitUpdater { };
|
||||||
|
|
||||||
passthru.tests = {
|
passthru.tests = lib.recurseIntoAttrs {
|
||||||
inherit (nixosTests) pgjwt;
|
pgjwt = nixosTests.pgjwt.passthru.override postgresql;
|
||||||
|
|
||||||
extension = postgresqlTestExtension {
|
extension = postgresqlTestExtension {
|
||||||
inherit (finalAttrs) finalPackage;
|
inherit (finalAttrs) finalPackage;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue