Skip to content

Commit eb9c095

Browse files
committed
backport shellcheck-minimal
1 parent 5b02830 commit eb9c095

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

pkgs/build-support/trivial-builders.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{ lib, stdenv, stdenvNoCC, lndir, runtimeShell, shellcheck }:
1+
{ lib, stdenv, stdenvNoCC, lndir, runtimeShell, shellcheck-minimal }:
22

33
let
44
inherit (lib)
@@ -306,7 +306,7 @@ rec {
306306
if checkPhase == null then ''
307307
runHook preCheck
308308
${stdenv.shellDryRun} "$target"
309-
${shellcheck.unwrapped}/bin/shellcheck "$target"
309+
${shellcheck-minimal}/bin/shellcheck "$target"
310310
runHook postCheck
311311
''
312312
else checkPhase;

pkgs/top-level/all-packages.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18404,6 +18404,8 @@ with pkgs;
1840418404
inherit (__splicedPackages.haskellPackages) ShellCheck;
1840518405
};
1840618406

18407+
shellcheck-minimal = haskell.lib.compose.justStaticExecutables shellcheck.unwrapped;
18408+
1840718409
shellharden = callPackage ../development/tools/shellharden {};
1840818410

1840918411
schemaspy = callPackage ../development/tools/database/schemaspy { };

pkgs/top-level/stage.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ let
104104
import ../build-support/trivial-builders.nix {
105105
inherit lib;
106106
inherit (self) runtimeShell stdenv stdenvNoCC;
107-
inherit (self.pkgsBuildHost) shellcheck;
107+
inherit (self.pkgsBuildHost) shellcheck-minimal;
108108
inherit (self.pkgsBuildHost.xorg) lndir;
109109
};
110110

0 commit comments

Comments
 (0)