diff options
-rw-r--r-- | pkgs/build-support/trivial-builders/default.nix | 6 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 6 | ||||
-rw-r--r-- | pkgs/top-level/stage.nix | 4 |
3 files changed, 11 insertions, 5 deletions
diff --git a/pkgs/build-support/trivial-builders/default.nix b/pkgs/build-support/trivial-builders/default.nix index f7adfad455bda..744c7807f4634 100644 --- a/pkgs/build-support/trivial-builders/default.nix +++ b/pkgs/build-support/trivial-builders/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, stdenvNoCC, lndir, runtimeShell, shellcheck, haskell }: +{ lib, stdenv, stdenvNoCC, lndir, runtimeShell, shellcheck-minimal }: let inherit (lib) @@ -365,12 +365,12 @@ rec { # GHC (=> shellcheck) isn't supported on some platforms (such as risc-v) # but we still want to use writeShellApplication on those platforms let - shellcheckSupported = lib.meta.availableOn stdenv.buildPlatform shellcheck.compiler; + shellcheckSupported = lib.meta.availableOn stdenv.buildPlatform shellcheck-minimal.compiler; excludeOption = lib.optionalString (excludeShellChecks != [ ]) "--exclude '${lib.concatStringsSep "," excludeShellChecks}'"; shellcheckCommand = lib.optionalString shellcheckSupported '' # use shellcheck which does not include docs # pandoc takes long to build and documentation isn't needed for just running the cli - ${lib.getExe (haskell.lib.compose.justStaticExecutables shellcheck.unwrapped)} ${excludeOption} "$target" + ${lib.getExe shellcheck-minimal} ${excludeOption} "$target" ''; in if checkPhase == null then '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7944d32732079..ddd92230695ed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20096,6 +20096,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; }; |