diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 99ed27358392..7c429ecde952 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -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 diff --git a/pkgs/development/tools/shellcheck/default.nix b/pkgs/development/tools/shellcheck/default.nix index cf767515082e..13cfc93cfc67 100644 --- a/pkgs/development/tools/shellcheck/default.nix +++ b/pkgs/development/tools/shellcheck/default.nix @@ -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 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 031e293860f2..2e15c96b457b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 {};