From 4b2b6ce65e3894391ee6a42b40fe5b6016f1592f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 29 May 2020 20:56:32 +0200 Subject: [PATCH] idris: drop obsolete overrides for the new 1.3.3 version The test suite still fails because of all kinds of implicit assumptions that are wrong in our build environment. For example, the test suite can't just call "idris" and expect that executable to be in $PATH. --- .../haskell-modules/configuration-common.nix | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d741d76d047..f57ac54dc86 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -710,18 +710,7 @@ self: super: { }); # The standard libraries are compiled separately. - # The megaparsec-7 override is needed because https://github.com/idris-lang/Idris-dev/issues/4826 declares that - # idris1 has no plans to migrate to megaparsec-8. - # The idris-lang/Idris-dev#4808 patch is for GHC 8.8 compatibility, and can likely be removed with the next release. - idris = generateOptparseApplicativeCompletion "idris" (doJailbreak (dontCheck - (appendPatches - (super.idris.override { megaparsec = self.megaparsec_7_0_5; }) [ - (pkgs.fetchpatch { - url = "https://github.com/idris-lang/Idris-dev/pull/4808.diff"; - sha256 = "060ib1rczy34ip8xf3bv1pf28655f6s0bvvij19jhh5dpcr0pf71"; - excludes = [ ".travis.yml" "Makefile" "appveyor.yml" ]; - }) - ]))); + idris = generateOptparseApplicativeCompletion "idris" (dontCheck super.idris); # https://github.com/bos/math-functions/issues/25 math-functions = dontCheck super.math-functions;