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

curl: cherry-pick upstream patch for ipv6 url parsing #50905

Merged
merged 1 commit into from Nov 22, 2018
Merged

curl: cherry-pick upstream patch for ipv6 url parsing #50905

merged 1 commit into from Nov 22, 2018

Conversation

delroth
Copy link
Contributor

@delroth delroth commented Nov 22, 2018

Motivation for this change

Upstream bug: curl/curl#3218.

This causes nixos/tests/ipv6.nix to fix since the last staging merge.

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)
  • Fits CONTRIBUTING.md.

@delroth
curl: cherry-pick upstream patch for ipv6 url parsing
ed08ff4 
Upstream bug: curl/curl#3218.

This causes nixos/tests/ipv6.nix to fix since the last staging merge.
@delroth
Copy link
Contributor Author

delroth commented Nov 22, 2018

Tested with nix build -f nixos/release.nix tests.ipv6.x86_64-linux, fails currently on master, works with this PR.

Note that this test failure is presently blocking the unstable channel.

srhb
srhb approved these changes Nov 22, 2018
View reviewed changes
Copy link
Contributor

@srhb srhb left a comment

Choose a reason for hiding this comment

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

Normally I guess it should go to staging since it touches basically everything, but I'm not sure now since unstable is clearly blocked until this is in. @FRidh ?

@FRidh FRidh changed the base branch from master to staging-next November 22, 2018 08:58
@FRidh FRidh merged commit 90720d0 into NixOS:staging-next Nov 22, 2018
@FRidh
Copy link
Member

FRidh commented Nov 22, 2018

Let's get this into staging-next. I am positive those changes aren't causing any new trouble. Sometime tomorrow we should be able to merge staging-next into master and have our fix there, without causing rebuilds on master all day long.

@jokogr jokogr mentioned this pull request Nov 30, 2018
Closed
10 tasks
@nixos-discourse
Copy link

This pull request has been mentioned on Nix community. There might be relevant details there:

https://discourse.nixos.org/t/cherry-picking-commits-to-upgrade-unstable-nixos-channels/1553/1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@srhb srhb srhb approved these changes

Assignees
No one assigned
Labels
1.severity: blocker 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
5 participants
@delroth @FRidh @nixos-discourse @srhb @GrahamcOfBorg