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

haskellPackages.github: Loosen version bounds at 0.26 #117853

Merged
merged 1 commit into from Mar 28, 2021

Conversation

gtgteq
Copy link
Contributor

@gtgteq gtgteq commented Mar 27, 2021

Motivation for this change

Gets github and spago building again.

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.

@sternenseemann
Copy link
Member

Thanks a lot, that fixes the build indeed!

Could you please rebase against the haskell-updates branch and change the target branch of this PR as well? We usually accumulate all Haskell-related changes and fixes into that branch and then stabilize and merge them together into master. The next PR to be merged is #116965 (it got delayed due to the OpenSSL update).

@cdepillabout Since you are maintainer for spago in haskellPackages: Do you think spago should get a fix on master as well? We did break quite significant packages in the last merge unfortunately — we've already ported fixes for niv and darcs to master in the last week…

@@ -1679,4 +1679,9 @@ self: super: {
# Issue reported upstream, no bug tracker url yet.
darcs = doJailbreak super.darcs;

github = appendPatch super.github (pkgs.fetchpatch {
Copy link
Member

Choose a reason for hiding this comment

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

Could you also add a comment above describing why this patch was added and when it can be removed (presumably at the next release if it was picked from github's master branch).

This helps with cleaning up unnecessary overrides.

@gtgteq gtgteq changed the base branch from master to haskell-updates March 27, 2021 23:56
@cdepillabout
Copy link
Member

Looks good, looks like this builds! Thanks!

Do you think spago should get a fix on master as well?

If fixes are already in haskell-updates, I generally don't directly fix on master.

However, I don't necessarily feel strongly about this either way. If there are some spago users that absolutely want spago working on master, I'm completely fine with fixing it directly on master.

@cdepillabout cdepillabout merged commit 5dec55d into NixOS:haskell-updates Mar 28, 2021
@gtgteq gtgteq deleted the gtgteq-github-0.26 branch March 28, 2021 02:28
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

3 participants