Skip to content

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 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
…talkative-or-higher

Print the Nix version when using `-vv` (or more) verbosity
@github-actions github-actions bot temporarily deployed to production October 22, 2025 10:53 Inactive
@github-actions github-actions bot temporarily deployed to pull request October 22, 2025 10:53 Inactive
edolstra and others added 5 commits October 22, 2025 15:08
…v1 case

This speeds up re-importing a 15 GiB closure in version 1 of the nario
format from 24.3s to 16.0s.
`StringSink` turns out to be pretty expensive if you have a bunch of
very large strings, since once the string gets big, it's allocated
outside of the regular heap via mmap. So every 4096 bytes we get a
page fault, and the whole string is returned to the OS when
`StringSink` is destroyed. So we have a huge system time overhead.

So reuse the `StringSink` for each NAR. This speeds up importing a 15
GB NixOS system closure (with numerous large NARs) from 15.7s to 7.4s.
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
@github-actions github-actions bot temporarily deployed to production October 22, 2025 15:28 Inactive
@github-actions github-actions bot temporarily deployed to pull request October 22, 2025 15:29 Inactive
Changes
```
git+file:///home/eelco/Dev/nix
├───checks
│   ├───aarch64-darwin
│   │   ├───installerScriptForGHA: omitted 'omitted (use '--all-systems' to show)'
...
        └───nix-util-tests-stdenv: derivation 'package 'nix-util-tests-3.11.3''
```
to
```
git+file:///home/eelco/Dev/nix
├───checks
│   ├───aarch64-darwin
│   │   ├───installerScriptForGHA: omitted (use '--all-systems' to show)
...
        └───nix-util-tests-stdenv: package 'nix-util-tests-3.11.3'
```
`skip()` can throw an exception, which we need to ignore since we may
be unwinding an exception.
@github-actions github-actions bot temporarily deployed to pull request October 23, 2025 15:19 Inactive
@github-actions github-actions bot temporarily deployed to production October 23, 2025 15:19 Inactive
@github-actions github-actions bot temporarily deployed to production October 23, 2025 17:38 Inactive
@github-actions github-actions bot temporarily deployed to pull request October 23, 2025 17:38 Inactive
…support-importing-result-of-fetchclosure

Allow access to the result of fetchClosure
@github-actions github-actions bot temporarily deployed to pull request October 23, 2025 19:44 Inactive
@edolstra edolstra changed the base branch from 2.31-maintenance to 2.32-maintenance October 27, 2025 10:47
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.

9 participants