diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 98e13522ac12..6699067cf6d9 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -846,6 +846,16 @@ with haskellLib; xmlgen = dontCheck super.xmlgen; wai-cors = dontCheck super.wai-cors; + # Apply patch from 3.2.1 (which we can't use yet due to mighttpd2) + # for compat with http-types >= 0.12.5 + wai-app-file-cgi = appendPatches [ + (pkgs.fetchpatch { + name = "wai-app-file-cgi-http-types-0.12.5.patch"; + url = "https://github.com/kazu-yamamoto/wai-app-file-cgi/commit/45d749338c4125335ad8a605d6fa81553e81aad8.patch"; + hash = "sha256-gchBTsGohgfJ+gJxE1VwgEQfsSLMuSUXJw1xAyNRqjc="; + }) + ] super.wai-app-file-cgi; + # Apply patch fixing an incorrect QuickCheck property which occasionally causes false negatives # https://github.com/Philonous/xml-picklers/issues/5 xml-picklers = appendPatch (pkgs.fetchpatch { diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 59c486a69c15..02e72c885965 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -55,6 +55,8 @@ default-package-overrides: - pandoc-crossref == 0.3.21 # 2025-12-19: Needs to match Stackage version of rhine - rhine-bayes < 1.6 + # 2026-06-24: compatibility with mighttpd2-4.0.9 + - wai-app-file-cgi < 3.2 # 2026-02-08: compatibility with crypton-x509* in Stackage LTS 24 - x509-ocsp < 0.4.1.0 # keep-sorted end diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 61a9b0c1270d..63b76ee3ab1c 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -741404,6 +741404,89 @@ self: { ) { }; wai-app-file-cgi = callPackage ( + { + mkDerivation, + array, + attoparsec, + base, + bytestring, + case-insensitive, + conduit, + conduit-extra, + containers, + directory, + filepath, + hspec, + HTTP, + http-client, + http-conduit, + http-date, + http-types, + mime-types, + network, + process, + sockaddr, + static-hash, + text, + transformers, + unix, + wai, + wai-conduit, + warp, + word8, + }: + mkDerivation { + pname = "wai-app-file-cgi"; + version = "3.1.12"; + sha256 = "0h1j6zz3l098jhrb42s6hdzxmr2qcksl27w5ghzxrvzwnl12j7fa"; + libraryHaskellDepends = [ + array + attoparsec + base + bytestring + case-insensitive + conduit + conduit-extra + containers + directory + filepath + http-client + http-conduit + http-date + http-types + mime-types + network + process + sockaddr + static-hash + text + transformers + unix + wai + wai-conduit + warp + word8 + ]; + testHaskellDepends = [ + base + bytestring + conduit + conduit-extra + directory + filepath + hspec + HTTP + http-types + unix + wai + warp + ]; + description = "File/CGI/Rev Proxy App of WAI"; + license = lib.licenses.bsd3; + } + ) { }; + + wai-app-file-cgi_3_2_1 = callPackage ( { mkDerivation, array, @@ -741483,6 +741566,7 @@ self: { ]; description = "File/CGI/Rev Proxy App of WAI"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { };