forked from NixOS/nix
-
Notifications
You must be signed in to change notification settings - Fork 2
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
grahamc
wants to merge
1,248
commits into
2.30-maintenance
Choose a base branch
from
main
base: 2.30-maintenance
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Upstream tracking #165
Conversation
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
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
Fixup the complainy docs line
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
Co-authored-by: Luc Perkins <[email protected]>
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.
Fix broken fetchToStore() caching
Parallelize the flake regression suite
…st, since we do want to build them on every other trigger
…81-3e31-4930-9336-7f1a66cf35e7 Release v3.8.5
Updating the release notes on a release requires contents: write, as tested here: * https://github.com/grahamc/test2/releases/tag/v1.2.8 * grahamc/test2@b0f33d7 * https://github.com/grahamc/test2/actions/runs/16737560363/job/47379437788
…otes Auto update release notes
Use WAL mode for SQLite cache databases (2nd attempt)
Enable parallel marking in boehm-gc
…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
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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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
main
branch).Continuation of #4.