Skip to content
This repository has been archived by the owner on May 14, 2024. It is now read-only.

[pull] master from NixOS:master #12

Open
wants to merge 2,029 commits into
base: master
Choose a base branch
from
Open

[pull] master from NixOS:master #12

wants to merge 2,029 commits into from

Conversation

pull[bot]
Copy link

@pull pull bot commented May 13, 2024

See Commits and Changes for more details.


Created by pull[bot]

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

@pull pull bot added ⤵️ pull merge-conflict Resolve conflicts manually labels May 13, 2024
mergify bot and others added 27 commits December 14, 2024 16:44
Implement shellSplitString for proper handling of NIX_SSHOPTS with spaces and quotes
tl;dr NULL is better than "auto"
C API: nix_store_open doc, add storedir, real_path
…r namespaces

Update tests/functional/common/functions.sh

Co-authored-by: Robert Hensing <[email protected]>
Just now there is a dependency on cachix, which means we cannot test
the installer in CI if forks do not have the necessary secrets set up.
We replace this with a simple http server that serves the installer and
can be both used in CI and locally.
the format error already adds quotes.
Fix `nix upgrade-nix` profile search
When resolving indirect flake references like `nixpkgs` in `flake.nix`
files, Nix will no longer use the system and user flake registries. It
will only use the global flake registry and overrides given on the
command line via `--override-flake`.
nix flake lock: Fail if there is an unlocked input
Ignore local registries for lock file generation
Otherwise the value is undefined in some cases.
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
edolstra and others added 30 commits January 22, 2025 13:58
Add mergify backport rule for 2.26
Not sure what the intent was expecting help.sh to fail in the main suite, but it caused `meson test` to fail inside a `nix develop` shell:

  $ meson test help --print-errorlogs
  ninja: Entering directory `/home/eelco/Dev/nix-master/build'
  1/1 nix-functional-tests:main / help        UNEXPECTEDPASS   4.02s
GitRepo::fetch(): Ignore $GIT_DIR
We were simply passing in the wrong path. This went uncaught because the
TODO about deduplication hasn't happened yet.
These don't depend on 'man' so we don't need to skip them.
Reflect the shorter attribute name, changed in
f168a6e
#11799
EvalState::resolveLookupPathPath(): Call resolveSymlinks() before pathExists()
... with nixfmt (rfc style)
The main improvement is that the new message gives an example of a path
that is referenced, which should make it easier to track down. While
there, I also clarified the wording, saying exactly why the paths in
question were illegal.
Improve "illegal path references in fixed output derivation" error
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
⤵️ pull merge-conflict Resolve conflicts manually
Projects
None yet
Development

Successfully merging this pull request may close these issues.