Unverified Commit 259b4ff9 authored by Wolfgang Walther's avatar Wolfgang Walther
Browse files

postgresql: split postgresqlTestExtension into separate file

parent 72b8186f

pkgs/servers/sql/postgresql/generic.nix

+1 −27
Original line number Diff line number Diff line
@@ -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

0 → 100644
+32 −0
Original line number Diff line number Diff line 
{

  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

)