From 2c69d30e29a329076f553bf1fd59632c981fb167 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Mon, 19 Aug 2019 01:40:49 +0200 Subject: [PATCH] haskellPackages.idris: Fix build Can build with default megaparsec now --- pkgs/development/haskell-modules/configuration-common.nix | 8 +------- .../haskell-modules/configuration-hackage2nix.yaml | 2 -- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c9c818246208..8c1e1f0191c1 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -710,15 +710,9 @@ self: super: { ''; }); - # A simple MonadFail patch would do too, but not doing the tests is easier - megaparsec_6_5_0 = dontCheck super.megaparsec_6_5_0; - # The standard libraries are compiled separately idris = generateOptparseApplicativeCompletion "idris" ( - doJailbreak (dontCheck (super.idris.override { - # Needed for versions <= 1.3.1 https://github.com/idris-lang/Idris-dev/pull/4610 - megaparsec = self.megaparsec_6_5_0; - })) + doJailbreak (dontCheck super.idris) ); # https://github.com/bos/math-functions/issues/25 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 0202a8fde3b7..5f51b12a2e55 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2503,7 +2503,6 @@ extra-packages: - inline-c-cpp < 0.2 # required on GHC 8.0.x - lens-labels == 0.1.* # required for proto-lens-descriptors - mainland-pretty == 0.6.2.* # required for tensorflow-opgen-0.1.0.0 - - megaparsec < 7.0 # required for idris <= 1.3.1: https://github.com/idris-lang/Idris-dev/pull/4610 - mtl < 2.2 # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x - mtl-prelude < 2 # required for to build postgrest on mtl 2.1.x platforms - network == 2.6.3.1 # newer versions don't compile with GHC 7.4.x and below @@ -6368,7 +6367,6 @@ broken-packages: - identifiers - idiii - idna2008 - - idris - IDynamic - ieee-utils - iexcloud