From 2a93f44336daee33f28bb82bcb0d55e743d35c13 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 17 Aug 2023 01:40:37 +0200 Subject: [PATCH] haskellPackages.czipwith: relax upper bound on base and t-h --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 55c582a00815..ef66f312dcfd 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -186,6 +186,10 @@ self: super: { # Too strict bounds on base # https://github.com/lspitzner/butcher/issues/7#issuecomment-1681394943 butcher = doJailbreak super.butcher; + # … and template-haskell. + # https://github.com/lspitzner/czipwith/issues/5 + czipwith = doJailbreak super.czipwith; + # Deal with infinite and NaN values generated by QuickCheck-2.14.3 aeson = overrideCabal { # aeson's test suite includes some tests with big numbers that fail on 32bit diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 410bc954697b..9a2266f50456 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1058,7 +1058,6 @@ broken-packages: - custom-prelude - cut-the-crap - CV - - czipwith # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/230964553 at 2023-08-16 - d3js - dag - DAG-Tournament diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 4f69c7062852..61787a8744ec 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -74528,8 +74528,6 @@ self: { testHaskellDepends = [ base transformers ]; description = "CZipWith class and deriving via TH"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "d-bus" = callPackage