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

[pull] master from NixOS:master #12

wants to merge 2,313 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
Philipp Otterbein and others added 27 commits January 23, 2025 00:57
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
xokdvium and others added 30 commits February 21, 2025 14:36
It's not very clear what the ownership model is here, but one thing
is certain: `.up` can't be destroyed before the StaticEnv that refers
to it is.

Changing a non-owning pointer to taking shared ownership of the parent
`StaticEnv` prevents the `.up` from being freed.

I'm not a huge fan of the inverted ownership, where child `StaticEnv`
takes a refcount of the parent, but this seems like the least intrusive
way to fix the use-after-free.

This shouldn't cause any shared_ptr cycles to appear (hopefully).
This is the simplest reproducer I have. It would be great to find
a repro without flakes, but I guess this should be ok for now.
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
libstore: fix curl callback function signature
libexpr: Fix use-after-free of StaticEnv::up
fix: update work meeting calendar link
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.