From a6b7db4f2f64c28f1a86828ac41771bcebc3f15e Mon Sep 17 00:00:00 2001 From: steve-chavez Date: Wed, 28 Feb 2024 15:09:18 -0500 Subject: [PATCH] feedback --- default.nix | 2 +- nix/tools/cabalTools.nix | 2 +- nix/tools/memory.nix | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/default.nix b/default.nix index 32f9f992ba..48903f3fc0 100644 --- a/default.nix +++ b/default.nix @@ -134,7 +134,7 @@ rec { # Script for running memory tests. memory = - pkgs.callPackage nix/tools/memory.nix { inherit postgrestProfiled postgrest withTools; }; + pkgs.callPackage nix/tools/memory.nix { inherit postgrestProfiled withTools; }; # Utility for updating the pinned version of Nixpkgs. nixpkgsTools = diff --git a/nix/tools/cabalTools.nix b/nix/tools/cabalTools.nix index decef9ab17..0174d7fa3c 100644 --- a/nix/tools/cabalTools.nix +++ b/nix/tools/cabalTools.nix @@ -42,7 +42,7 @@ let [ "ARG_USE_ENV([PGRST_DB_ANON_ROLE], [postgrest_test_anonymous], [PostgREST anonymous role])" "ARG_USE_ENV([PGRST_DB_POOL], [1], [PostgREST pool size])" - "ARG_USE_ENV([PGRST_DB_POOL_ACQUISITION_TIMEOUT], [1], [PostgREST pool size])" + "ARG_USE_ENV([PGRST_DB_POOL_ACQUISITION_TIMEOUT], [1], [PostgREST pool timeout])" "ARG_LEFTOVERS([PostgREST arguments])" ]; workingDir = "/"; diff --git a/nix/tools/memory.nix b/nix/tools/memory.nix index 1c00d04817..0c7f731c94 100644 --- a/nix/tools/memory.nix +++ b/nix/tools/memory.nix @@ -5,7 +5,6 @@ , checkedShellScript , curl , postgrestProfiled -, postgrest , withTools }: let @@ -30,12 +29,11 @@ let [ "ARG_USE_ENV([PGRST_DB_ANON_ROLE], [postgrest_test_anonymous], [PostgREST anonymous role])" "ARG_USE_ENV([PGRST_DB_POOL], [1], [PostgREST pool size])" - "ARG_USE_ENV([PGRST_DB_POOL_ACQUISITION_TIMEOUT], [1], [PostgREST pool size])" + "ARG_USE_ENV([PGRST_DB_POOL_ACQUISITION_TIMEOUT], [1], [PostgREST pool timeout])" "ARG_LEFTOVERS([PostgREST arguments])" ]; workingDir = "/"; withPath = [ postgrestProfiled ]; - withEnv = postgrest.env; } '' export PGRST_DB_ANON_ROLE