diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index 47aade739a5a..671bdc1bc4d4 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -55,6 +55,9 @@ self: super: { excludes = ["*.cabal"]; }); + # Tests use Data.Semigroup.Option + aeson_2_0_1_0 = dontCheck (doJailbreak super.aeson_2_0_1_0); + basement = overrideCabal (appendPatch super.basement (pkgs.fetchpatch { url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/basement-0.0.12.patch"; sha256 = "0c8n2krz827cv87p3vb1vpl3v0k255aysjx9lq44gz3z1dhxd64z"; @@ -63,11 +66,6 @@ self: super: { postPatch = "sed -i -e 's,<4.16,<4.17,' basement.cabal"; }); - base16-bytestring = appendPatch super.base16-bytestring (pkgs.fetchpatch { - url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/base16-bytestring-1.0.1.0.patch"; - sha256 = "19ajai9y04981zfpcdj1nlz44b12gjj4m1ncciijv43mnz82plji"; - }); - cereal = appendPatch (doJailbreak super.cereal) (pkgs.fetchpatch { url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/cereal-0.5.8.1.patch"; sha256 = "03v4nxwz9y6viaa8anxcmp4zdf2clczv4pf9fqq6lnpplpz5i128"; @@ -118,6 +116,7 @@ self: super: { HTTP = overrideCabal (doJailbreak super.HTTP) (drv: { postPatch = "sed -i -e 's,! Socket,!Socket,' Network/TCP.hs"; }); integer-logarithms = overrideCabal (doJailbreak super.integer-logarithms) (drv: { postPatch = "sed -i -e 's, <1.1, <1.3,' integer-logarithms.cabal"; }); indexed-traversable = doJailbreak super.indexed-traversable; + indexed-traversable-instances = doJailbreak super.indexed-traversable-instances; lifted-async = doJailbreak super.lifted-async; lukko = doJailbreak super.lukko; network = super.network_3_1_2_5; @@ -128,6 +127,7 @@ self: super: { quickcheck-instances = super.quickcheck-instances_0_3_26_1; regex-posix = doJailbreak super.regex-posix; resolv = doJailbreak super.resolv; + semialign = super.semialign_1_2_0_1; singleton-bool = doJailbreak super.singleton-bool; scientific = doJailbreak super.scientific; shelly = doJailbreak super.shelly; @@ -140,8 +140,9 @@ self: super: { unordered-containers = doJailbreak super.unordered-containers; vector = doJailbreak (dontCheck super.vector); vector-binary-instances = doJailbreak super.vector-binary-instances; + # Upper bound on `hashable` is too restrictive + witherable = doJailbreak super.witherable; zlib = doJailbreak super.zlib; - indexed-traversable-instances = doJailbreak super.indexed-traversable-instances; hpack = overrideCabal (doJailbreak super.hpack) (drv: { # Cabal 3.6 seems to preserve comments when reading, which makes this test fail @@ -169,22 +170,6 @@ self: super: { sha256 = "1s8qqg7ymvv94dnfnr1ragx91chh9y7ydc4jx25zn361wbn00pv7"; }); - semigroupoids = overrideCabal super.semigroupoids (drv: { - # Patch from head.hackage for base 4.15 compat - patches = drv.patches or [] ++ [ - (pkgs.fetchpatch { - url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/semigroupoids-5.3.5.patch"; - sha256 = "0xrn1gv6b2n76522pk2nfp4z69kvp14l2zpif2f8zzz6cwcrx9w8"; - }) - ]; - # acrobatics to make the patch apply - prePatch = '' - find . -type f | xargs -L 1 ${pkgs.buildPackages.dos2unix}/bin/dos2unix - ''; - editedCabalFile = null; - revision = null; - }); - # Syntax error in tests fixed in https://github.com/simonmar/alex/commit/84b29475e057ef744f32a94bc0d3954b84160760 alex = dontCheck super.alex; @@ -220,6 +205,9 @@ self: super: { # https://github.com/Soostone/retry/issues/71 retry = dontCheck super.retry; + # Upper bound on `hashable` is too restrictive + semigroupoids = overrideCabal super.semigroupoids (drv: { postPatch = "sed -i -e 's,hashable >= 1.2.7.0 && < 1.4,hashable >= 1.2.7.0 \\&\\& < 1.5,' semigroupoids.cabal";}); + streaming-commons = appendPatch super.streaming-commons (pkgs.fetchpatch { url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/streaming-commons-0.2.2.1.patch"; sha256 = "04wi1jskr3j8ayh88kkx4irvhhgz0i7aj6fblzijy0fygikvidpy";