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.snap-server: patch for network >= 3.0 #75882

Merged
merged 1 commit into from
Dec 20, 2019
Merged

haskellPackages.snap-server: patch for network >= 3.0 #75882

merged 1 commit into from
Dec 20, 2019

Conversation

jerith666
Copy link
Contributor

Motivation for this change
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 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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @peti

patches are from snapframework/snap-server#126

@jerith666 jerith666 force-pushed the snap-server-network-fix branch from ba74f97 to fe3713f Compare December 19, 2019 02:09
@cdepillabout
Copy link
Member

@jerith666 Sorry I missed this earlier, but could you rebase this PR on the haskell-updates branch?

@turboMaCk
Copy link
Member

turboMaCk commented Dec 19, 2019 •
edited
Loading

thanks for this @jerith666 I was about to do this myself so you saved me some time:D

I can confirm this builds fine for me on nixos and that it fixes broken build of elmPackages.elm.

@jerith666 jerith666 force-pushed the snap-server-network-fix branch from fe3713f to 062d582 Compare December 20, 2019 01:36
@jerith666 jerith666 changed the base branch from master to haskell-updates December 20, 2019 01:37
@jerith666
Copy link
Contributor Author

comments added and rebased

@jonringer
Copy link
Contributor

there's a conflict, please rebase

git pull -r origin master

@jerith666 jerith666 force-pushed the snap-server-network-fix branch from 062d582 to f8a4352 Compare December 20, 2019 03:05
@jerith666
Copy link
Contributor Author

rebased to resolve the conflict & force-pushed

@cdepillabout
Copy link
Member

@jerith666 Thanks for working with us on fixing this up.

Looks good. I've tested that haskellPackages.snap-server now builds, so I am merging this in. This should be available on master when peti merges in #75857.

@cdepillabout cdepillabout merged commit 36b99db into NixOS:haskell-updates Dec 20, 2019
@cdepillabout cdepillabout mentioned this pull request Dec 20, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonringer jonringer jonringer left review comments

@cdepillabout cdepillabout cdepillabout left review comments

@basvandijk basvandijk Awaiting requested review from basvandijk

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

Successfully merging this pull request may close these issues.
4 participants
@jerith666 @cdepillabout @turboMaCk @jonringer