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

GHC 8.6 fixes and bound relaxation #53680

Merged
merged 3 commits into from Jan 30, 2019

Conversation

@endgame
Copy link
Contributor

commented Jan 9, 2019

Motivation for this change

A haskell project I am working on cannot enter a nix-shell from nixpkgs master. This fixes some of the problems. Some problems are due to ghc 8.6 (e.g., the MonadFail fixes for beam) but some are due to version bounds that have become too tight.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@domenkozar

This comment has been minimized.

Copy link
Member

commented Jan 10, 2019

@GrahamcOfBorg build haskell.packages.ghc844.beam-core

@endgame endgame force-pushed the endgame:ghc-8.6-and-bound-relaxation branch from 08d8a9b to 48bac25 Jan 14, 2019

@endgame

This comment has been minimized.

Copy link
Contributor Author

commented Jan 14, 2019

@domenkozar I've re-pushed with fixed line endings in the patch files. Can you please ask ofborg to rebuild?

(GHC 8.4.4 will fail because the fix that adds contravariant to aeson's deps hasn't landed yet. See #53748)

@peti
Copy link
Member

left a comment

Can you please report those issues upstream and add the appropriate ticket URLs into the source code next to the override?

@peti
Copy link
Member

left a comment

Oh, I spoke too early. I now noticed that most patches have an upstream ticket URL -- only the one for servant-docs didn't. So never mind my previous comment.

However, could you please download the patches you've submitted in PRs from github rather than checking them into the Nixpkgs repository?

@endgame

This comment has been minimized.

Copy link
Contributor Author

commented Jan 23, 2019

@peti Thanks for the review. I never filed an upstream bug for servant-docs, since phadej, who is maintainer of tdigest and servant, doesn't push new versions or metadata revisions just to fix test depends. See phadej/tdigest#30 . I can add an "until servant-0.whatever is released" comment instead?

As for the beam patches, I think I can make that work. I'll need to fiddle patchFlags, though.

@peti

This comment has been minimized.

Copy link
Member

commented Jan 29, 2019

I can add an "until servant-0.whatever is released" comment instead?

Yes, that would be nice!

endgame added 2 commits Jan 9, 2019
haskellPackages.servant-docs: jailbreak
Upstream doesn't publish releases or revisions to relax test bounds.
haskellPackages.tdigest: jailbreak
Upstream doesn't publish releases or revisions to relax test bounds.

@endgame endgame force-pushed the endgame:ghc-8.6-and-bound-relaxation branch from 48bac25 to ed241de Jan 29, 2019

@endgame

This comment has been minimized.

Copy link
Contributor Author

commented Jan 29, 2019

@peti I have pushed a new branch with a new comment for servant-docs. I do not have time to re-do the patch files (which I had to assemble from a couple of places which I can't find right now). Is that a blocker for the merge?

@peti peti changed the base branch from master to haskell-updates Jan 30, 2019

@peti

This comment has been minimized.

Copy link
Member

commented Jan 30, 2019

Is that a blocker for the merge?

No, it's okay. Thank you very much for your efforts. I'll merge these changes into haskell-updates first. Then they'll go to master once the test builds have succeeded.

@peti peti merged commit e95f298 into NixOS:haskell-updates Jan 30, 2019

9 of 10 checks passed

grahamcofborg-eval Checking original out paths
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details

@endgame endgame deleted the endgame:ghc-8.6-and-bound-relaxation branch Jan 30, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.