From d24a1cff754bc780903e9add4041fa70e56e865d Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 10 Feb 2025 23:45:05 +0100 Subject: [PATCH] haskellPackages.cabal-install-parsers: remove jailbreak We have aeson 2.2.3.0 now. --- pkgs/development/haskell-modules/configuration-common.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 399e6afc48eb..fcf5b68284a2 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1482,11 +1482,9 @@ self: super: { # The test suite depends on an impure cabal-install installation in # $HOME, which we don't have in our build sandbox. - # 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-install-parsers = dontCheck (super.cabal-install-parsers.override { Cabal-syntax = self.Cabal-syntax_3_10_3_0; - })); + }); # Test suite requires database persistent-mysql = dontCheck super.persistent-mysql;