Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0af01aa8d1f5
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 32b6f52d99c4
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 11, 2020

  1. shellcheck: fix build 

    shellcheck no longer auto builds its manpage[1]

[1] koalaman/shellcheck@2c026f1
    @marsam
    marsam committed Apr 11, 2020
    Copy the full SHA
    c4ff843 View commit details

  2. Merge pull request #84974 from marsam/fix-shellcheck 

    shellcheck: fix build
    @cdepillabout
    cdepillabout authored Apr 11, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    dtzWill Will Dietz
    GPG key ID: EBB0EA4124809D02
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    32b6f52 View commit details
Showing with 8 additions and 2 deletions.
  1. +8 −2 pkgs/development/tools/shellcheck/default.nix
10 changes: 8 additions & 2 deletions pkgs/development/tools/shellcheck/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, lib, haskellPackages, haskell }:
{ stdenv, lib, haskellPackages, haskell, pandoc }:

# this wraps around the haskell package
# and puts the documentation into place
@@ -24,9 +24,15 @@ let

inherit src;

nativeBuildInputs = [ pandoc ];

outputs = [ "bin" "man" "doc" "out" ];

phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ];

buildPhase = ''
pandoc -s -f markdown-smart -t man shellcheck.1.md -o shellcheck.1
'';

installPhase = ''
install -Dm755 ${bin}/bin/shellcheck $bin/bin/shellcheck