From 648a5b14fb2bd10456e54e7ad9f596946877021a Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 4 May 2021 13:34:35 +0200 Subject: [PATCH] haskellPackages.ihaskell-{display,basic}: jailbreak Version bounds on base are too strict: https://github.com/gibiansky/IHaskell/issues/1217 Fixes evaluation of top-level ihaskell. --- pkgs/development/haskell-modules/configuration-common.nix | 5 +++++ .../haskell-modules/configuration-hackage2nix.yaml | 2 -- pkgs/development/haskell-modules/hackage-packages.nix | 4 ---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index a9443528f90..8b2151e995b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1801,4 +1801,9 @@ self: super: { # https://github.com/diagrams/diagrams-cairo/issues/77 diagrams-cairo = doJailbreak super.diagrams-cairo; + # Too strict version bounds on base + # https://github.com/gibiansky/IHaskell/issues/1217 + ihaskell-display = doJailbreak super.ihaskell-display; + ihaskell-basic = doJailbreak super.ihaskell-basic; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 21129a32a0e..6a5feb2c721 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -7153,8 +7153,6 @@ broken-packages: - ige-mac-integration - ignore - igraph - - ihaskell-basic - - ihaskell-display - ihaskell-parsec - ihaskell-rlangqq - ihaskell-widgets diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 423e1697f11..19a96571ca3 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -146785,8 +146785,6 @@ self: { libraryHaskellDepends = [ base ihaskell ]; description = "IHaskell display instances for basic types"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ihaskell-blaze" = callPackage @@ -146841,8 +146839,6 @@ self: { libraryHaskellDepends = [ base classy-prelude ihaskell ]; description = "IHaskell display instances for basic types"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ihaskell-gnuplot" = callPackage