Skip to content

Sync with upstream 2.35#530

Draft
edolstra wants to merge 1025 commits into
mainfrom
sync-2.35
Draft

Sync with upstream 2.35#530
edolstra wants to merge 1025 commits into
mainfrom
sync-2.35

Conversation

@edolstra

@edolstra edolstra commented Jul 2, 2026

Copy link
Copy Markdown
Collaborator

Motivation

WIP, not finished yet.

Context

edolstra added 30 commits July 2, 2026 17:51
Upstream commit 4a5d960 ("Remove dependent realisations") changed
the serialization of 'builtOutputs' in build result log messages: the
'id' and 'dependentRealisations' fields are gone. Update the test
regex accordingly.

Assisted-by: Claude Fable 5 <noreply@anthropic.com>
The merge of upstream commit 141053f ("configurable HTTP retry
with full-jitter backoff") reverted the canRetry condition to the old
upstream logic, which refuses to retry a download once bytes have
been streamed to the sink unless the server accepts byte ranges. This
lost the behavior introduced in 6839d85: restarting from scratch
and discarding already-received data. The discard machinery survived
the merge but was unreachable.

Relax the condition again so that streamed downloads can be retried
whenever the response is uncompressed, resuming via a Range request
if possible and restarting otherwise. Fixes the truncated-NAR part of
tests/functional/binary-cache.sh.

Assisted-by: Claude Fable 5 <noreply@anthropic.com>
edolstra added 29 commits July 17, 2026 22:53
@github-actions
github-actions Bot temporarily deployed to pull request July 17, 2026 22:16 Inactive
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

flake-regression-test Run the flake regressions test suite on this PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant