diff options
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-common.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index a0ab31525888f..402fe4b56c1e2 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1577,13 +1577,11 @@ self: super: { doJailbreak ]; - # 2022-03-16: lens bound can be loosened https://github.com/ghcjs/jsaddle-dom/issues/19 jsaddle-dom = overrideCabal (old: { postPatch = old.postPatch or "" + '' - sed -i 's/lens.*4.20/lens/' jsaddle-dom.cabal rm Setup.hs ''; - }) (doJailbreak super.jsaddle-dom); + }) super.jsaddle-dom; jsaddle-hello = doJailbreak super.jsaddle-hello; ghcjs-dom-hello = doJailbreak super.ghcjs-dom-hello; @@ -2944,7 +2942,7 @@ self: super: { # Requires a newer zlib version than stackage provides futhark = super.futhark.override { - zlib = self.zlib_0_7_0_0; + zlib = self.zlib_0_7_1_0; }; # Tests rely on (missing) submodule @@ -2998,6 +2996,14 @@ self: super: { # 2024-03-25: HSH broken because of the unix-2.8.0.0 breaking change HSH = appendPatches [./patches/HSH-unix-openFd.patch] super.HSH; + # Support unix < 2.8 to build in older ghc than 9.6 + linux-namespaces = appendPatch + (fetchpatch { + url = "https://github.com/redneb/hs-linux-namespaces/commit/f4a3546541bb6c7172fdd03e177a961da60e3951.patch"; + sha256 = "sha256-6Qv7NWIbzR3ktMGFogw5597bIqPH7Z4hoFvvBQAoquY="; + }) + super.linux-namespaces; + inherit (let unbreakRepa = packageName: drv: lib.pipe drv [ |