about summary refs log tree commit diff
path: root/pkgs/development/haskell-modules
diff options
context:
space:
mode:
authorsternenseemann <sternenseemann@systemli.org>2023-01-18 21:18:03 +0100
committersternenseemann <sternenseemann@systemli.org>2023-01-18 21:18:03 +0100
commit252ace816659423f0788f2260496ef222e69c227 (patch)
tree9a00798918450e80a61c3c1836eeeee4c1e034d3 /pkgs/development/haskell-modules
parenta7de82a797e82c46ed783030e1334d979da82c58 (diff)
parent7cf2217fd0b0a26b78d49edaa25d04f45bd94865 (diff)
downloadnixlib-252ace816659423f0788f2260496ef222e69c227.tar
nixlib-252ace816659423f0788f2260496ef222e69c227.tar.gz
nixlib-252ace816659423f0788f2260496ef222e69c227.tar.bz2
nixlib-252ace816659423f0788f2260496ef222e69c227.tar.lz
nixlib-252ace816659423f0788f2260496ef222e69c227.tar.xz
nixlib-252ace816659423f0788f2260496ef222e69c227.tar.zst
nixlib-252ace816659423f0788f2260496ef222e69c227.zip
Merge remote-tracking branch 'origin/master' into haskell-updates
Diffstat (limited to 'pkgs/development/haskell-modules')
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix9
1 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 94d94f180c8c..ec9b70f4a0ce 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -474,6 +474,15 @@ self: super: {
   # https://github.com/kkardzis/curlhs/issues/6
   curlhs = dontCheck super.curlhs;
 
+  # curl 7.87.0 introduces a preprocessor typechecker of sorts which fails on
+  # incorrect usages of curl_easy_getopt and similar functions. Presumably
+  # because the wrappers in curlc.c don't use static values for the different
+  # arguments to curl_easy_getinfo, it complains and needs to be disabled.
+  # https://github.com/GaloisInc/curl/issues/28
+  curl = appendConfigureFlags [
+    "--ghc-option=-DCURL_DISABLE_TYPECHECK"
+  ] super.curl;
+
   # https://github.com/hvr/token-bucket/issues/3
   token-bucket = dontCheck super.token-bucket;