Unverified Commit 6d7da20a authored by Wolfgang Walther's avatar Wolfgang Walther
Browse files

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

Same reasoning as commit before.
parent a5c41ae8
Loading
Loading
Loading
Loading
+43 −28
Original line number Diff line number Diff line
import ./make-test-python.nix ({ pkgs, lib, ...} : {
  name = "tsja";
{ system ? builtins.currentSystem
, config ? {}
, pkgs ? import ../.. { inherit system config; }
}:

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

let
  makeTsjaTest = postgresqlPackage:
    makeTest {
      name = "tsja-${postgresqlPackage.name}";
      meta = {
        maintainers = with lib.maintainers; [ chayleaf ];
      };
@@ -11,6 +20,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
          {
            services.postgresql = {
              enable = true;
              package = postgresqlPackage;
              extraPlugins = ps: with ps; [
                tsja
              ];
@@ -29,4 +39,9 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
              | grep "{日本語}"
        """)
      '';
})
    };
in
pkgs.lib.concatMapAttrs (n: p: { ${n} = makeTsjaTest p; }) pkgs.postgresqlVersions
// {
  passthru.override = p: makeTsjaTest p;
}
+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
    mv dbinit_libtsja.txt $out/share/postgresql/extension/libtsja_dbinit.sql
  '';

  passthru.tests.tsja = nixosTests.tsja;
  passthru.tests = nixosTests.tsja.passthru.override postgresql;

  meta = with lib; {
    description = "PostgreSQL extension implementing Japanese text search";