Upstream tracking#165
Draft
grahamc wants to merge 2983 commits into
Draft
Conversation
LocalStore: Implement addMultipleToStore()
Build against Determinate Secure Packages
…66f-0071-4f2e-8045-8dd066c91df8 Release v3.21.1
Add manpage entries for commands that were missing from nix3_manpages, as found by walking the full command tree from `nix __dump-cli`. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Add missing manpages
Using operator() caused very ugly clang formatting, e.g.
state.stmts->RegisterValidPath
.use()(printStorePath(info.path))(info.narHash.to_string(HashFormat::Base16, true))(
info.registrationTime == 0 ? time(nullptr) : info.registrationTime)(
info.deriver ? printStorePath(*info.deriver) : "",
(bool) info.deriver)(info.narSize, info.narSize != 0)(info.ultimate ? 1 : 0, info.ultimate)(
concatStringsSep(" ", Signature::toStrings(info.sigs)),
!info.sigs.empty())(renderContentAddress(info.ca), (bool) info.ca)
This was especially painful when there was a merge conflict involving
this type of code.
Now it looks like this:
state.stmts->RegisterValidPath.use()
.apply(printStorePath(info.path))
.apply(info.narHash.to_string(HashFormat::Base16, true))
.apply(info.registrationTime == 0 ? time(nullptr) : info.registrationTime)
.apply(info.deriver ? printStorePath(*info.deriver) : "", (bool) info.deriver)
.apply(info.narSize, info.narSize != 0)
.apply(info.ultimate ? 1 : 0, info.ultimate)
.apply(concatStringsSep(" ", Signature::toStrings(info.sigs)), !info.sigs.empty())
.apply(renderContentAddress(info.ca), (bool) info.ca)
(cherry picked from commit 509aaa0)
SQLiteStmt::Use: Rename operator() -> apply()
Since it does a lot of hashing, it benefits a lot from multi-threading. On a store with 920K store paths, I got a speedup from 301s to 111s.
Make optimiseStore() multi-threaded
The `nix flake show --json` output format changed, so this jq query was returning an empty list.
Binary cache info
This reverts commit 3ec0993. This actually broke fetchersSubstitute test, since we want to be able to substitute builtins.fetchurl too, which is only handled by the tarball fetcher. See: https://hydra.nixos.org/build/331423127
Determinate Nix remove `nix upgrade-nix`.
Fix running hydraJobs in CI
ci: include output paths in FlakeHub upload
fixup: don't include linux-only drvs if not on linux
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
12 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Motivation
Not intended to be merged directly. This PR is a convenience to show the diff between upstream Nix and Determinate Nix (the
mainbranch).Continuation of #4.