From 468486a64bae109fc7961bb96a7396cdaffe074f Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Thu, 15 Aug 2024 23:26:01 +0100 Subject: [PATCH] haskellPackages.haskell-ci: remove jailbreak --- pkgs/development/haskell-modules/configuration-common.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 62c94d381225..16e17a4d7de3 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2265,12 +2265,11 @@ self: super: { }; # 2023-04-09: haskell-ci needs Cabal-syntax 3.10 - # 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: { + haskell-ci = super.haskell-ci.overrideScope (self: super: { Cabal-syntax = self.Cabal-syntax_3_10_3_0; ShellCheck = self.ShellCheck_0_9_0; - })); + }); # ShellCheck < 0.10.0 needs to be adjusted for changes in fgl >= 5.8 # https://github.com/koalaman/shellcheck/issues/2677