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.

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

[haskell-updates]: Fix ghcide #86765

Merged

Conversation

maralorn
Copy link
Member

@maralorn maralorn commented May 4, 2020

Motivation for this change

This fixes ghcide as in #86656

Since @cdepillabout reviewed the one on 20.03, I guess you can also have a look at this?

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

Comment on lines 97371 to 97372
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
Copy link
Member

Choose a reason for hiding this comment

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

When you're sending a PR to haskell-updates, can you be sure not to edit the hackage-packages.nix file?

This is to reduce merge conflicts when it is updated automatically.

This post has a couple small pieces of advice when sending PRs to haskell updates:

https://discourse.nixos.org/t/call-to-action-for-updating-haskell-packages-after-bump-to-lts-15/6071

Copy link
Member Author

Choose a reason for hiding this comment

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

Okay, I uploaded a new version without any changes to haskell-packages.nix.

But now you can‘t test it …

Copy link
Member Author

Choose a reason for hiding this comment

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

Maybe I should have trodden the middleground there? Let me know what you think.

This is the haskell-updates version of NixOS#86659
@maralorn maralorn force-pushed the haskell-updates-fix-ghcide branch from 25f708b to 4bdb1cd Compare May 4, 2020 13:32
@maralorn maralorn requested a review from cdepillabout May 4, 2020 13:34
@cdepillabout cdepillabout merged commit f67b561 into NixOS:haskell-updates May 4, 2020
@cdepillabout
Copy link
Member

@maralon This looks good to me. Make sure to try this out again tomorrow after the Haskell packages get updated. If it doesn't compile for some reason, feel free to send another PR.


Just a heads up to @peti that haskell-updates won't eval until hackage packages are updated tomorrow. If there are any problems with eval after that, feel free to revert this commit and ping @maralorn.

@maralorn maralorn deleted the haskell-updates-fix-ghcide branch May 4, 2020 15:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants