From de73ced34adb4a07a0640f592c164b7aada55875 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 18 Apr 2021 11:40:55 +0200 Subject: [PATCH] nix(feat): Change `memoryTests` shell argument to `memory` Avoids confusion with `memoryTest`. --- nix/README.md | 4 ++-- shell.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nix/README.md b/nix/README.md index 5399565ac..2e5812a5f 100644 --- a/nix/README.md +++ b/nix/README.md @@ -88,14 +88,14 @@ postgrest-test-io postgrest-with-postgresql-9.6 ``` -Some additional modules like `memoryTests`, `docker` and `release` +Some additional modules like `memory`, `docker` and `release` have large dependencies that would need to be built before the shell becomes available, which could take an especially long time if the cachix binary cache is not used. You can activate those by passing a flag to `nix-shell` with `nix-shell --arg true`. This will make the respective utilites available: ```bash -$ nix-shell --arg memoryTests true +$ nix-shell --arg memory true [nix-shell]$ postgrest- postgrest-build postgrest-test-spec postgrest-check postgrest-watch diff --git a/shell.nix b/shell.nix index d1b4a33f2..7c7dfe31a 100644 --- a/shell.nix +++ b/shell.nix @@ -9,7 +9,7 @@ # # We highly recommend that use the PostgREST binary cache by installing cachix # (https://app.cachix.org/) and running `cachix use postgrest`. -{ memoryTests ? false, docker ? false, release ? false }: +{ memory ? false, docker ? false, release ? false }: let postgrest = import ./default.nix; @@ -41,7 +41,7 @@ lib.overrideDerivation postgrest.env ( postgrest.nixpkgsUpgrade.bin ] ++ modules - ++ lib.optional memoryTests postgrest.memory + ++ lib.optional memory postgrest.memory ++ lib.optional docker postgrest.docker; shellHook = @@ -53,7 +53,7 @@ lib.overrideDerivation postgrest.env ( builtins.map (bashCompletion: "source ${bashCompletion}") ( builtins.concatLists (builtins.map (module: module.bashCompletion) modules) ++ [ postgrest.hsie.bashCompletion postgrest.nixpkgsUpgrade.bashCompletion ] - ++ lib.optional memoryTests postgrest.memory.bashCompletion + ++ lib.optional memory postgrest.memory.bashCompletion ++ lib.optional docker postgrest.docker.bashCompletion )