Unverified Commit 0af934ad authored by Wolfgang Walther's avatar Wolfgang Walther
Browse files

postgresqlPackages.pgjwt: make passthru.tests work with correct package 

Same reasoning as commit before.
parent ecffab1f

nixos/tests/pgjwt.nix

+43 −28
Original line number Diff line number Diff line 
import ./make-test-python.nix ({ pkgs, lib, ...}:

{ system ? builtins.currentSystem

, config ? {}

, pkgs ? import ../.. { inherit system config; }

}:



with pkgs; {

  name = "pgjwt";

with import ../lib/testing-python.nix { inherit system pkgs; };



let

  inherit (pkgs) lib;



  makePgjwtTest = postgresqlPackage:

    makeTest {

      name = "pgjwt-${postgresqlPackage.name}";

      meta = with lib.maintainers; {

        maintainers = [ spinus willibutz ];

      };
@@ -11,6 +20,7 @@ with pkgs; { 
        {

          services.postgresql = {

            enable = true;

            package = postgresqlPackage;

            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"

        )

      '';

})
 
    };

in

lib.concatMapAttrs (n: p: { ${n} = makePgjwtTest p; }) pkgs.postgresqlVersions

// {

  passthru.override = p: makePgjwtTest p;

}

pkgs/servers/sql/postgresql/ext/pgjwt.nix

+2 −2
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ stdenv.mkDerivation (finalAttrs: { 


  passthru.updateScript = unstableGitUpdater { };



  passthru.tests = {

    inherit (nixosTests) pgjwt;

  passthru.tests = lib.recurseIntoAttrs {

    pgjwt = nixosTests.pgjwt.passthru.override postgresql;



    extension = postgresqlTestExtension {

      inherit (finalAttrs) finalPackage;