summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2016-11-02 08:39:39 +0100
committerPeter Simons <simons@cryp.to>2016-11-03 17:37:20 +0100
commit6fe22c643b0fe189ffbd53275952adb0a6d6def1 (patch)
treefed9f26dff30af3fde66888d2bad32abac233b3f /pkgs
parentb84f2a516501b2f90e5bb89c8125c666ac007858 (diff)
downloadnixlib-6fe22c643b0fe189ffbd53275952adb0a6d6def1.tar
nixlib-6fe22c643b0fe189ffbd53275952adb0a6d6def1.tar.gz
nixlib-6fe22c643b0fe189ffbd53275952adb0a6d6def1.tar.bz2
nixlib-6fe22c643b0fe189ffbd53275952adb0a6d6def1.tar.lz
nixlib-6fe22c643b0fe189ffbd53275952adb0a6d6def1.tar.xz
nixlib-6fe22c643b0fe189ffbd53275952adb0a6d6def1.tar.zst
nixlib-6fe22c643b0fe189ffbd53275952adb0a6d6def1.zip
haskell-servant: fix build of latest version
Closes https://github.com/NixOS/nixpkgs/pull/20068.
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix14
1 files changed, 14 insertions, 0 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 172cdf3230fd..b190340641bd 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1017,6 +1017,20 @@ self: super: {
     doCheck = false;
   });
 
+  # http-api-data_0.3.x requires QuickCheck > 2.9, but overriding that version
+  # is hard because of transitive dependencies, so we just disable tests.
+  http-api-data_0_3_2 = dontCheck super.http-api-data_0_3_2;
+
+  # Fix build for latest versions of servant and servant-client.
+  servant_0_9_1_1 = super.servant_0_9_1_1.overrideScope (self: super: {
+    http-api-data = self.http-api-data_0_3_2;
+  });
+  servant-client_0_9_1_1 = super.servant-client_0_9_1_1.overrideScope (self: super: {
+    http-api-data = self.http-api-data_0_3_2;
+    servant-server = self.servant-server_0_9_1_1;
+    servant = self.servant_0_9_1_1;
+  });
+
   # https://github.com/pontarius/pontarius-xmpp/issues/105
   pontarius-xmpp = dontCheck super.pontarius-xmpp;