diff options
author | Peter Simons <simons@cryp.to> | 2020-05-29 20:56:32 +0200 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2020-05-29 22:28:47 +0200 |
commit | 4b2b6ce65e3894391ee6a42b40fe5b6016f1592f (patch) | |
tree | 61fc80176f2e48255f3723497e091226f996e308 | |
parent | a079858747ea99d724bb24b256b0f332c53ccfe7 (diff) | |
download | nixlib-4b2b6ce65e3894391ee6a42b40fe5b6016f1592f.tar nixlib-4b2b6ce65e3894391ee6a42b40fe5b6016f1592f.tar.gz nixlib-4b2b6ce65e3894391ee6a42b40fe5b6016f1592f.tar.bz2 nixlib-4b2b6ce65e3894391ee6a42b40fe5b6016f1592f.tar.lz nixlib-4b2b6ce65e3894391ee6a42b40fe5b6016f1592f.tar.xz nixlib-4b2b6ce65e3894391ee6a42b40fe5b6016f1592f.tar.zst nixlib-4b2b6ce65e3894391ee6a42b40fe5b6016f1592f.zip |
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.
-rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d741d76d047d..f57ac54dc860 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; |