Skip to content

Upstream tracking#165

Draft
grahamc wants to merge 2792 commits into2.34-maintenancefrom
main
Draft

Upstream tracking#165
grahamc wants to merge 2792 commits into2.34-maintenancefrom
main

Conversation

@grahamc
Copy link
Copy Markdown
Member

@grahamc grahamc commented Jul 31, 2025

Motivation

Not intended to be merged directly. This PR is a convenience to show the diff between upstream Nix and Determinate Nix (the main branch).

Continuation of #4.

@grahamc grahamc requested a review from edolstra as a code owner July 31, 2025 17:14
@github-actions github-actions Bot temporarily deployed to production July 31, 2025 17:14 Inactive
@DeterminateSystems DeterminateSystems locked as off-topic and limited conversation to collaborators Jul 31, 2025
@github-actions github-actions Bot temporarily deployed to pull request July 31, 2025 18:20 Inactive
@github-actions github-actions Bot temporarily deployed to production July 31, 2025 18:21 Inactive
@cole-h cole-h marked this pull request as draft August 1, 2025 14:26
@github-actions github-actions Bot temporarily deployed to pull request August 4, 2025 22:15 Inactive
@github-actions github-actions Bot temporarily deployed to commit August 4, 2025 22:15 Inactive
@github-actions github-actions Bot temporarily deployed to production August 4, 2025 22:15 Inactive
@github-actions github-actions Bot temporarily deployed to production August 5, 2025 14:25 Inactive
@github-actions github-actions Bot temporarily deployed to pull request August 5, 2025 14:25 Inactive
@github-actions github-actions Bot temporarily deployed to pull request August 7, 2025 15:58 Inactive
@github-actions github-actions Bot temporarily deployed to production August 7, 2025 15:58 Inactive
@github-actions github-actions Bot temporarily deployed to pull request August 7, 2025 23:01 Inactive
@github-actions github-actions Bot temporarily deployed to production August 7, 2025 23:02 Inactive
@github-actions github-actions Bot temporarily deployed to pull request August 10, 2025 16:36 Inactive
@github-actions github-actions Bot temporarily deployed to production August 10, 2025 16:36 Inactive
@github-actions github-actions Bot temporarily deployed to pull request August 10, 2025 20:06 Inactive
@github-actions github-actions Bot temporarily deployed to production August 10, 2025 20:06 Inactive
@github-actions github-actions Bot temporarily deployed to production August 19, 2025 15:04 Inactive
@github-actions github-actions Bot temporarily deployed to pull request August 19, 2025 15:04 Inactive
@github-actions github-actions Bot temporarily deployed to production August 20, 2025 10:41 Inactive
@github-actions github-actions Bot temporarily deployed to pull request August 20, 2025 10:41 Inactive
@github-actions github-actions Bot temporarily deployed to commit August 20, 2025 10:41 Inactive
@github-actions github-actions Bot temporarily deployed to pull request August 25, 2025 16:07 Inactive
@github-actions github-actions Bot temporarily deployed to production August 25, 2025 16:07 Inactive
@github-actions github-actions Bot temporarily deployed to production August 25, 2025 16:14 Inactive
RossComputerGuy and others added 30 commits May 5, 2026 14:52
We just start over and discard the data we've already received.
…oads

Support resuming from binary caches that don't support ranged requests
This allows a log processor to see which messages belong to the same
session. What constitutes a session is up to the user. By default,
every Nix command invocation is its own session (a random UUID like
31d57f8c-5de0-46ca-8684-81f1e61999aa), but you can use the
`session-id` setting to give a group of invocations the same session.
These fields are in fact optional, and various binary cache
implementations do not return them (e.g. when NARs are compressed on
the fly).
This is a built-in binary cache server, similar to nix-serve. It uses
libmicrohttpd.
If we have a negative path info cache entry for the path being added
(e.g. due to a prior call to maybeQueryPathInfo()), then we need to
use isValidPathUncached(), otherwise addToStore() will fail.
An operation like

  $ nix path-info --store https://cache.nixos.org /nix/store/2lwxwsaixnaq561hbq02v5236935ass8-coreutils-full-9.8 -vv

previously resulted in multiple downloads of the same .narinfo:

  downloading 'https://cache.nixos.org/2lwxwsaixnaq561hbq02v5236935ass8.narinfo'...
  querying info about '/nix/store/2lwxwsaixnaq561hbq02v5236935ass8-coreutils-full-9.8' on 'https://cache.nixos.org'...
  downloading 'https://cache.nixos.org/2lwxwsaixnaq561hbq02v5236935ass8.narinfo'...

This is because queryMissing() calls isValidPath(), which causes a
HEAD request to the binary cache. Subsequently we call
queryValidPath(), which requires an additional GET request. It's
better to do a HEAD request right away.

(Of course, it's a bit questionable whether `nix path-info` should
call queryMissing() in the first place...)
…998-5408-415d-888c-22b360e92308

Release v3.20.0
Restore resBuildResult fields for failed builds
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.