diff options
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index 49c3623d5d6b..8d0669ca2acb 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -56,4 +56,8 @@ self: super: { }; in appendPatch super.hadoop-rpc patch; + # Version 1.9.1 needs Cabal 2.4.x or later, so + # we use the one from the ghc-8.6.1 package set. + stack = markBroken super.stack; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e4ef165c644a..68fe5b5d99c3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6837,7 +6837,7 @@ with pkgs; cabal-install = haskell.lib.justStaticExecutables haskellPackages.cabal-install; - stack = haskell.lib.justStaticExecutables haskellPackages.stack; + stack = haskell.lib.justStaticExecutables haskell.packages.ghc861.stack; hlint = haskell.lib.justStaticExecutables haskellPackages.hlint; all-cabal-hashes = callPackage ../data/misc/hackage { }; |