1 files changed, 7 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix
index 0d15cde3e6cf..9d40b8d98a2c 100644
--- a/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix
@@ -280,7 +280,8 @@ self: super: builtins.intersectAttrs super {
                             then dontCheck
                             else pkgs.lib.id;
       in dontCheckDarwin (super.llvm-hs.override {
-        llvm-config = pkgs.llvm_6;
+        llvm-config = pkgs.llvm_8;
+        llvm-hs-pure = super.llvm-hs-pure_8_0_0;
       });
 
   # Needs help finding LLVM.
@@ -491,7 +492,11 @@ self: super: builtins.intersectAttrs super {
   servant-streaming-server = dontCheck super.servant-streaming-server;
 
   # https://github.com/haskell-servant/servant/pull/1128
-  servant-client-core = appendPatch super.servant-client-core ./patches/servant-client-core-streamBody.patch;
+  servant-client-core = if (pkgs.lib.getVersion super.servant-client-core) == "0.15" then
+    appendPatch super.servant-client-core ./patches/servant-client-core-streamBody.patch
+  else
+    super.servant-client-core;
+
 
   # tests run executable, relying on PATH
   # without this, tests fail with "Couldn't launch intero process"