From 62e1d58a6fbced03205afd00ec0e896d2ac26c45 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 13 Dec 2022 05:39:58 +0200 Subject: [PATCH] trivial-builders.writeShellApplication: use unwrapped pandoc writeShellApplication does not need shellcheck docs it takes ~1 hour to compile the dependencies of pandoc on r9 5900x because haskell is so slow $ nix path-info -r ".#sway" --derivation | wc -l 2357 $ nix path-info -r ".#sway" --derivation | wc -l 2055 --- pkgs/build-support/trivial-builders.nix | 2 +- pkgs/development/tools/shellcheck/default.nix | 5 +++++ 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 39c5787e3823..f174424e265d 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 e85b596607b1..4bf5113ec1a6 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 3a13a4a8fa98..13d21d985553 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17980,7 +17980,7 @@ with pkgs; shards; shellcheck = callPackage ../development/tools/shellcheck { - inherit (haskellPackages) ShellCheck; + inherit (__splicedPackages.haskellPackages) ShellCheck; }; shellharden = callPackage ../development/tools/shellharden {};