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

Merge pull request #147780 from qowoz/shellcheck

Browse Source 
shellcheck: add override for newer version
This commit is contained in:
sterni 2021-12-02 00:12:44 +01:00 committed by GitHub
commit 0ce778447e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -2114,4 +2114,7 @@ EOT
brick = self.brick_0_64_2;
};
# build newer version for `pkgs.shellcheck`
ShellCheck_0_8_0 = doDistribute super.ShellCheck_0_8_0;
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

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

@ -1,4 +1,4 @@
{ stdenv, lib, haskellPackages, haskell, pandoc }:
{ stdenv, lib, ShellCheck, haskell, pandoc }:
# this wraps around the haskell package
# and puts the documentation into place
@ -15,13 +15,15 @@ let
};
in drv' // { meta = meta' // overrideFn meta'; };
bin = haskell.lib.compose.justStaticExecutables haskellPackages.ShellCheck;
bin = haskell.lib.compose.justStaticExecutables ShellCheck;
shellcheck = stdenv.mkDerivation {
pname = "shellcheck";
version = bin.version;
inherit (haskellPackages.ShellCheck) meta src;
inherit (ShellCheck) src;
meta = builtins.removeAttrs ShellCheck.meta [ "hydraPlatforms" ];
nativeBuildInputs = [ pandoc ];

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

@ -15274,7 +15274,9 @@ with pkgs;
shards_0_16
shards;
shellcheck = callPackage ../development/tools/shellcheck {};
shellcheck = callPackage ../development/tools/shellcheck {
ShellCheck = haskellPackages.ShellCheck_0_8_0;
};
shellharden = callPackage ../development/tools/shellharden {};