Skip to content

Upstream tracking#165

Draft
grahamc wants to merge 3076 commits into
2.34-maintenancefrom
main
Draft

Upstream tracking#165
grahamc wants to merge 3076 commits into
2.34-maintenancefrom
main

Conversation

@grahamc

@grahamc grahamc commented Jul 31, 2025

Copy link
Copy Markdown
Member

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
lilyinstarlight and others added 30 commits June 18, 2026 15:30
…essages

This was spamming a gazillion duplicated error messages to stderr:

error: Build failed due to failed dependency
error: Build failed due to failed dependency
error: Build failed due to failed dependency
error: Build failed due to failed dependency
error: Build failed due to failed dependency
error: Build failed due to failed dependency

Notably, it was just duplicating the more detailed errors above.

(cherry picked from commit d79b5a9)
We had too little headroom previously, since the default stack size
if 128KiB and half of that is typically consumed by a 64KiB buffer for
copying between Source/Sink.

512KiB should be more than enough for the limit that we have (64 levels
in NARs , which usually also bounds the recursion depth with some
constant factor).

(cherry picked from commit c37e17c)
…tenance

[Backport 2.34-maintenance] Get rid of duplicated 'Build failed due to failed dependency' error m…
External contributors can't access Determinate Secure Packages (a private
flake dependency of packaging/secure-packages), so the secure-packages
build jobs fail for PRs from forks. Gate those jobs on the PR coming from
the canonical repo, and run the non-DSP build jobs for fork PRs instead.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
For fork PRs the artifact-uploading build jobs are skipped, so nothing is
downloaded and the unquoted glob expands to the literal path, making mv
fail. Use nullglob so the loop is a no-op when there are no artifacts.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
…sts-in-sandbox

Allow local networking in libmicrohttpd and functional tests
Signed-off-by: Lisanna Dettwyler <lisanna.dettwyler@saronic.com>
(cherry picked from commit 09c8a1b)
…tenance

[Backport 2.34-maintenance] Fix boost format error when diff hook fails
Make queryMissing(), computeClosure() etc async
You now get:

  error: path '/nix/store/ksv7jr3gl2damnbnn6rcigrzh8wql0rc-missing-dependency' is required, but there is no substituter that can build it
  error: Cannot build '/nix/store/vis7l3rjqbb75kimqds2cqbm4wkf3qa2-test.drv'.
  Reason: 1 dependency failed.
  Output paths:
    /nix/store/y600378sad3qj81vn46g1lavwp7scgzl-test
Don't ignore substitution failures for BasicDerivation inputSrcs
The core of the issue is that the trampoline goal reported an arbitrary
exitCode, which without --keep-going ends up cancelling goals and we
end up dying with an assert in Goal::amDone().

See: NixOS#16042 (comment)
(cherry picked from commit f2c1d45)
Sync with upstream 2.34-maintenance
Recently, we added a `binary-cache-detsys-v1.sqlite` file, and these
instructions would not remove that.
…ache-cache-clearing

fixup: make binary cache nuclear option more general
This replaces the WantMassQuery and Priority SQLite columns with a
generic JSON field storing arbitrary nix-cache-info fields. This
allows fields to be added in the future without having to change the
database schema.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
…eneric-fields

NarInfoDiskCache: Support arbitrary nix-cache-info fields
Nixpkgs now uses structured attrs (i.e. env.<VAR>), so this override
wasn't working anymore. It makes a huge performance impact once GC
kicks in (e.g. it speeds up a 12-core `nix search nixpkgs` from 10.5
to 6.5 seconds).

Assisted-by: Claude Fable 5 <noreply@anthropic.com>
…k-size

Fix INITIAL_MARK_STACK_SIZE override in boehm-gc
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.