Skip to content

Upstream tracking #165

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.

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

Draft
wants to merge 1,248 commits into
base: 2.30-maintenance
Choose a base branch
from
Draft

Upstream tracking #165

wants to merge 1,248 commits into from

Conversation

grahamc
Copy link
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 and others added 30 commits June 12, 2025 16:49
Re-supply inadvertently deleted word
An override like

  inputs.foo.inputs.bar.inputs.nixpkgs.follows = "nixpkgs";

implicitly set `inputs.foo.inputs.bar` to `flake:bar`, which led to an
unexpected error like

  error: cannot find flake 'flake:bar' in the flake registries

We now no longer create a parent override (like for `foo.bar` in the
example above) if it doesn't set an explicit ref or follows
attribute. We only recursively apply its child overrides.

Fixes NixOS#8325, #95, NixOS#12083, NixOS#5790.
Taken from NixOS#6621.

Co-authored-by: Sebastian Ullrich <[email protected]>
Having both doesn't make sense so it's best to disallow it. If this
causes issues we could turn into a warning.
…00-94c6-44df-b2b1-12e5750b76fc

Release v3.6.3
…a9-a290-409e-90f9-a3497b03c021

Release v3.6.4
This determines whether lock file entries omit a NAR hash. They're
included by default to make lazy trees compatible with older clients.
…hase

This lets these steps run in maximal parallelism.

This also uses a success job to "combine" all the component jobs into a single signal.

This also collapses the publish step into the ci job so we don't double-run
Move the actual vm tests / flake regressions into the generic build phase
86785fd was broken because it was
storing the full path in the MountedSourceAccessor as the `path` field
in the fetcher cache key (i.e. including the
/nix/store/... prefix). Especially in the case of lazy (virtual) store
paths, this didn't work at all because those paths are different every time.
…st, since we do want to build them on every other trigger
…81-3e31-4930-9336-7f1a66cf35e7

Release v3.8.5
@github-actions github-actions bot temporarily deployed to pull request 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
…alid paths

This caused RemoteStore::queryPathInfoUncached() to mark the
connection as invalid (see
RemoteStore::ConnectionHandle::~ConnectionHandle()), causing it to
disconnect and reconnect after every lookup of an invalid path. This
caused huge slowdowns in conjunction with
19f89eb and lazy-trees.
…sconnect

BasicClientConnection::queryPathInfo(): Don't throw exception for invalid paths
@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
RemoteStore::queryPathInfoUncached() is expected to return null, not
thrown an InvalidPath exception, if the path is invalid.
This is superfluous since those paths don't exist.
…hing

Fix queryPathInfo() negative caching
@github-actions github-actions bot temporarily deployed to pull request August 10, 2025 20:06 Inactive
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.

6 participants