diff options
| author | Artturi <Artturin@artturin.com> | 2023-11-06 23:19:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-06 23:19:00 +0200 |
| commit | 59ff987fedc4df03b77ee94fd7182d20befb1399 (patch) | |
| tree | 1f4c43b5af7e233dde5365711641207533c853d1 /pkgs/top-level | |
| parent | a3708ce91cb36b05a57bb900f567ea6d567949bf (diff) | |
| parent | 409f95731e3653c08118c5985b7a29b0da886a46 (diff) | |
Merge pull request #264684 from ShamrockLee/shellcheck-minimal
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/stage.nix | 4 |
2 files changed, 8 insertions, 2 deletions
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; }; |