Skip to content

haskellPackages.idris: Fix build (new GHC 8.8 & old megaparsec 7) #84131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cdepillabout merged 1 commit into from
Apr 4, 2020
Merged

haskellPackages.idris: Fix build (new GHC 8.8 & old megaparsec 7) #84131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -716,10 +716,19 @@ self: super: {
'';
});

# The standard libraries are compiled separately
idris = generateOptparseApplicativeCompletion "idris" (
doJailbreak (dontCheck super.idris)
);
# 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" ];
})
Comment on lines 725 to 730
Copy link
Member

@cdepillabout cdepillabout Apr 3, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you add a comment to both the override and the fetchpatch lines describing why they are needed, linking to any relevant upstream issues/PRs, and adding a guess about when they can be removed (when a new upstream version is released??).

Also, please rebase this onto haskell-updates and change the base branch on Github to haskell-updates.

Copy link
Member Author

@chkno chkno Apr 3, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done. Thanks!

])));

# https://github.com/bos/math-functions/issues/25
math-functions = dontCheck super.math-functions;
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2387,6 +2387,7 @@ 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.4 && < 8 # required for idris: https://github.com/idris-lang/Idris-dev/issues/4826
- 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
Expand Down Expand Up @@ -6391,7 +6392,6 @@ broken-packages:
- identifiers
- idiii
- idna2008
- idris
- IDynamic
- ieee-utils
- iexcloud
Expand Down
23 changes: 21 additions & 2 deletions pkgs/development/haskell-modules/hackage-packages.nix
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.