diff options
| author | Joachim Fasting <joachifm@fastmail.fm> | 2016-10-28 16:09:57 +0200 |
|---|---|---|
| committer | Joachim Fasting <joachifm@fastmail.fm> | 2016-10-28 16:32:27 +0200 |
| commit | 620b364a874ec246168851b87f802330fe47e7ac (patch) | |
| tree | 20acdeb5e0936222523b2dafdf49c38023e96364 /pkgs/development | |
| parent | a1ecc5648a5b083b9169e2f9e99dcdb5fa4b32e5 (diff) | |
| download | nixpkgs-620b364a874ec246168851b87f802330fe47e7ac.tar nixpkgs-620b364a874ec246168851b87f802330fe47e7ac.tar.gz nixpkgs-620b364a874ec246168851b87f802330fe47e7ac.tar.bz2 nixpkgs-620b364a874ec246168851b87f802330fe47e7ac.tar.lz nixpkgs-620b364a874ec246168851b87f802330fe47e7ac.tar.xz nixpkgs-620b364a874ec246168851b87f802330fe47e7ac.tar.zst nixpkgs-620b364a874ec246168851b87f802330fe47e7ac.zip | |
haskellPackages.wai-app-file-cgi: fix build
Fixes https://github.com/NixOS/nixpkgs/issues/19611 Fixes https://github.com/NixOS/nixpkgs/issues/19612
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 3864a190fc8..8274365a952 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; + }); + } |