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: b445532528f1
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 10fd09459aea
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 11, 2020

  1. shellcheck: don't build locally

    @zowoq
    zowoq committed Apr 11, 2020
    Copy the full SHA
    e1c059c View commit details

Commits on Apr 12, 2020

  1. shellcheck: inherit meta

    @zowoq
    zowoq committed Apr 12, 2020
    Copy the full SHA
    e32be84 View commit details

  2. Merge pull request #85041 from zowoq/shellcheck 

    shellcheck: don't build locally
    @cdepillabout
    cdepillabout authored Apr 12, 2020
    Copy the full SHA
    10fd094 View commit details
Showing with 1 addition and 6 deletions.
  1. +1 −6 pkgs/development/tools/shellcheck/default.nix
7 changes: 1 addition & 6 deletions pkgs/development/tools/shellcheck/default.nix
View file
Original file line number Diff line number Diff line change
@@ -16,13 +16,12 @@ let
in drv' // { meta = meta' // overrideFn meta'; };

bin = haskell.lib.justStaticExecutables haskellPackages.ShellCheck;
src = haskellPackages.ShellCheck.src;

shellcheck = stdenv.mkDerivation {
pname = "shellcheck";
version = bin.version;

inherit src;
inherit (haskellPackages.ShellCheck) meta src;

nativeBuildInputs = [ pandoc ];

@@ -40,10 +39,6 @@ let
install -Dm644 shellcheck.1 $man/share/man/man1/shellcheck.1
mkdir $out
'';

# just some file copying
preferLocalBuild = true;
allowSubstitutes = false;
};

in