Commit 62e1d58a authored by Artturin's avatar Artturin
Browse files

trivial-builders.writeShellApplication: use unwrapped pandoc 

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
parent ffa34c52

pkgs/build-support/trivial-builders.nix

+1 −1
Original line number Diff line number Diff line
@@ -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;

pkgs/development/tools/shellcheck/default.nix

+5 −0
Original line number Diff line number Diff line
@@ -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

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -17980,7 +17980,7 @@ with pkgs; 
    shards;















  shellcheck = callPackage ../development/tools/shellcheck {













    inherit (haskellPackages) ShellCheck;













    inherit (__splicedPackages.haskellPackages) ShellCheck;















  };





























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