From f1b5c2c59345a125ea71b1fcd0e4e74a115ba786 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 23 Dec 2024 10:45:55 +0100 Subject: [PATCH] lib/tests: remove deprecated dontRun --- lib/tests.nix | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/lib/tests.nix b/lib/tests.nix index e77e43d2..23637505 100644 --- a/lib/tests.nix +++ b/lib/tests.nix @@ -13,22 +13,14 @@ let { name, nvim, - # TODO: Deprecated 2024-08-20, remove after 24.11 - dontRun ? false, ... - }@args: + }: let # FIXME: this doesn't support helpers.enableExceptInTests, a context option would be better result = nvim.extend { - config.test = - { - inherit name; - } - // lib.optionalAttrs (args ? dontRun) ( - lib.warn - "mkTestDerivationFromNvim: the `dontRun` argument is deprecated. You should use the `test.runNvim` module option instead." - { runNvim = !dontRun; } - ); + config.test = { + inherit name; + }; }; in result.config.build.test; @@ -41,9 +33,7 @@ let pkgs ? defaultPkgs, module, extraSpecialArgs ? { }, - # TODO: Deprecated 2024-08-20, remove after 24.11 - dontRun ? false, - }@args: + }: let # NOTE: we are importing this just for evalNixvim helpers = self.lib.nixvim.override { @@ -56,11 +46,6 @@ let modules = [ module (lib.optionalAttrs (name != null) { test.name = name; }) - (lib.optionalAttrs (args ? dontRun) ( - lib.warn - "mkTestDerivationFromNixvimModule: the `dontRun` argument is deprecated. You should use the `test.runNvim` module option instead." - { config.test.runNvim = !dontRun; } - )) { wrapRc = true; } # TODO: Only do this when `args?pkgs` # Consider deprecating the `pkgs` arg too...