diff options
| author | Yueh-Shun Li <shamrocklee@posteo.net> | 2023-11-01 05:48:22 +0800 |
|---|---|---|
| committer | Yueh-Shun Li <shamrocklee@posteo.net> | 2023-11-01 06:23:04 +0800 |
| commit | 409f95731e3653c08118c5985b7a29b0da886a46 (patch) | |
| tree | c6fee9a78d5b3b7d8b08b78e73cf536bb6e1ce4e /pkgs/build-support | |
| parent | 2d3a5c7ddb1970199c04a01911335c5960b94913 (diff) | |
| download | nixpkgs-409f95731e3653c08118c5985b7a29b0da886a46.tar nixpkgs-409f95731e3653c08118c5985b7a29b0da886a46.tar.gz nixpkgs-409f95731e3653c08118c5985b7a29b0da886a46.tar.bz2 nixpkgs-409f95731e3653c08118c5985b7a29b0da886a46.tar.lz nixpkgs-409f95731e3653c08118c5985b7a29b0da886a46.tar.xz nixpkgs-409f95731e3653c08118c5985b7a29b0da886a46.tar.zst nixpkgs-409f95731e3653c08118c5985b7a29b0da886a46.zip | |
shellcheck-minimal: init
Expose the minimal and stripped shellcheck package used by writeShellApplication.
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/trivial-builders/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/build-support/trivial-builders/default.nix b/pkgs/build-support/trivial-builders/default.nix index f7adfad455b..744c7807f46 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 '' |