Skip to content

Upstream tracking#4

Closed
edolstra wants to merge 1221 commits into2.30-maintenancefrom
detsys-main
Closed

Upstream tracking#4
edolstra wants to merge 1221 commits into2.30-maintenancefrom
detsys-main

Conversation

@edolstra
Copy link
Copy Markdown
Collaborator

@edolstra edolstra commented Mar 5, 2025

Motivation

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

Context


Add 👍 to pull requests you find important.

The Nix maintainer team uses a GitHub project board to schedule and track reviews.

@github-actions
Copy link
Copy Markdown

github-actions bot commented Mar 5, 2025

@github-actions github-actions bot temporarily deployed to production March 5, 2025 18:45 Inactive
@github-actions github-actions bot temporarily deployed to pull request March 5, 2025 18:45 Inactive
@github-actions github-actions bot temporarily deployed to production March 5, 2025 19:07 Inactive
@github-actions github-actions bot temporarily deployed to pull request March 5, 2025 19:10 Inactive
@github-actions github-actions bot temporarily deployed to production March 5, 2025 20:26 Inactive
@github-actions github-actions bot temporarily deployed to pull request March 5, 2025 20:28 Inactive
@github-actions github-actions bot temporarily deployed to production March 5, 2025 20:36 Inactive
@github-actions github-actions bot temporarily deployed to pull request March 5, 2025 20:36 Inactive
@github-actions github-actions bot temporarily deployed to production March 5, 2025 20:56 Inactive
@github-actions github-actions bot temporarily deployed to pull request March 5, 2025 20:56 Inactive
@github-actions github-actions bot temporarily deployed to production March 6, 2025 17:59 Inactive
@github-actions github-actions bot temporarily deployed to pull request March 6, 2025 18:01 Inactive
@github-actions github-actions bot temporarily deployed to production March 7, 2025 00:00 Inactive
@github-actions github-actions bot temporarily deployed to pull request March 7, 2025 00:02 Inactive
@github-actions github-actions bot temporarily deployed to production March 12, 2025 13:41 Inactive
@github-actions github-actions bot temporarily deployed to pull request March 12, 2025 13:42 Inactive
@grahamc
Copy link
Copy Markdown
Member

grahamc commented Mar 12, 2025

I'm locking the discussion on this PR, since it is never intended to merge, and only serve as a standing comparison.

@DeterminateSystems DeterminateSystems locked as off-topic and limited conversation to collaborators Mar 12, 2025
@github-actions github-actions bot temporarily deployed to production March 25, 2025 16:24 Inactive
@edolstra edolstra changed the base branch from 2.26-maintenance to 2.27-maintenance March 25, 2025 20:17
@github-actions github-actions bot temporarily deployed to production March 27, 2025 18:34 Inactive
@github-actions github-actions bot temporarily deployed to production March 27, 2025 19:40 Inactive
@github-actions github-actions bot temporarily deployed to production March 27, 2025 20:06 Inactive
@github-actions github-actions bot temporarily deployed to production March 28, 2025 15:05 Inactive
@github-actions github-actions bot temporarily deployed to production March 28, 2025 16:55 Inactive
@github-actions github-actions bot temporarily deployed to production March 28, 2025 17:42 Inactive
edolstra and others added 29 commits July 22, 2025 12:20
This is a workaround for NixOS#13515
(opening the SQLite DB randomly taking a couple of seconds on ZFS).
(cherry picked from commit 6896761)
Previously, if you don't have Internet connectivity, tab completion
might try to fetch the flake registry, e.g.

  $ NIX_GET_COMPLETIONS=4 nix build -vvvvv --offline /home/eelco/De
  evaluating file '<nix/derivation-internal.nix>'
  downloading 'https://channels.nixos.org/flake-registry.json'...
  warning: error: unable to download 'https://channels.nixos.org/flake-registry.json': Could not resolve hostname (6) Could not resolve host: channels.nixos.org; retrying in 294 ms
  warning: error: unable to download 'https://channels.nixos.org/flake-registry.json': Could not resolve hostname (6) Could not resolve host: channels.nixos.org; retrying in 541 ms
  warning: error: unable to download 'https://channels.nixos.org/flake-registry.json': Could not resolve hostname (6) Could not resolve host: channels.nixos.org; retrying in 1230 ms
  warning: error: unable to download 'https://channels.nixos.org/flake-registry.json': Could not resolve hostname (6) Could not resolve host: channels.nixos.org; retrying in 2285 ms
  warning: error: unable to download 'https://channels.nixos.org/flake-registry.json': Could not resolve hostname (6) Could not resolve host: channels.nixos.org; using cached version
Tagging release 2.30.2
Co-authored-by: Cole Helbling <cole.e.helbling@outlook.com>
…hing

Avoid isValidPath(), use queryPathInfo() instead
…n-detsys

Imply --offline during tab completion
SQLite: fsync db.sqlite-shm before opening the database
Make GitFileSystemObjectSink multi-threaded
Adding paths to the store can be slow due to I/O overhead, but
especially when going through the daemon because of the round-trip
latency of every wopAddToStore call.

So we now do the addToStore() calls asynchronously from a separate
thread from the evaluator. This slightly speeds up the local store,
and makes going through the daemon almost as fast as a local store.
This change brings our Determinate Nix source repository in line with our standard branch naming.
One reason we used detsys-main was to avoid confusion in case the upstream NixOS/nix repository changed its default branch to main.
I don't anticipate that happening any time soon if ever, and so let's make the change.

Having this repo have a different branch name has a non-zero cost for humans ("oh right, different branch") and code to account for it.

Since we're shifting to internally run from `trunk()` (hi, jj) in more places, it's a "do it or don't" moment.
I choose to do it.
@grahamc
Copy link
Copy Markdown
Member

grahamc commented Jul 31, 2025

Upstream tracking continues here: #165

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants