haskellPackages.idris: unbreak by applying patches from master

We need to fix two compilation errors caused by breaking changes in
dependencies of idris 1.3.3:

* haskeline >= 0.8
* megaparsec >= 0.9

For both there is a patch on idris master which we can just apply. Both
can presumably removed as soon as the next release of idris 1 hits.

Co-authored-by: Jake Gillberg <jake.gillberg@protonmail.com>
wip/yesman
sternenseemann 3 years ago
parent cf5345e696
commit 1bd9bbc335
  1. 22
      pkgs/development/haskell-modules/configuration-common.nix
  2. 1
      pkgs/development/haskell-modules/configuration-hackage2nix.yaml

@ -684,8 +684,26 @@ self: super: {
'';
});
# The standard libraries are compiled separately.
idris = generateOptparseApplicativeCompletion "idris" (dontCheck super.idris);
# * The standard libraries are compiled separately.
# * We need multiple patches from master to fix compilation with
# updated dependencies (haskeline and megaparsec) which can be
# removed when the next idris release (1.3.4 probably) comes
# around.
idris = generateOptparseApplicativeCompletion "idris"
(doJailbreak (dontCheck
(appendPatches super.idris [
# compatibility with haskeline >= 0.8
(pkgs.fetchpatch {
url = "https://github.com/idris-lang/Idris-dev/commit/89a87cf666eb8b27190c779e72d0d76eadc1bc14.patch";
sha256 = "0fv493zlpgjsf57w0sncd4vqfkabfczp3xazjjmqw54m9rsfix35";
})
# compatibility with megaparsec >= 0.9
(pkgs.fetchpatch {
url = "https://github.com/idris-lang/Idris-dev/commit/6ea9bc913877d765048d7cdb7fc5aec60b196fac.patch";
sha256 = "0yms74d1xdxd1c08dnp45nb1ddzq54n6hqgzxx0r494wy614ir8q";
})
])
));
# https://github.com/pontarius/pontarius-xmpp/issues/105
pontarius-xmpp = dontCheck super.pontarius-xmpp;

@ -6996,7 +6996,6 @@ broken-packages:
- identifiers
- idiii
- idna2008
- idris
- IDynamic
- ieee-utils
- iexcloud

Loading…
Cancel
Save