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,286 commits into
base: master
Choose a base branch
from
Open

[pull] master from NixOS:master #12

wants to merge 2,286 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
edolstra and others added 27 commits January 21, 2025 09:54
LTO on x86_64-darwin appears to break the ability to catch exceptions
correctly (maybe just for exception types defined in different
libraries). This leads to many weird test failures,
e.g. https://hydra.nixos.org/build/286312387 and
https://hydra.nixos.org/build/286312341.
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.
edolstra and others added 30 commits February 19, 2025 12:47
It's no longer needed now that all store paths inside the evaluator
are logical rather than real paths.
Note that in pure mode, we don't need to use the union FS even when
using a chroot store, since the user shouldn't have access to the
physical /nix/store.
Use a union source accessor to put chroot stores in the logical location
This abstracts over a common case. Good for brevity, and enabling
further experiments.
Only try to chmod /nix/var/nix/profiles/per-user when necessary
There was one `inputs.nixFmt` left after 573ffac.
Seems like this got dropped at some point during meson migration, so
put it back in the build system.

Drop all tests for `parseGitUrl`, since that function doesn't exist
and migrating doesn't look sensible because git-lfs stuff seems to use
`ParsedURL`.
libfetchers-tests: Add back git-utils.cc
When #9863 converted the `Nix::Store` free functions into member functions, the
implicit `this` argument was not accounted for when iterating over the variable
number of arguments in some functions.
libstore: fix expected bytes in progress bar
This makes it easy to see at a glance what the version of the manual
is, e.g. "Nix 2.27.0 Reference Manual".
doc: ssl-cert-file leaks into OSX builds
nix flake archive: Skip relative path inputs
packaging: Use correct stdenv for x86_64-darwin
Include the Nix version in the title of the manual
We can't ignore them entirely, since we do want to archive their
transitive inputs.

Fixes #12438.
nix flake archive: Recurse into relative path inputs
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.