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

[20.09] haskellPackages.hail: relax cabal dependencies to unbreak #103962

Merged
merged 2 commits into from
Nov 16, 2020

Conversation

blitz
Copy link
Contributor

@blitz blitz commented Nov 16, 2020

Motivation for this change

This is a backport of #103579. Original description follows:

The upstream version still contains very strict dependency
constraints. I've updated the patches to a version that relax these.
This unbreaks hail for me.

See james-preston/hail#16 for the upstream fix.

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.

@tfc @peti @cdepillabout

Sorry, something went wrong.

Verified

This commit was signed with the committer’s verified signature.
primeos Michael Weiss
The upstream version still contains very strict dependency
constraints. I've updated the patches to a version that relax these.
This unbreaks hail for me.

(cherry picked from commit cd11c0c)
@blitz blitz requested a review from cdepillabout as a code owner November 16, 2020 11:05
@blitz blitz requested review from peti and tfc November 16, 2020 11:06
@blitz blitz changed the title [20.09] Unbreak hail 20.09 [20.09] haskellPackages.hail: relax cabal dependencies to unbreak Nov 16, 2020
@ofborg ofborg bot added 6.topic: haskell 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Nov 16, 2020
Copy link
Member

@cdepillabout cdepillabout left a comment

Choose a reason for hiding this comment

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

Ah, sorry for the lack of documentation around this, but on the release branches you'll actually need to update the hail entry in pkgs/development/haskell-modules/hackage-packages.nix, since that file doesn't get updated automatically.

  • Please remove the broken = true; and hydraPlatforms = line for the hail derivation in pkgs/development/haskell-modules/hackage-packages.nix
  • Leave the change in pkgs/development/haskell-modules/configuration-hackage2nix.yaml, in case someone would want to regenerate the package set.

Verified

This commit was signed with the committer’s verified signature.
primeos Michael Weiss
This has to be done manually on release branches.
@ofborg ofborg bot added 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1 and removed 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Nov 16, 2020
@blitz
Copy link
Contributor Author

blitz commented Nov 16, 2020

@cdepillabout Thanks for the explanation! I've updated the PR.

@blitz blitz requested a review from cdepillabout November 16, 2020 16:00
@cdepillabout
Copy link
Member

Looks like this builds, thanks for fixing it up!

@cdepillabout cdepillabout merged commit 14cf906 into NixOS:release-20.09 Nov 16, 2020
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