diff options
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-common.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index e9c0303afb55d..585cfd2a7049b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -20,8 +20,8 @@ with haskellLib; self: super: { # Make sure that Cabal 3.10.* can be built as-is - Cabal_3_10_2_1 = doDistribute (super.Cabal_3_10_2_1.override ({ - Cabal-syntax = self.Cabal-syntax_3_10_2_0; + Cabal_3_10_3_0 = doDistribute (super.Cabal_3_10_3_0.override ({ + Cabal-syntax = self.Cabal-syntax_3_10_3_0; } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.2.5") { # Use process core package when possible process = self.process_1_6_18_0; @@ -36,9 +36,9 @@ self: super: { { # Needs to be downgraded compared to Stackage LTS 21 resolv = cself.resolv_0_1_2_0; - } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.6") { - Cabal = cself.Cabal_3_10_2_1; - Cabal-syntax = cself.Cabal-syntax_3_10_2_0; + } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.10") { + Cabal = cself.Cabal_3_10_3_0; + Cabal-syntax = cself.Cabal-syntax_3_10_3_0; } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.4") { # We need at least directory >= 1.3.7.0. Using the latest version # 1.3.8.* is not an option since it causes very annoying dependencies @@ -81,7 +81,7 @@ self: super: { extensions = doJailbreak (super.extensions.override { Cabal = if versionOlder self.ghc.version "9.6" - then self.Cabal_3_10_2_1 + then self.Cabal_3_10_3_0 else null; # use GHC bundled version }); @@ -185,6 +185,7 @@ self: super: { # https://github.com/mpickering/eventlog2html/pull/187 eventlog2html = lib.pipe super.eventlog2html [ + doJailbreak (appendPatch (fetchpatch { name = "blaze-html-compat.patch"; url = "https://github.com/mpickering/eventlog2html/commit/666aee9ee44c571173a73036b36ad4154c188481.patch"; @@ -1512,7 +1513,7 @@ self: super: { # 2022-08-31: Jailbreak is done to allow aeson 2.0.*: # https://github.com/haskell-CI/haskell-ci/commit/6ad0d5d701cbe101013335d597acaf5feadd3ab9#r82681900 cabal-install-parsers = doJailbreak (dontCheck (super.cabal-install-parsers.override { - Cabal-syntax = self.Cabal-syntax_3_10_2_0; + Cabal-syntax = self.Cabal-syntax_3_10_3_0; })); # Test suite requires database @@ -2297,7 +2298,7 @@ self: super: { # 2023-07-03: allow lattices-2.2, waiting on https://github.com/haskell-CI/haskell-ci/pull/664 # 2024-03-21: pins specific version of ShellCheck haskell-ci = doJailbreak (super.haskell-ci.overrideScope (self: super: { - Cabal-syntax = self.Cabal-syntax_3_10_2_0; + Cabal-syntax = self.Cabal-syntax_3_10_3_0; ShellCheck = self.ShellCheck_0_9_0; })); @@ -2564,7 +2565,7 @@ self: super: { cabal-fmt = doJailbreak (super.cabal-fmt.override { # Needs newer Cabal-syntax version. - Cabal-syntax = self.Cabal-syntax_3_10_2_0; + Cabal-syntax = self.Cabal-syntax_3_10_3_0; }); # 2023-07-18: https://github.com/srid/ema/issues/156 @@ -3036,13 +3037,6 @@ self: super: { # repa-query, repa-scalar, repa-store, repa-stream ; - # https://github.com/jhickner/smtp-mail/pull/41 Use crypton-connection instead of connection - smtp-mail = appendPatch (pkgs.fetchpatch { - name = "smtp-mail-crypton-connection.patch"; - url = "https://github.com/jhickner/smtp-mail/commit/4c724c80814ab1da7c37256a6c10e04c88b9af95.patch"; - hash = "sha256-rCyY4rB/wLspeAbLw1jji5BykYFLnmTjLiUyNkiEXmw"; - }) (super.smtp-mail.override { connection = self.crypton-connection; }); - # Use recent git version as the hackage version is outdated and not building on recent GHC versions haskell-to-elm = overrideSrc { version = "unstable-2023-12-02"; @@ -3068,4 +3062,7 @@ self: super: { tasty = super.tasty_1_5; tasty-quickcheck = super.tasty-quickcheck_0_10_3; }); + + # Too strict bounds on text. Can be removed after https://github.com/alx741/currencies/pull/3 is merged + currencies = doJailbreak super.currencies; } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super |