JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

trivial-builders.writeShellApplication: use unwrapped shellcheck

Browse Source 
originally done in 62e1d58a6f

but

reverted in 6d8041b053

because it contained many haskell deps
This commit is contained in:
Artturin 2023-03-07 21:18:48 +02:00
parent 7d2b144f7e
commit b1e6e553fa
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/build-support/trivial-builders.nix
View File

@ -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;

2
pkgs/top-level/stage.nix
View File

@ -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;
};