summary refs log tree commit diff
path: root/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2018-10-20 09:40:09 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2018-10-20 09:40:09 +0200
commitca6ee8f519733e1f45b7598d995245dd687f535c (patch)
tree3c84d14a7da3b890b5f3be62ab13e6eae2805695 /pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
parent4c774f24acf2b674b99f70690f73a67c095f1968 (diff)
parentceb0ce849fe01fcbc221e3b978a0744bf3735752 (diff)
downloadnixlib-ca6ee8f519733e1f45b7598d995245dd687f535c.tar
nixlib-ca6ee8f519733e1f45b7598d995245dd687f535c.tar.gz
nixlib-ca6ee8f519733e1f45b7598d995245dd687f535c.tar.bz2
nixlib-ca6ee8f519733e1f45b7598d995245dd687f535c.tar.lz
nixlib-ca6ee8f519733e1f45b7598d995245dd687f535c.tar.xz
nixlib-ca6ee8f519733e1f45b7598d995245dd687f535c.tar.zst
nixlib-ca6ee8f519733e1f45b7598d995245dd687f535c.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix')
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix4
1 files changed, 4 insertions, 0 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;
+
 }