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

haskellPackages.beam-*: remove obsolete patches #60477

Merged
merged 1 commit into from Apr 30, 2019
Merged

haskellPackages.beam-*: remove obsolete patches #60477

merged 1 commit into from Apr 30, 2019

Conversation

endgame
Copy link
Contributor

@endgame endgame commented Apr 30, 2019

Motivation for this change

I was pinged in #59409 because beam stuff had stopped building. Looks like a new version came out after I stopped caring about beam.

This will need a hackage-packages.nix update after merge. Not sure if I did the hackage2nix config changes correctly. I believe I have based this change on the correct branch, but will happily rebase if required.

Ping @peti

Things done

I have built the updated version of beam against default GHC and GHC 8.4.4, using the following commands:

nix build '((import ./. { config.allowBroken = true; }).haskellPackages.ghcWithPackages(p: with p; [beam-core beam-migrate beam-mysql beam-postgres beam-sqlite]))'
nix build '((import ./. { config.allowBroken = true; }).haskell.packages.ghc844.ghcWithPackages(p: with p; [beam-core beam-migrate beam-mysql beam-postgres beam-sqlite]))'
  • 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 nix-review --run "nix-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.

@endgame endgame requested a review from basvandijk as a April 30, 2019 11:32
@peti peti force-pushed the haskell-updates branch 2 times, most recently from 42ea101 to f95a6c4 Compare April 30, 2019 11:44
@peti peti changed the base branch from haskell-updates to master April 30, 2019 11:49
@peti peti changed the base branch from master to haskell-updates April 30, 2019 11:49
@peti
Copy link
Member

peti commented Apr 30, 2019

Can you please re-base the PR to the current version of haskell-updates to fix the merge conflicts? The branch had its history re-written prior to being merged into master and it appears you opened the PR right in the middle of that.

@endgame
Copy link
Contributor Author

endgame commented Apr 30, 2019

Done.

@peti peti merged commit 641aa71 into NixOS:haskell-updates Apr 30, 2019
@endgame endgame deleted the remove-beam-patches branch April 30, 2019 12:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@basvandijk basvandijk Awaiting requested review from basvandijk

Assignees
No one assigned
Labels
2.status: merge conflict 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
2 participants
@endgame @peti