From 6fe22c643b0fe189ffbd53275952adb0a6d6def1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 2 Nov 2016 08:39:39 +0100 Subject: [PATCH] haskell-servant: fix build of latest version Closes https://github.com/NixOS/nixpkgs/pull/20068. --- .../haskell-modules/configuration-common.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 172cdf3230f..b190340641b 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;