Skip to content
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

[pull] master from NixOS:master #28

Open
wants to merge 8,504 commits into
base: master
Choose a base branch
from
Open

[pull] master from NixOS:master #28

wants to merge 8,504 commits into from

Conversation

pull[bot]
Copy link

@pull pull bot commented Aug 17, 2021

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.1)

Can you help keep this open source service alive? 💖 Please sponsor : )

@pull pull bot added ⤵️ pull merge-conflict Resolve conflicts manually labels Aug 17, 2021
roberth and others added 26 commits November 10, 2024 20:52
It does not need to mutate the attrs.
`const` is shallow.
Avoids a const_cast in the hercules-ci-cnix-expr bindings.
autoCallFunction: accept const Bindings &
Add options uid, gid, uname, and gname to docker.nix.

Setting these to e.g. 1000, 1000, "user", "user" will build an image
which runs and allows using Nix as that user.
Fix argument order in the Windows implementation of `getEnvOs`
The existence of this attribute is assumed by the Determinate
Installer packaging and maybe others.
This is a bit safer than having a separate nrArgs argument.
The new package output attributes are somewhat experimental, and
provided for compatibility most of all.

We'll see how well this goes before the changes proposed in
#6507
The API docs build is extremely noisy (#11841) and probably not many
people care about it anyway. Also, they get rebuild on *every* ninja
invocation which is generally a waste of time.

Of course, you can still build the docs via `nix build
.#nix-{internal,external}-api-docs`, which is pretty fast.
edolstra and others added 30 commits December 16, 2024 14:58
Skip tests on systems with restricted usernamespaces
lookupInFlakeCache(): Fix O(n) time lookup
installer: make sure we can always test the installer in ci and locally
EvalState::realiseContext(): Allow access to the entire closure
src/nix/flake.md describes the format of flake.lock files. Before this
change, it said that the original field was “The original input
specification from `flake.lock`[…]” The original input specification is
in flake.nix, not flake.lock.
…tion

Fix `flake.lock`/`flake.nix` mix-up
This restores evaluation caching for dirty Git workdirs.
The fingerprint calculation can be expensive (especially for dirty Git
trees) so we need to cache it.
A command like `nix flake metadata` was causing about 4 calls to
getWorkdirInfo(), which is slow for large repos (even when they're not
dirty).
Git fetcher: Calculate a fingerprint for dirty workdirs
packaging: move tests to passthru
Prepare nix to run with clang-tidy
…runs faster

Since networking is disabled in these VMs, trying to talk to the default
cache.nixos.org slows the test down (since it can't resolve it).
libstore: fixup unformatted uri when S3 getObject fails
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
⤵️ pull merge-conflict Resolve conflicts manually
Projects
None yet
Development

Successfully merging this pull request may close these issues.