From 620b364a874ec246168851b87f802330fe47e7ac Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Fri, 28 Oct 2016 16:09:57 +0200 Subject: [PATCH] haskellPackages.wai-app-file-cgi: fix build Fixes https://github.com/NixOS/nixpkgs/issues/19611 Fixes https://github.com/NixOS/nixpkgs/issues/19612 --- pkgs/development/haskell-modules/configuration-common.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 3864a190fc88..8274365a952f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -463,7 +463,6 @@ self: super: { translatable-intset = dontCheck super.translatable-intset; ua-parser = dontCheck super.ua-parser; unagi-chan = dontCheck super.unagi-chan; - wai-app-file-cgi = dontCheck super.wai-app-file-cgi; wai-logger = dontCheck super.wai-logger; WebBits = dontCheck super.WebBits; # http://hydra.cryp.to/build/499604/log/raw webdriver = dontCheck super.webdriver; @@ -1031,4 +1030,11 @@ self: super: { # https://github.com/vshabanov/HsOpenSSL/issues/11 HsOpenSSL = doJailbreak super.HsOpenSSL; + # https://github.com/NixOS/nixpkgs/issues/19612 + wai-app-file-cgi = (dontCheck super.wai-app-file-cgi).overrideScope (self: super: { + http-client = self.http-client_0_5_3_2; + http-client-tls = self.http-client-tls_0_3_3; + http-conduit = self.http-conduit_2_2_3; + }); + }