Merged
Conversation
We’re already allowing `/tmp` anyway, so this should be harmless, and it fixes a regression in the default configuration caused by moving the build directories out of `temp-dir`. (For instance, that broke the Lix `guessOrInventPath.sockets` test.) Note that removing `/tmp` breaks quite a few builds, so although it may be a good idea in general it would require work on the Nixpkgs side. Fixes: 749afbb Change-Id: I6a6a69645f429bc50d4cb24283feda3d3091f534 (This is a cherry-pick of commit d1db3e5) Lix patch: https://gerrit.lix.systems/c/lix/+/3500 (cherry picked from commit 5cd9443)
…/pr-13468 libstore: fix Unix sockets in the build directory on sandboxed macOS (backport NixOS#13468)
Previously, `nix help shell` failed with "Nix has no subcommand 'shell'" despite `nix shell --help` working correctly. This happened because the `shell` command is actually an alias for `env shell`, and the help system wasn't resolving aliases when looking up documentation. This patch modifies the `showHelp` function to check for and resolve aliases before generating the manpage name, ensuring that shorthand commands like `shell` get proper help documentation. Closes: NixOS#13431 (cherry picked from commit d678b07)
…/pr-13496 Fix `nix help shell` by properly handling command aliases (backport NixOS#13496)
(cherry picked from commit ee9b57c)
(cherry picked from commit e7af2e6)
…ition blocks (cherry picked from commit 41bf87e)
* It is tough to contribute to a project that doesn't use a formatter, * It is extra hard to contribute to a project which has configured the formatter, but ignores it for some files * Code formatting makes it harder to hide obscure / weird bugs by accident or on purpose, Let's rip the bandaid off? Note that PRs currently in flight should be able to be merged relatively easily by applying `clang-format` to their tip prior to merge. Co-authored-by: Graham Christensen <[email protected]>
Co-authored-by: Graham Christensen <[email protected]>
…/pr-13108 Rip off the bandaid: Format the codebase with clang-format (backport NixOS#13108)
(cherry picked from commit 6db6190)
…/pr-13514 treewide: Fix Meson CPU names for powerpc CPUs (backport NixOS#13514)
I've missed this while reviewing 6db6190. I only built big endian ppc64, so that didn't occur to me. From meson manual: > Those porting from autotools should note that Meson does not add > endianness to the name of the cpu_family. For example, autotools will > call little endian PPC64 "ppc64le", Meson will not, you must also check > the .endian() value of the machine for this information. This code should handle that correctly. (cherry picked from commit ebd311b)
…/pr-13520 meson: Correctly handle endianness for PowerPC CPU families (backport NixOS#13520)
Fixes NixOS#13532. (cherry picked from commit 54dc531)
…/pr-13535 Fix nix_system_cpu on i686-linux (backport NixOS#13535)
Tagging release 2.30.2
cole-h
approved these changes
Jul 28, 2025
This file contains hidden or 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
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.
Motivation
Context