Skip to content

curlMinimal: 8.20.0 -> 8.21.0#534906

Merged
mweinelt merged 5 commits into
NixOS:stagingfrom
Scrumplex:pkgs/curl/update-2026-06-001
Jun 26, 2026
Merged

curlMinimal: 8.20.0 -> 8.21.0#534906
mweinelt merged 5 commits into
NixOS:stagingfrom
Scrumplex:pkgs/curl/update-2026-06-001

Conversation

@Scrumplex

@Scrumplex Scrumplex commented Jun 24, 2026

Copy link
Copy Markdown
Member

https://github.com/curl/curl/releases/tag/curl-8_21_0

Things done

@nixpkgs-ci nixpkgs-ci Bot requested review from a team, andir, balsoft, infinisil and pyrox0 June 24, 2026 11:31
@nixpkgs-ci nixpkgs-ci Bot added 8.has: package (update) This PR updates a package to a newer version 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 10.rebuild-nixos-tests This PR causes rebuilds for all NixOS tests and should normally target the staging branches. 2.status: merge-bot eligible This PR can be merged by commenting "@NixOS/nixpkgs-merge-bot merge". labels Jun 24, 2026
@vcunat vcunat added the backport staging-26.05 Backport PR automatically label Jun 24, 2026
@vcunat

vcunat commented Jun 24, 2026

Copy link
Copy Markdown
Member

I assume we want to backport because https://curl.se/docs/vuln-8.20.0.html (and more are likely to come in future)

@Scrumplex

Copy link
Copy Markdown
Member Author

python3.14-pycapnp-2.2.3 on staging fails, blocking lix

@Scrumplex

Copy link
Copy Markdown
Member Author

As expected, the checkPhase of lix freezes with this curl version. I will add a patch that reverts curl/curl@2a2104f

@Scrumplex Scrumplex force-pushed the pkgs/curl/update-2026-06-001 branch from 4a77c1c to a474d85 Compare June 25, 2026 02:05
@nixpkgs-ci nixpkgs-ci Bot requested a review from a team June 25, 2026 02:15
@nixpkgs-ci nixpkgs-ci Bot removed 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 2.status: merge-bot eligible This PR can be merged by commenting "@NixOS/nixpkgs-merge-bot merge". labels Jun 25, 2026
@Scrumplex Scrumplex force-pushed the pkgs/curl/update-2026-06-001 branch from a474d85 to b891265 Compare June 25, 2026 02:47
@nixpkgs-ci nixpkgs-ci Bot requested a review from Liamolucko June 25, 2026 02:57
@nixpkgs-ci nixpkgs-ci Bot added the 6.topic: python Python is a high-level, general-purpose programming language. label Jun 25, 2026
@unclechu

Copy link
Copy Markdown
Member

As far as I can tell this update should fix Nheko-Reborn/nheko#2054 and remove the need for manual downgrading to 8.19.0

@Scrumplex

Copy link
Copy Markdown
Member Author

As far as I can tell this update should fix Nheko-Reborn/nheko#2054 and remove the need for manual downgrading to 8.19.0

That one was technically fixed in #522574, but it hasn't reached unstable yet. It has reached 26.05 though, so a downgrade shouldn't be needed there.

@Scrumplex

Copy link
Copy Markdown
Member Author

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 534906 --package curl.tests --package curlMinimal.tests --package curlFull.tests --package lix
Commit: b891265adaee9e743d8b43c836c78b26ffb0ddce


x86_64-linux

❌ 2 packages failed to build:
  • curl.tests.static
  • curlFull.tests.pycurl
✅ 29 packages built:
  • curl.tests.coeurl
  • curl.tests.curlpp
  • curl.tests.fetchpatch
  • curl.tests.haskell-curl
  • curl.tests.nginx-http3.angie
  • curl.tests.nginx-http3.nginx
  • curl.tests.ocaml-curly
  • curl.tests.php-curl
  • curl.tests.pkg-config
  • curl.tests.pycurl
  • curl.tests.withCheck
  • curlFull.tests.coeurl
  • curlFull.tests.curlpp
  • curlFull.tests.fetchpatch
  • curlFull.tests.haskell-curl
  • curlFull.tests.ocaml-curly
  • curlFull.tests.php-curl
  • curlFull.tests.pkg-config
  • curlFull.tests.withCheck
  • curlMinimal.tests.coeurl
  • curlMinimal.tests.curlpp
  • curlMinimal.tests.fetchpatch
  • curlMinimal.tests.haskell-curl
  • curlMinimal.tests.ocaml-curly
  • curlMinimal.tests.php-curl
  • curlMinimal.tests.pkg-config
  • curlMinimal.tests.pycurl
  • curlMinimal.tests.withCheck
  • lix

