From 5dcf05a83de39ff767891a617959812f6cdf638a Mon Sep 17 00:00:00 2001 From: Birdee <85372418+BirdeeHub@users.noreply.github.com> Date: Mon, 20 Apr 2026 19:19:30 -0700 Subject: [PATCH] ci(tests): add ... to internal test arguments to avoid future problems --- ci/checks/all-modules-have-maintainers.nix | 1 + ci/checks/apply.nix | 1 + ci/checks/formatting.nix | 1 + ci/checks/makeCustomizable.nix | 1 + ci/checks/meta-maintainers.nix | 1 + ci/checks/meta-platforms.nix | 1 + ci/checks/outputName-tests.nix | 1 + ci/checks/subwrappermodule.nix | 1 + ci/checks/toKdl.nix | 1 + ci/checks/types-file.nix | 1 + modules/makeWrapper/check.nix | 8 ++------ modules/makeWrapper/checks/args-direct.nix | 1 + modules/makeWrapper/checks/env-null.nix | 1 + modules/makeWrapper/checks/flags-equals-separator.nix | 1 + modules/makeWrapper/checks/flags-list.nix | 1 + modules/makeWrapper/checks/flags-null-false.nix | 1 + modules/makeWrapper/checks/flags-space-separator.nix | 1 + modules/makeWrapper/checks/flags.nix | 1 + modules/symlinkScript/check.nix | 8 ++------ modules/symlinkScript/checks/filesToExclude-glob.nix | 1 + modules/symlinkScript/checks/filesToExclude-more.nix | 1 + modules/symlinkScript/checks/filesToExclude.nix | 1 + modules/symlinkScript/checks/filesToPatch.nix | 1 + wrapperModules/a/aria2/check.nix | 1 + wrapperModules/a/atool/check.nix | 2 +- wrapperModules/c/cava/check.nix | 1 + wrapperModules/c/claude-code/check.nix | 1 + wrapperModules/e/emacs/check.nix | 1 + wrapperModules/g/git/check.nix | 1 + wrapperModules/h/helix/check.nix | 1 + wrapperModules/j/jujutsu/check.nix | 1 + wrapperModules/m/mako/check.nix | 1 + wrapperModules/m/mangowc/check.nix | 1 + wrapperModules/m/mpv/check.nix | 1 + wrapperModules/n/niri/check.nix | 1 + wrapperModules/n/notmuch/check.nix | 1 + wrapperModules/n/nushell/check.nix | 1 + wrapperModules/r/rofi/check.nix | 1 + wrapperModules/v/vim/check.nix | 1 + wrapperModules/w/waybar/check.nix | 1 + wrapperModules/w/wezterm/check.nix | 1 + wrapperModules/x/xplr/check.nix | 1 + wrapperModules/y/yazi/check.nix | 1 + wrapperModules/y/yt-dlp/check.nix | 2 +- wrapperModules/z/zsh/check.nix | 1 + 45 files changed, 47 insertions(+), 14 deletions(-) diff --git a/ci/checks/all-modules-have-maintainers.nix b/ci/checks/all-modules-have-maintainers.nix index 8331fa51..cb952874 100644 --- a/ci/checks/all-modules-have-maintainers.nix +++ b/ci/checks/all-modules-have-maintainers.nix @@ -1,6 +1,7 @@ { pkgs, self, + ... }: let diff --git a/ci/checks/apply.nix b/ci/checks/apply.nix index 63320c2e..093b1d2a 100644 --- a/ci/checks/apply.nix +++ b/ci/checks/apply.nix @@ -1,6 +1,7 @@ { pkgs, self, + ... }: # TODO: make sure theres no other stuff passing on accident in here let diff --git a/ci/checks/formatting.nix b/ci/checks/formatting.nix index 9b2c161b..3a7d0e50 100644 --- a/ci/checks/formatting.nix +++ b/ci/checks/formatting.nix @@ -1,6 +1,7 @@ { pkgs, self, + ... }: pkgs.runCommand "formatting-check" { } '' diff --git a/ci/checks/makeCustomizable.nix b/ci/checks/makeCustomizable.nix index 02d61343..d89f284a 100644 --- a/ci/checks/makeCustomizable.nix +++ b/ci/checks/makeCustomizable.nix @@ -1,6 +1,7 @@ { pkgs, self, + ... }: let luaEnv = self.lib.makeCustomizable "withPackages" { diff --git a/ci/checks/meta-maintainers.nix b/ci/checks/meta-maintainers.nix index f06d7017..3e5504bb 100644 --- a/ci/checks/meta-maintainers.nix +++ b/ci/checks/meta-maintainers.nix @@ -1,6 +1,7 @@ { pkgs, self, + ... }: let diff --git a/ci/checks/meta-platforms.nix b/ci/checks/meta-platforms.nix index acb18953..fdf9af38 100644 --- a/ci/checks/meta-platforms.nix +++ b/ci/checks/meta-platforms.nix @@ -1,6 +1,7 @@ { pkgs, self, + ... }: let diff --git a/ci/checks/outputName-tests.nix b/ci/checks/outputName-tests.nix index 22915fb2..ba3feadc 100644 --- a/ci/checks/outputName-tests.nix +++ b/ci/checks/outputName-tests.nix @@ -1,6 +1,7 @@ { pkgs, self, + ... }: let diff --git a/ci/checks/subwrappermodule.nix b/ci/checks/subwrappermodule.nix index 58aca0e8..613be394 100644 --- a/ci/checks/subwrappermodule.nix +++ b/ci/checks/subwrappermodule.nix @@ -1,6 +1,7 @@ { pkgs, self, + ... }: let evaled = self.lib.evalModule [ diff --git a/ci/checks/toKdl.nix b/ci/checks/toKdl.nix index 3e58b83a..66f29b6f 100644 --- a/ci/checks/toKdl.nix +++ b/ci/checks/toKdl.nix @@ -1,6 +1,7 @@ { pkgs, self, + ... }: let lib = pkgs.lib; diff --git a/ci/checks/types-file.nix b/ci/checks/types-file.nix index 041bfad1..1e534f6c 100644 --- a/ci/checks/types-file.nix +++ b/ci/checks/types-file.nix @@ -1,6 +1,7 @@ { pkgs, self, + ... }: let lib = pkgs.lib; diff --git a/modules/makeWrapper/check.nix b/modules/makeWrapper/check.nix index 18541618..25e5e614 100644 --- a/modules/makeWrapper/check.nix +++ b/modules/makeWrapper/check.nix @@ -1,16 +1,12 @@ { callPackage, lib, - self, ... -}: +}@args: lib.pipe ./checks [ builtins.readDir (lib.filterAttrs (name: type: type == "regular" && lib.hasSuffix ".nix" name)) (lib.mapAttrs' ( - name: _: - lib.nameValuePair (lib.removeSuffix ".nix" name) ( - callPackage (./checks + "/${name}") { inherit self; } - ) + name: _: lib.nameValuePair (lib.removeSuffix ".nix" name) (callPackage (./checks + "/${name}") args) )) ] diff --git a/modules/makeWrapper/checks/args-direct.nix b/modules/makeWrapper/checks/args-direct.nix index 554ef1ee..b17bb174 100644 --- a/modules/makeWrapper/checks/args-direct.nix +++ b/modules/makeWrapper/checks/args-direct.nix @@ -1,6 +1,7 @@ { pkgs, self, + ... }: let diff --git a/modules/makeWrapper/checks/env-null.nix b/modules/makeWrapper/checks/env-null.nix index 1055d1e2..7c647238 100644 --- a/modules/makeWrapper/checks/env-null.nix +++ b/modules/makeWrapper/checks/env-null.nix @@ -1,6 +1,7 @@ { pkgs, self, + ... }: let diff --git a/modules/makeWrapper/checks/flags-equals-separator.nix b/modules/makeWrapper/checks/flags-equals-separator.nix index 2f1ba67f..30cc24a6 100644 --- a/modules/makeWrapper/checks/flags-equals-separator.nix +++ b/modules/makeWrapper/checks/flags-equals-separator.nix @@ -1,6 +1,7 @@ { pkgs, self, + ... }: let diff --git a/modules/makeWrapper/checks/flags-list.nix b/modules/makeWrapper/checks/flags-list.nix index c70e6b86..bc57773e 100644 --- a/modules/makeWrapper/checks/flags-list.nix +++ b/modules/makeWrapper/checks/flags-list.nix @@ -1,6 +1,7 @@ { pkgs, self, + ... }: let diff --git a/modules/makeWrapper/checks/flags-null-false.nix b/modules/makeWrapper/checks/flags-null-false.nix index 72cce64d..4f4c591d 100644 --- a/modules/makeWrapper/checks/flags-null-false.nix +++ b/modules/makeWrapper/checks/flags-null-false.nix @@ -1,6 +1,7 @@ { pkgs, self, + ... }: let diff --git a/modules/makeWrapper/checks/flags-space-separator.nix b/modules/makeWrapper/checks/flags-space-separator.nix index 68e0d929..fe396a63 100644 --- a/modules/makeWrapper/checks/flags-space-separator.nix +++ b/modules/makeWrapper/checks/flags-space-separator.nix @@ -1,6 +1,7 @@ { pkgs, self, + ... }: let diff --git a/modules/makeWrapper/checks/flags.nix b/modules/makeWrapper/checks/flags.nix index 2ebf1213..9e1080e8 100644 --- a/modules/makeWrapper/checks/flags.nix +++ b/modules/makeWrapper/checks/flags.nix @@ -1,6 +1,7 @@ { pkgs, self, + ... }: let diff --git a/modules/symlinkScript/check.nix b/modules/symlinkScript/check.nix index 18541618..25e5e614 100644 --- a/modules/symlinkScript/check.nix +++ b/modules/symlinkScript/check.nix @@ -1,16 +1,12 @@ { callPackage, lib, - self, ... -}: +}@args: lib.pipe ./checks [ builtins.readDir (lib.filterAttrs (name: type: type == "regular" && lib.hasSuffix ".nix" name)) (lib.mapAttrs' ( - name: _: - lib.nameValuePair (lib.removeSuffix ".nix" name) ( - callPackage (./checks + "/${name}") { inherit self; } - ) + name: _: lib.nameValuePair (lib.removeSuffix ".nix" name) (callPackage (./checks + "/${name}") args) )) ] diff --git a/modules/symlinkScript/checks/filesToExclude-glob.nix b/modules/symlinkScript/checks/filesToExclude-glob.nix index c630230a..b2606f0c 100644 --- a/modules/symlinkScript/checks/filesToExclude-glob.nix +++ b/modules/symlinkScript/checks/filesToExclude-glob.nix @@ -1,6 +1,7 @@ { pkgs, self, + ... }: let diff --git a/modules/symlinkScript/checks/filesToExclude-more.nix b/modules/symlinkScript/checks/filesToExclude-more.nix index e0309596..3aa00cc7 100644 --- a/modules/symlinkScript/checks/filesToExclude-more.nix +++ b/modules/symlinkScript/checks/filesToExclude-more.nix @@ -1,6 +1,7 @@ { pkgs, self, + ... }: let diff --git a/modules/symlinkScript/checks/filesToExclude.nix b/modules/symlinkScript/checks/filesToExclude.nix index ef6782fd..53e2b073 100644 --- a/modules/symlinkScript/checks/filesToExclude.nix +++ b/modules/symlinkScript/checks/filesToExclude.nix @@ -1,6 +1,7 @@ { pkgs, self, + ... }: let diff --git a/modules/symlinkScript/checks/filesToPatch.nix b/modules/symlinkScript/checks/filesToPatch.nix index 6010a2ff..af1fa392 100644 --- a/modules/symlinkScript/checks/filesToPatch.nix +++ b/modules/symlinkScript/checks/filesToPatch.nix @@ -1,6 +1,7 @@ { pkgs, self, + ... }: let diff --git a/wrapperModules/a/aria2/check.nix b/wrapperModules/a/aria2/check.nix index 03462222..657c3b09 100644 --- a/wrapperModules/a/aria2/check.nix +++ b/wrapperModules/a/aria2/check.nix @@ -1,6 +1,7 @@ { pkgs, self, + ... }: let aria2Wrapper = self.wrappers.aria2.wrap { diff --git a/wrapperModules/a/atool/check.nix b/wrapperModules/a/atool/check.nix index 8ddefd45..88255abb 100644 --- a/wrapperModules/a/atool/check.nix +++ b/wrapperModules/a/atool/check.nix @@ -1,4 +1,4 @@ -{ pkgs, self }: +{ pkgs, self, ... }: let atoolWrapped = self.wrappers.atool.wrap { inherit pkgs; diff --git a/wrapperModules/c/cava/check.nix b/wrapperModules/c/cava/check.nix index 92d36f78..66d4f57b 100644 --- a/wrapperModules/c/cava/check.nix +++ b/wrapperModules/c/cava/check.nix @@ -1,6 +1,7 @@ { pkgs, self, + ... }: let cavaWrapper = self.wrappers.cava.wrap { inherit pkgs; }; diff --git a/wrapperModules/c/claude-code/check.nix b/wrapperModules/c/claude-code/check.nix index fdf993de..7a27347b 100644 --- a/wrapperModules/c/claude-code/check.nix +++ b/wrapperModules/c/claude-code/check.nix @@ -1,6 +1,7 @@ { pkgs, self, + ... }: let claudeCodeWrapped = self.wrappers.claude-code.wrap { diff --git a/wrapperModules/e/emacs/check.nix b/wrapperModules/e/emacs/check.nix index abeac665..d6e9d9b9 100644 --- a/wrapperModules/e/emacs/check.nix +++ b/wrapperModules/e/emacs/check.nix @@ -1,6 +1,7 @@ { pkgs, self, + ... }: let emacsWrapped = diff --git a/wrapperModules/g/git/check.nix b/wrapperModules/g/git/check.nix index be284e0d..06966848 100644 --- a/wrapperModules/g/git/check.nix +++ b/wrapperModules/g/git/check.nix @@ -1,6 +1,7 @@ { pkgs, self, + ... }: let diff --git a/wrapperModules/h/helix/check.nix b/wrapperModules/h/helix/check.nix index cadb67f1..6794e29c 100644 --- a/wrapperModules/h/helix/check.nix +++ b/wrapperModules/h/helix/check.nix @@ -1,6 +1,7 @@ { pkgs, self, + ... }: let diff --git a/wrapperModules/j/jujutsu/check.nix b/wrapperModules/j/jujutsu/check.nix index 25393569..abdcb388 100644 --- a/wrapperModules/j/jujutsu/check.nix +++ b/wrapperModules/j/jujutsu/check.nix @@ -1,6 +1,7 @@ { pkgs, self, + ... }: let diff --git a/wrapperModules/m/mako/check.nix b/wrapperModules/m/mako/check.nix index 875c4530..7313b067 100644 --- a/wrapperModules/m/mako/check.nix +++ b/wrapperModules/m/mako/check.nix @@ -1,6 +1,7 @@ { pkgs, self, + ... }: let diff --git a/wrapperModules/m/mangowc/check.nix b/wrapperModules/m/mangowc/check.nix index a981bf26..1fdffa9a 100644 --- a/wrapperModules/m/mangowc/check.nix +++ b/wrapperModules/m/mangowc/check.nix @@ -1,6 +1,7 @@ { pkgs, self, + ... }: let mangowcWrapped = self.wrappers.mangowc.wrap { diff --git a/wrapperModules/m/mpv/check.nix b/wrapperModules/m/mpv/check.nix index cd3b3872..4c54d9f6 100644 --- a/wrapperModules/m/mpv/check.nix +++ b/wrapperModules/m/mpv/check.nix @@ -1,6 +1,7 @@ { pkgs, self, + ... }: let diff --git a/wrapperModules/n/niri/check.nix b/wrapperModules/n/niri/check.nix index 39fe9e2c..4b509744 100644 --- a/wrapperModules/n/niri/check.nix +++ b/wrapperModules/n/niri/check.nix @@ -1,6 +1,7 @@ { pkgs, self, + ... }: let diff --git a/wrapperModules/n/notmuch/check.nix b/wrapperModules/n/notmuch/check.nix index 467fe962..5d53e138 100644 --- a/wrapperModules/n/notmuch/check.nix +++ b/wrapperModules/n/notmuch/check.nix @@ -1,6 +1,7 @@ { pkgs, self, + ... }: let diff --git a/wrapperModules/n/nushell/check.nix b/wrapperModules/n/nushell/check.nix index 70be36f9..fcea4536 100644 --- a/wrapperModules/n/nushell/check.nix +++ b/wrapperModules/n/nushell/check.nix @@ -1,6 +1,7 @@ { pkgs, self, + ... }: let diff --git a/wrapperModules/r/rofi/check.nix b/wrapperModules/r/rofi/check.nix index c67b9aab..6215e4b2 100644 --- a/wrapperModules/r/rofi/check.nix +++ b/wrapperModules/r/rofi/check.nix @@ -1,6 +1,7 @@ { pkgs, self, + ... }: let diff --git a/wrapperModules/v/vim/check.nix b/wrapperModules/v/vim/check.nix index d21c6ee1..fd0f3c40 100644 --- a/wrapperModules/v/vim/check.nix +++ b/wrapperModules/v/vim/check.nix @@ -1,6 +1,7 @@ { pkgs, self, + ... }: let diff --git a/wrapperModules/w/waybar/check.nix b/wrapperModules/w/waybar/check.nix index 313fc8d1..a264032c 100644 --- a/wrapperModules/w/waybar/check.nix +++ b/wrapperModules/w/waybar/check.nix @@ -1,6 +1,7 @@ { pkgs, self, + ... }: let waybarWrapped = self.wrappers.waybar.wrap { diff --git a/wrapperModules/w/wezterm/check.nix b/wrapperModules/w/wezterm/check.nix index 4cff4292..50d25d5c 100644 --- a/wrapperModules/w/wezterm/check.nix +++ b/wrapperModules/w/wezterm/check.nix @@ -1,6 +1,7 @@ { pkgs, self, + ... }: let weztermWrapped = self.wrappers.wezterm.wrap ( diff --git a/wrapperModules/x/xplr/check.nix b/wrapperModules/x/xplr/check.nix index 712f104e..847a5ba2 100644 --- a/wrapperModules/x/xplr/check.nix +++ b/wrapperModules/x/xplr/check.nix @@ -1,6 +1,7 @@ { pkgs, self, + ... }: let xplr = self.wrappers.xplr.wrap ( diff --git a/wrapperModules/y/yazi/check.nix b/wrapperModules/y/yazi/check.nix index 15b7aa73..0cb310cb 100644 --- a/wrapperModules/y/yazi/check.nix +++ b/wrapperModules/y/yazi/check.nix @@ -1,6 +1,7 @@ { pkgs, self, + ... }: let yaziWrapper = self.wrappers.yazi.wrap { inherit pkgs; }; diff --git a/wrapperModules/y/yt-dlp/check.nix b/wrapperModules/y/yt-dlp/check.nix index 769b7fc0..cac06e71 100644 --- a/wrapperModules/y/yt-dlp/check.nix +++ b/wrapperModules/y/yt-dlp/check.nix @@ -1,4 +1,4 @@ -{ pkgs, self }: +{ pkgs, self, ... }: let ytWrapped = self.wrappers.yt-dlp.wrap { inherit pkgs; diff --git a/wrapperModules/z/zsh/check.nix b/wrapperModules/z/zsh/check.nix index a2d2f8b4..80a44b4f 100644 --- a/wrapperModules/z/zsh/check.nix +++ b/wrapperModules/z/zsh/check.nix @@ -1,6 +1,7 @@ { pkgs, self, + ... }: let