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.

Sign up for GitHub

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

ghc841: semi-automated updates #36781

Merged
merged 15 commits into from Mar 12, 2018
Merged

ghc841: semi-automated updates #36781

merged 15 commits into from Mar 12, 2018

Conversation

deepfire
Copy link
Contributor

@deepfire deepfire commented Mar 10, 2018 •
edited

  • interned the manual changes to the GHC 8.4 package set (except the markBroken things, which are maintained as plaintext)
  • dropped stale overrides
  • new fixes
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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/)
  • Fits CONTRIBUTING.md.

@deepfire deepfire requested a review from peti as a code owner March 10, 2018 23:57
@deepfire
Copy link
Contributor Author

cc @peti

peti
peti requested changes Mar 11, 2018
View reviewed changes
Copy link
Member

@peti peti left a comment

Choose a reason for hiding this comment

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

There are merge conflicts with current master, I'm afraid.

@peti
Copy link
Member

peti commented Mar 11, 2018

@deepfire, I've given you push access to https://github.com/peti/nixpkgs. The haskell-updates branch in that repository is updated automatically to have the latest packages from Stackage LTS 10.x and Hackage (for those packages not found in Stackage), and it's continuously built at https://hydra.nixos.org/jobset/nixpkgs/haskell-updates. If you'd like to, then you can push those kind of updates directly to that branch and have them test-built. Also, this approach avoids merge conflicts with changes I do in that branch in the mean time, like it has happened with this PR.

@deepfire
Copy link
Contributor Author

deepfire commented Mar 12, 2018 •
edited

@peti, I see -- thank you!

Fixed the conflicts and updated the package set.

@peti peti merged commit a9e1ae3 into NixOS:master Mar 12, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@peti peti peti approved these changes

Assignees
No one assigned
Labels
6.topic: haskell 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@deepfire @peti @GrahamcOfBorg