From 5edaf6903cee9c187d3ad191c440e38f5ba1406d Mon Sep 17 00:00:00 2001 From: Aaron VonderHaar Date: Sun, 5 Mar 2023 17:06:34 -0800 Subject: [PATCH 1/2] taskell: unbreak build taskell requires brick <= 1.0 --- pkgs/development/haskell-modules/configuration-common.nix | 6 +++++- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index fb050cf6721a..9dc14bb68ac1 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1783,7 +1783,11 @@ self: super: { # Too strict version bounds on a bunch of libraries: # https://github.com/smallhadroncollider/taskell/issues/100 # May be possible to remove at the next release (1.11.0) - taskell = doJailbreak super.taskell; + taskell = (doJailbreak super.taskell).override { + # Does not support brick >= 1.0 + # https://github.com/smallhadroncollider/taskell/issues/125 + brick = self.brick_0_70_1; + }; # Polyfill for GHCs from the integer-simple days that don't bundle ghc-bignum ghc-bignum = super.ghc-bignum or self.mkDerivation { diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 4ed05107d653..0d4311ad3600 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -5209,7 +5209,6 @@ broken-packages: - tamarin-prover-utils - Tape - tapioca - - taskell - TaskMonad - tasty-auto - tasty-autocollect From c54e50710205e56d0a5ccd60ed68f84398b54b8e Mon Sep 17 00:00:00 2001 From: Aaron VonderHaar Date: Sun, 5 Mar 2023 17:08:38 -0800 Subject: [PATCH 2/2] taskell: remove doJailbreak taskell >= 1.11.0 no longer requires jailbreak --- pkgs/development/haskell-modules/configuration-common.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 9dc14bb68ac1..7f6257f8162f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1780,10 +1780,7 @@ self: super: { # https://github.com/serokell/haskell-crypto/issues/25 crypto-sodium = dontCheck super.crypto-sodium; - # Too strict version bounds on a bunch of libraries: - # https://github.com/smallhadroncollider/taskell/issues/100 - # May be possible to remove at the next release (1.11.0) - taskell = (doJailbreak super.taskell).override { + taskell = super.taskell.override { # Does not support brick >= 1.0 # https://github.com/smallhadroncollider/taskell/issues/125 brick = self.brick_0_70_1;