Unverified Commit 59ff987f authored by Artturi's avatar Artturi Committed by GitHub
Browse files

Merge pull request #264684 from ShamrockLee/shellcheck-minimal

parents a3708ce9 409f9573

pkgs/build-support/trivial-builders/default.nix

+3 −3
Original line number Diff line number Diff line 
{ lib, stdenv, stdenvNoCC, lndir, runtimeShell, shellcheck, haskell }:

{ lib, stdenv, stdenvNoCC, lndir, runtimeShell, shellcheck-minimal }:



let

  inherit (lib)
@@ -365,12 +365,12 @@ rec { 
        # GHC (=> shellcheck) isn't supported on some platforms (such as risc-v)

        # but we still want to use writeShellApplication on those platforms

        let

          shellcheckSupported = lib.meta.availableOn stdenv.buildPlatform shellcheck.compiler;

          shellcheckSupported = lib.meta.availableOn stdenv.buildPlatform shellcheck-minimal.compiler;

          excludeOption = lib.optionalString (excludeShellChecks != [  ]) "--exclude '${lib.concatStringsSep "," excludeShellChecks}'";

          shellcheckCommand = lib.optionalString shellcheckSupported ''

            # use shellcheck which does not include docs

            # pandoc takes long to build and documentation isn't needed for just running the cli

            ${lib.getExe (haskell.lib.compose.justStaticExecutables shellcheck.unwrapped)} ${excludeOption} "$target"

            ${lib.getExe shellcheck-minimal} ${excludeOption} "$target"

          '';

        in

        if checkPhase == null then ''

pkgs/top-level/all-packages.nix

+6 −0
Original line number Diff line number Diff line
@@ -20096,6 +20096,12 @@ with pkgs; 
    inherit (__splicedPackages.haskellPackages) ShellCheck;

  };

























  # Minimal shellcheck executable for package checks.













  # Use shellcheck which does not include docs, as













  # pandoc takes long to build and documentation isn't needed for just running the cli













  shellcheck-minimal = haskell.lib.compose.justStaticExecutables shellcheck.unwrapped;



























  shellharden = callPackage ../development/tools/shellharden { };





























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

























pkgs/top-level/stage.nix



+2
−2






























Original line number
Diff line number
Diff line








@@ -110,8 +110,8 @@ let













  trivialBuilders = self: super:















    import ../build-support/trivial-builders {















      inherit lib;













      inherit (self) runtimeShell stdenv stdenvNoCC haskell;













      inherit (self.pkgsBuildHost) shellcheck;













      inherit (self) runtimeShell stdenv stdenvNoCC;













      inherit (self.pkgsBuildHost) shellcheck-minimal;















      inherit (self.pkgsBuildHost.xorg) lndir;















    };