diff options
| author | zowoq <59103226+zowoq@users.noreply.github.com> | 2021-11-29 08:26:09 +1000 |
|---|---|---|
| committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2021-12-02 08:12:31 +1000 |
| commit | 93266415489c4079eb62308a7829c30d72334048 (patch) | |
| tree | 2ccb999eefd6503efacf5762a28be0469a6acd1f | |
| parent | 512c0ee78a8dcfc74758108822247f1205cbf909 (diff) | |
| download | nixpkgs-93266415489c4079eb62308a7829c30d72334048.tar nixpkgs-93266415489c4079eb62308a7829c30d72334048.tar.gz nixpkgs-93266415489c4079eb62308a7829c30d72334048.tar.bz2 nixpkgs-93266415489c4079eb62308a7829c30d72334048.tar.lz nixpkgs-93266415489c4079eb62308a7829c30d72334048.tar.xz nixpkgs-93266415489c4079eb62308a7829c30d72334048.tar.zst nixpkgs-93266415489c4079eb62308a7829c30d72334048.zip | |
shellcheck: add override for newer version
`haskellPackages.ShellCheck` is pinned on stackage.
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/tools/shellcheck/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 11 insertions, 4 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 99ed2735839..7c429ecde95 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 cf767515082..13cfc93cfc6 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 031e293860f..2e15c96b457 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 {}; |