curlFull.tests.pycurl
ERROR tests/test_websocket.py::test_send_fragsize_equal_to_payload - RuntimeError: ws test server failed to start
ERROR tests/test_websocket.py::test_recv_raises_blocking_io_error_when_no_data - RuntimeError: ws test server failed to start
ERROR tests/test_websocket.py::test_default_mode_autopongs_server_ping - RuntimeError: ws test server failed to start
ERROR tests/test_websocket.py::test_ws_noautopong_disables_automatic_pong - RuntimeError: ws test server failed to start
ERROR tests/test_websocket.py::test_ws_noautopong_allows_manual_pong - RuntimeError: ws test server failed to start
ERROR tests/test_websocket_callback.py::test_write_callback_receives_frame[text] - RuntimeError: ws test server failed to start
ERROR tests/test_websocket_callback.py::test_write_callback_receives_frame[binary] - RuntimeError: ws test server failed to start
ERROR tests/test_websocket_callback.py::test_fragmented_callback_receive - RuntimeError: ws test server failed to start
ERROR tests/test_websocket_callback.py::test_close_frame_visible_in_callback - RuntimeError: ws test server failed to start
ERROR tests/test_websocket_callback.py::test_raw_mode_callback_receives_wire_bytes - RuntimeError: ws test server failed to start
ERROR tests/test_websocket_callback.py::test_write_callback_can_ws_send_reply - RuntimeError: ws test server failed to start
ERROR tests/test_websocket_callback.py::test_write_callback_can_ws_close - RuntimeError: ws test server failed to start
ERROR tests/test_websocket_callback.py::test_multi_write_callback_receives_frame - RuntimeError: ws test server failed to start
ERROR tests/test_websocket_callback.py::test_multi_write_callback_can_ws_send_reply - RuntimeError: ws test server failed to start
ERROR tests/test_websocket_callback.py::test_multi_write_callback_can_ws_close - RuntimeError: ws test server failed to start
ERROR tests/test_websocket_callback.py::test_write_callback_relaxation_does_not_allow_other_threads[ws_send] - RuntimeError: ws test server failed to start
ERROR tests/test_websocket_callback.py::test_write_callback_relaxation_does_not_allow_other_threads[ws_close] - RuntimeError: ws test server failed to start
ERROR tests/test_websocket_callback.py::test_write_callback_ws_recv_still_rejected - RuntimeError: ws test server failed to start
= 701 passed, 13 skipped, 11 deselected, 1 warning, 45 errors in 82.41s (0:01:22) =
successsuccesssuccesssuccesssuccesssuccesssuccesssuccesssuccesspart1part2

This reverts commit 9518afa.

Patch already included in 2.2.3 which causes applying the patch to fail
curl 8.21.0 contains
curl/curl@2a2104f
which breaks lix for some reason. Revert this single change just for lix
as a workaround

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
@Scrumplex Scrumplex force-pushed the pkgs/curl/update-2026-06-001 branch from d1ad4a8 to 7fc4368 Compare June 25, 2026 15:25
@Scrumplex Scrumplex force-pushed the pkgs/curl/update-2026-06-001 branch from 7fc4368 to ce9238c Compare June 26, 2026 15:09
@nixpkgs-ci nixpkgs-ci Bot requested a review from leona-ya June 26, 2026 15:15
@Scrumplex Scrumplex force-pushed the pkgs/curl/update-2026-06-001 branch from ce9238c to 1679ac9 Compare June 26, 2026 15:16
@Scrumplex

Scrumplex commented Jun 26, 2026

Copy link
Copy Markdown
Member Author

I am now able to build lix, curlMinimal.tests, curl.tests and curlFull.tests on x86_64-linux without failures on my branch.

I will skip the nixpkgs-review as I will need rebuild the whole world again.

@Scrumplex Scrumplex requested a review from Atemu June 26, 2026 15:23
curlFull comes with websockets support which seems to fail the
websockets tests in pycurl, as it needs python websockets.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
Backport of pycurl/pycurl#1028

Seems like a new release of pycurl is also imminent, which means we may
be able to drop this patch soon.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
@Scrumplex Scrumplex force-pushed the pkgs/curl/update-2026-06-001 branch from 1679ac9 to d97307b Compare June 26, 2026 15:32
@leona-ya leona-ya moved this from Needs Review to Reviewed in Nixpkgs security review Jun 26, 2026
@mweinelt mweinelt added this pull request to the merge queue Jun 26, 2026
Merged via the queue into NixOS:staging with commit 0c2e75f Jun 26, 2026
25 checks passed
@nixpkgs-ci

nixpkgs-ci Bot commented Jun 26, 2026

Copy link
Copy Markdown
Contributor

Backport failed for staging-26.05, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin staging-26.05
git worktree add -d .worktree/backport-534906-to-staging-26.05 origin/staging-26.05
cd .worktree/backport-534906-to-staging-26.05
git switch --create backport-534906-to-staging-26.05
git cherry-pick -x 940ca9b84b0a7b066ee8179dce01fbe03367ab46 ce113a1be55206fbb91c1969cb82f615d4dfc7ff 200ea92beda611794cfea33cfe23b314fab66d00 339d13830e1ef7c50d1a856e1e706b71881f4f69 d97307b76f4898528c59c895e86412d9607a9436

nixos-cuda-channel-updater Bot pushed a commit to nixos-cuda/nixpkgs that referenced this pull request Jun 29, 2026
Needs to forward `nonTeamMaintainers` instead of `maintainers`, because
the latter is autopopulated from the former, which in case of teams
means all teams members would be added as well.

This is what caused an update to curlMinimal to request individual team
members instead of the team itself: NixOS#534906
@vcunat

vcunat commented Jul 6, 2026

Copy link
Copy Markdown
Member

We're now starting some staging-next-26.05 builds and curl is still 8.20.0 in there... but if "we" are fast, we can still catch this bump in that cycle.

@Scrumplex

Copy link
Copy Markdown
Member Author

See #539051

@Scrumplex Scrumplex added 8.has: port to stable This PR already has a backport to the stable release. and removed 8.has: failed backport labels Jul 6, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: python Python is a high-level, general-purpose programming language. 8.has: package (update) This PR updates a package to a newer version 8.has: port to stable This PR already has a backport to the stable release. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 10.rebuild-nixos-tests This PR causes rebuilds for all NixOS tests and should normally target the staging branches. backport staging-26.05 Backport PR automatically

Projects

Status: Reviewed

Development

Successfully merging this pull request may close these issues.

6 participants