about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichael Alan Dorman <mdorman@ironicdesign.com>2018-01-18 07:03:50 -0500
committerPeter Simons <simons@cryp.to>2018-01-19 12:53:11 +0100
commit899714ae964c3e446c2de081bf007ef238c9f3d6 (patch)
treea1802d5fb29438e791dea27b3ef0b09b007551f0
parenta1366f43a0a8140791171fbe52dd351ae2d4da34 (diff)
hoogle: fix http-conduit dependency for new version
5.0.17 now requires http-conduit > 2.3.
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix7
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 28f6b4fe80357..66d0c89344d99 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -845,8 +845,11 @@ self: super: {
   # https://github.com/fpco/stackage/issues/3126
   stack = doJailbreak super.stack;
 
-  # Hoogle needs a newer version than lts-10 provides.
-  hoogle = super.hoogle.override { haskell-src-exts = self.haskell-src-exts_1_20_1; };
+  # Hoogle needs newer versions than lts-10 provides.
+  hoogle = super.hoogle.override {
+    haskell-src-exts = self.haskell-src-exts_1_20_1;
+    http-conduit = self.http-conduit_2_3_0;
+  };
 
   # These packages depend on each other, forming an infinite loop.
   scalendar = markBroken (super.scalendar.override { SCalendar = null; });