From b1e6e553faf3276ec478ae47878b0dab19504342 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 7 Mar 2023 21:18:48 +0200 Subject: [PATCH] trivial-builders.writeShellApplication: use unwrapped shellcheck originally done in 62e1d58a6fbced03205afd00ec0e896d2ac26c45 but reverted in 6d8041b0532c8b51a93f68c9737feecbb195d32a because it contained many haskell deps --- pkgs/build-support/trivial-builders.nix | 6 ++++-- pkgs/top-level/stage.nix | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index ce3dfc83e18e..d8b4ae5dd97f 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, stdenvNoCC, lndir, runtimeShell, shellcheck }: +{ lib, stdenv, stdenvNoCC, lndir, runtimeShell, shellcheck, haskell }: let inherit (lib) @@ -341,7 +341,9 @@ rec { if checkPhase == null then '' runHook preCheck ${stdenv.shellDryRun} "$target" - ${lib.getExe shellcheck} "$target" + # use shellcheck which does not include docs + # pandoc takes long to build and documentation isn't needed for in nixpkgs usage + ${lib.getExe (haskell.lib.compose.justStaticExecutables shellcheck.unwrapped)} "$target" runHook postCheck '' else checkPhase; diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 2b503bce7c04..b796b26307e7 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -103,7 +103,7 @@ let trivialBuilders = self: super: import ../build-support/trivial-builders.nix { inherit lib; - inherit (self) runtimeShell stdenv stdenvNoCC; + inherit (self) runtimeShell stdenv stdenvNoCC haskell; inherit (self.pkgsBuildHost) shellcheck; inherit (self.pkgsBuildHost.xorg) lndir; };