merge queue: embarking 2.24-maintenance (f393260) and [#12195 + #12194 + #12196 + #12198 + #12199] together #12224
Conversation
This file contains 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
![mergify[bot]](https://avatars.githubusercontent.com/in/10562?s=60&v=4){kind=small}
If you have the Nix store mounted from a nonlocal filesystem whose exporter is not running as root, making the directory mode 000 makes it inaccessible to that remote unprivileged user and therefore breaks the build. (Specifically, I am running into this with a virtiofs mount using Apple Virtualization.framework as a non-root user, but I expect the same thing would happen with virtiofs in qemu on Linux as a non-root user or with various userspace network file servers.) Make the directory mode 500 (dr-x------) to make the sandbox work in this use case, which explicitly conveys our intention to read and search the directory. The code only works because root can already bypass directory checks, so this does not actually grant more permissions to the directory owner / does not make the sandbox less secure. (cherry picked from commit 5a794d9)
(cherry picked from commit 071ddbe) # Conflicts: # doc/manual/src/language/operators.md
The previous documentation was inaccurate, stating that it would not update existing inputs. However these inputs will be updated if they are outdated (for example the version of an existing input has been changed). The new text properly reflects this behaviour. (cherry picked from commit d2f627d)
Update src/nix/flake-archive.md Update src/nix/flake-archive.md (cherry picked from commit f0a4f19)
…update` docs: Provide an example of updating multiple inputs with `nix flake update` (cherry picked from commit 9e335ee)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
🎉 This combination of pull requests has been checked successfully and will be merged soon. 🎉
Branch 2.24-maintenance (f393260) and [#12195 + #12194 + #12196 + #12198 + #12199] are embarked together for merge.
This pull request has been created by Mergify to speculatively check the mergeability of [#12195 + #12194 + #12196 + #12198 + #12199].
You don't need to do anything. Mergify will close this pull request automatically when it is complete.
Required conditions of queue
defaultfor merge:check-success=installer test on macoscheck-success=installer test on ubuntucheck-success=tests on macoscheck-success=tests on ubuntucheck-success=vm_testscheck-success = installer test on macoscheck-neutral = installer test on macoscheck-skipped = installer test on macoscheck-success = installer test on ubuntucheck-neutral = installer test on ubuntucheck-skipped = installer test on ubuntucheck-success = tests on macoscheck-neutral = tests on macoscheck-skipped = tests on macoscheck-success = tests on ubuntucheck-neutral = tests on ubuntucheck-skipped = tests on ubuntuRequired conditions to stay in the queue:
check-success = installer test on macosnix flake lock(backport #11621) #12196check-neutral = installer test on macosnix flake lock(backport #11621) #12196check-skipped = installer test on macosnix flake lock(backport #11621) #12196check-success = installer test on ubuntunix flake lock(backport #11621) #12196check-neutral = installer test on ubuntunix flake lock(backport #11621) #12196check-skipped = installer test on ubuntunix flake lock(backport #11621) #12196check-success = tests on macosnix flake lock(backport #11621) #12196check-neutral = tests on macosnix flake lock(backport #11621) #12196check-skipped = tests on macosnix flake lock(backport #11621) #12196check-success = tests on ubuntunix flake lock(backport #11621) #12196check-neutral = tests on ubuntunix flake lock(backport #11621) #12196check-skipped = tests on ubuntunix flake lock(backport #11621) #12196