diff options
| -rw-r--r-- | pkgs/build-support/trivial-builders.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/tools/shellcheck/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index 39c5787e38231..f174424e265d3 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -305,7 +305,7 @@ rec { if checkPhase == null then '' runHook preCheck ${stdenv.shellDryRun} "$target" - ${shellcheck}/bin/shellcheck "$target" + ${shellcheck.unwrapped}/bin/shellcheck "$target" runHook postCheck '' else checkPhase; diff --git a/pkgs/development/tools/shellcheck/default.nix b/pkgs/development/tools/shellcheck/default.nix index e85b596607b1c..4bf5113ec1a6f 100644 --- a/pkgs/development/tools/shellcheck/default.nix +++ b/pkgs/development/tools/shellcheck/default.nix @@ -37,6 +37,11 @@ let install -Dm644 shellcheck.1 $man/share/man/man1/shellcheck.1 mkdir $out ''; + + passthru = ShellCheck.passthru or {} // { + # pandoc takes long to build and documentation isn't needed for in nixpkgs usage + unwrapped = ShellCheck; + }; }; in diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e35f80aa819c2..f323a3ed1a9b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17981,7 +17981,7 @@ with pkgs; shards; shellcheck = callPackage ../development/tools/shellcheck { - inherit (haskellPackages) ShellCheck; + inherit (__splicedPackages.haskellPackages) ShellCheck; }; shellharden = callPackage ../development/tools/shellharden {}; |