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

Merge pull request #264684 from ShamrockLee/shellcheck-minimal

Browse Source
This commit is contained in:
Artturi 2023-11-06 23:19:00 +02:00 committed by GitHub
commit 59ff987fed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ 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 ''

6
pkgs/top-level/all-packages.nix
View File

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

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

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