From 409f95731e3653c08118c5985b7a29b0da886a46 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Wed, 1 Nov 2023 05:48:22 +0800 Subject: shellcheck-minimal: init Expose the minimal and stripped shellcheck package used by writeShellApplication. --- pkgs/top-level/all-packages.nix | 6 ++++++ pkgs/top-level/stage.nix | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'pkgs/top-level') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 41b2e54937173..9503ef15776f3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20088,6 +20088,12 @@ with pkgs; inherit (__splicedPackages.haskellPackages) ShellCheck; }; + + # Minimal shellcheck executable for package checks. + # Use shellcheck which does not include docs, as + # pandoc takes long to build and documentation isn't needed for just running the cli + shellcheck-minimal = haskell.lib.compose.justStaticExecutables shellcheck.unwrapped; + shellharden = callPackage ../development/tools/shellharden { }; schemaspy = callPackage ../development/tools/database/schemaspy { }; diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 1f37bbb70bda6..1cc05167cee83 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -110,8 +110,8 @@ let trivialBuilders = self: super: import ../build-support/trivial-builders { inherit lib; - inherit (self) runtimeShell stdenv stdenvNoCC haskell; - inherit (self.pkgsBuildHost) shellcheck; + inherit (self) runtimeShell stdenv stdenvNoCC; + inherit (self.pkgsBuildHost) shellcheck-minimal; inherit (self.pkgsBuildHost.xorg) lndir; }; -- cgit 1.4.1