From fccf629213cd2ca3657c641a88bb6e2413f4dcc3 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 8 Jul 2023 02:13:46 +0200 Subject: [PATCH] jacinda: patch for alex >= 3.3 --- pkgs/development/haskell-modules/configuration-common.nix | 8 ++++++++ .../haskell-modules/configuration-ghc-9.4.x.nix | 3 --- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 816047a94bae..d5d3f3fa3990 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -456,6 +456,14 @@ self: super: { # https://github.com/ekmett/structures/issues/3 structures = dontCheck super.structures; + jacinda = appendPatches [ + (pkgs.fetchpatch { + name = "jacinda-alex-3.3.patch"; + url = "https://github.com/vmchale/jacinda/commit/b8e18871900402e6ab0addae2e41a0f360682ae3.patch"; + sha256 = "0c1b9hp9j44zafzjidp301dz0m54vplgfisqvb1zrh1plk6vsxsa"; + }) + ] (overrideCabal { revision = null; editedCabalFile = null; } super.jacinda); + # Disable test suites to fix the build. acme-year = dontCheck super.acme-year; # http://hydra.cryp.to/build/497858/log/raw aeson-lens = dontCheck super.aeson-lens; # http://hydra.cryp.to/build/496769/log/raw diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index 7a2f87fcca90..194c7d5db942 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -133,9 +133,6 @@ in { # https://github.com/sjakobi/bsb-http-chunked/issues/38 bsb-http-chunked = dontCheck super.bsb-http-chunked; - # need bytestring >= 0.11 which is only bundled with GHC >= 9.2 - regex-rure = doDistribute (markUnbroken super.regex-rure); - jacinda = doDistribute super.jacinda; some = doJailbreak super.some; # 2022-08-01: Tests are broken on ghc 9.2.4: https://github.com/wz1000/HieDb/issues/46