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

Jump to bottom

[haskell-updates] haskellPackages.ghcide: 0.1.0 -> 0.2.0 (fix build) #89447

Merged
merged 1 commit into from Jun 4, 2020
Merged

[haskell-updates] haskellPackages.ghcide: 0.1.0 -> 0.2.0 (fix build) #89447

merged 1 commit into from Jun 4, 2020

Conversation

maralorn
Copy link
Member

@maralorn maralorn commented Jun 3, 2020

I decided to leave haskell-lsp and haskell-lsp-types as extra packages,
because they will get bumped before the next ghcide release, and then
the version pinned by ghcide would be missing again.

Also I have run hackage2nix to automatically generate the changes.

If desired I can split the second part into its own commit, would that be better?

Motivation for this change

Fix new ghcide version.

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 via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@maralorn maralorn changed the title haskellPackages.ghcide: 0.1.0 -> 0.2.0 (fix build) [haskell-updates] haskellPackages.ghcide: 0.1.0 -> 0.2.0 (fix build) Jun 3, 2020
@cdepillabout
Copy link
Member

cdepillabout commented Jun 4, 2020 •
edited

@maralorn In general we don't modify the hackage-packages.nix file manually, but wait for the automatic daily update thing to run. (Which is slightly annoying, because it is hard to test that the PR will actually work.)

Could you remove the changes to hackage-packages.nix from this PR?

Once you do that, I'll merge this in.

@maralorn
Copy link
Member Author

maralorn commented Jun 4, 2020 •
edited

@cdepillabout Last friday @peti said, that he is totally open for others to also run the hackage-packages.nix update. So I thought this is fine.

I saw him rebasing all updates together before merging into master so maybe I should do it into it's own commit with the standard commit-message that ./update-nixpkgs.sh generates?

I think doing PRs like this is better for testing. But we can stick with the other way if that‘s preferred.

EDIT: Anyways I removed it, because I prefer this PR to be merged quickly.

@maralorn
haskellPackages.ghcide: 0.1.0 -> 0.2.0 (fix build)
e846507 
I decided to leave haskell-lsp and haskell-lsp-types as extra packages,
because they will get bumped before the next ghcide release, and then
the version pinned by ghcide would be missing again.
@cdepillabout
Copy link
Member

cdepillabout commented Jun 4, 2020 •
edited

@maralorn Ah, okay, if @peti is okay with it, then it works for me!

I'll let him comment here before I merge it though.

edit: Oh, I see that you removed the change. I'll go ahead and merge it in then.

@cdepillabout cdepillabout merged commit a245c72 into NixOS:haskell-updates Jun 4, 2020
@peti
Copy link
Member

peti commented Jun 4, 2020

In general we don't modify the hackage-packages.nix file manually, but wait for the automatic daily update thing to run.

I believe that no harm can come from people submitting changes to hackage-packages.nix that were generated by running hackage2nix properly. Those changes should not cause any merge conflicts when the generator commits the next update since it generates the exact same change. What we don't is people committing random manual changes to the file, obviously, but changes that come from hackage2nix should be safe.

@cdepillabout
Copy link
Member

@peti That makes sense.

In the future, I'll be sure to merge PRs even if they contain changes to hackage-packages.nix, as long as those changes have been generated by hackage2nix properly.

@maralorn maralorn deleted the fix-ghcide branch June 4, 2020 07:46
@ggreif ggreif mentioned this pull request Jun 12, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cdepillabout cdepillabout Awaiting requested review from cdepillabout

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

Successfully merging this pull request may close these issues.

None yet
3 participants
@maralorn @cdepillabout @peti