alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

trivial-builders.writeShellApplication: use unwrapped pandoc

Browse source 
writeShellApplication does not need shellcheck docs

it takes ~1 hour to compile the dependencies of pandoc on r9 5900x
because haskell is so slow

$ nix path-info -r ".#sway" --derivation | wc -l
2357

$ nix path-info -r ".#sway" --derivation | wc -l
2055
This commit is contained in:
Artturin 2022-12-13 05:39:58 +02:00
parent ffa34c5244
commit 62e1d58a6f
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 ''
runHook preCheck
${stdenv.shellDryRun} "$target"
${shellcheck}/bin/shellcheck "$target"
${shellcheck.unwrapped}/bin/shellcheck "$target"
runHook postCheck
''
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
mkdir $out
'';
passthru = ShellCheck.passthru or {} // {
# pandoc takes long to build and documentation isn't needed for in nixpkgs usage
unwrapped = ShellCheck;
};
};
in

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

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