Skip to content
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

Jump to bottom

Post ghc-9.2.1 config cleanup #2582

Merged
merged 6 commits into from
Jan 13, 2022
Merged

Post ghc-9.2.1 config cleanup #2582

merged 6 commits into from
Jan 13, 2022

Conversation

jneira
Copy link
Member

@jneira jneira commented Jan 13, 2022 •
edited by gitpod-io bot
Loading

  • I've removed grain coarsed allow-newer's and uncomment all subpackages to track what precise dependencies we need to get full ghc-9.2.1 support
  • Some changes in .cabal has being unveiled

@jneira
Copy link
Member Author

jneira commented Jan 13, 2022 •
edited
Loading

floskell has no allow-newer in cabal-ghc921.project so it seems to me it has more chances to work

brittany has:

 brittany:ghc-boot,
  brittany:ghc-boot-th,
  brittany:ghc,
  brittany:ghc-exactprint,
  brittany:bytestring,
  brittany:base,
  -- https://github.com/lspitzner/multistate/pull/8
  multistate:base,
  -- https://github.com/lspitzner/data-tree-print/pull/3
  data-tree-print:base,
  -- https://github.com/lspitzner/butcher/pull/8
  butcher:base,

so it will not work i guess

michaelpj
michaelpj reviewed Jan 13, 2022
View reviewed changes
haskell-language-server.cabal Outdated
@@ -283,7 +283,7 @@ common qualifyImportedNames
-- formatters

common floskell
if flag(floskell) && (impl(ghc < 9.2.1) || flag(ignore-plugins-ghc-bounds))
if flag(floskell) || flag(ignore-plugins-ghc-bounds))
Copy link
Collaborator

Choose a reason for hiding this comment

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

trailing paren

Copy link
Member Author

Choose a reason for hiding this comment

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

ugh I did the same error I just corrected in the other pr 🤦‍♂️

michaelpj
michaelpj reviewed Jan 13, 2022
View reviewed changes
haskell-language-server.cabal Outdated
@@ -293,7 +293,7 @@ common fourmolu
cpp-options: -Dfourmolu

common ormolu
if flag(ormolu)
if flag(ormolu) || flag(ignore-plugins-ghc-bounds))
Copy link
Collaborator

Choose a reason for hiding this comment

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

and here

michaelpj
michaelpj reviewed Jan 13, 2022
View reviewed changes
cabal-ghc921.project Outdated
@@ -6,33 +6,32 @@ packages:
./ghcide
./hls-plugin-api
./hls-test-utils
<<<<<<< HEAD
Copy link
Collaborator

Choose a reason for hiding this comment

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

mismerge

Copy link
Member Author

Choose a reason for hiding this comment

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

just was correcting it, thanks!

@jneira jneira merged commit 8804cbd into haskell:master Jan 13, 2022
@jneira jneira mentioned this pull request Jan 24, 2022
Closed
35 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@michaelpj michaelpj michaelpj approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@jneira @michaelpj