nix: move withtmpdb to separate file

Co-authored-by: Remo Rechkemmer <59358383+monacoremo@users.noreply.github.com>
This commit is contained in:
Wolfgang Walther
2021-04-12 19:03:16 +02:00
committed by Wolfgang Walther
co-authored by Remo Rechkemmer
parent f99fd6cbad
commit 579a626de2
3 changed files with 25 additions and 21 deletions
+4 -1
View File
@@ -112,10 +112,13 @@ rec {
nixpkgsUpgrade =
pkgs.callPackage nix/nixpkgs-upgrade.nix { };
withTmpDb =
pkgs.callPackage nix/withtmpdb.nix { };
# Scripts for running tests.
tests =
pkgs.callPackage nix/tests.nix {
inherit postgrest postgrestProfiled postgresqlVersions devCabalOptions;
inherit postgrest postgrestProfiled postgresqlVersions devCabalOptions withTmpDb;
ghc = pkgs.haskell.compiler."${compiler}";
hpc-codecov = pkgs.haskell.packages."${compiler}".hpc-codecov;
};
+1 -20
View File
@@ -17,29 +17,10 @@
, postgrestProfiled
, python3
, runtimeShell
, withTmpDb
, yq
}:
let
# Wrap the `test/with_tmp_db` script with the required dependencies from Nix.
withTmpDb =
postgresql:
checkedShellScript
{
name = "postgrest-test-withtmpdb-${postgresql.name}";
docs = "Run the given command in a temporary database";
inRootDir = true;
}
''
# avoid starting multiple layers of with_tmp_db
if test ! -v PGRST_DB_URI; then
export PATH=${postgresql}/bin:"$PATH"
exec test/with_tmp_db "$@"
else
"$@"
fi
'';
# Create a `withPostgresql` for each PostgreSQL version that we want to test
# against.
withPostgresqlVersions =
+20
View File
@@ -0,0 +1,20 @@
# Wrap the `test/with_tmp_db` script with the required dependencies from Nix.
{ checkedShellScript }:
postgresql:
checkedShellScript
{
name = "postgrest-test-withtmpdb-${postgresql.name}";
docs = "Run the given command in a temporary database";
inRootDir = true;
}
''
# avoid starting multiple layers of with_tmp_db
if test ! -v PGRST_DB_URI; then
export PATH=${postgresql}/bin:"$PATH"
exec test/with_tmp_db "$@"
else
"$@"
fi
''