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

Merge pull request #205874 from Artturin/shellcheckunwrapped

Browse Source 
trivial-builders.writeShellApplication: use unwrapped pandoc
This commit is contained in:
Artturi 2022-12-14 13:21:52 +02:00 committed by GitHub
commit 7484378899
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -305,7 +305,7 @@ rec {
if checkPhase == null then '' if checkPhase == null then ''
runHook preCheck runHook preCheck
${stdenv.shellDryRun} "$target" ${stdenv.shellDryRun} "$target"
${shellcheck}/bin/shellcheck "$target" ${shellcheck.unwrapped}/bin/shellcheck "$target"
runHook postCheck runHook postCheck
'' ''
else checkPhase; else checkPhase;

5
pkgs/development/tools/shellcheck/default.nix
View File

@ -37,6 +37,11 @@ let
install -Dm644 shellcheck.1 $man/share/man/man1/shellcheck.1 install -Dm644 shellcheck.1 $man/share/man/man1/shellcheck.1
mkdir $out mkdir $out
''; '';
passthru = ShellCheck.passthru or {} // {
# pandoc takes long to build and documentation isn't needed for in nixpkgs usage
unwrapped = ShellCheck;
};
}; };
in in

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

@ -17981,7 +17981,7 @@ with pkgs;
shards; shards;
shellcheck = callPackage ../development/tools/shellcheck { shellcheck = callPackage ../development/tools/shellcheck {
inherit (haskellPackages) ShellCheck; inherit (__splicedPackages.haskellPackages) ShellCheck;
}; };
shellharden = callPackage ../development/tools/shellharden {}; shellharden = callPackage ../development/tools/shellharden {};