Skip to content

Sync with upstream 2.30.2#160

Merged
edolstra merged 20 commits intodetsys-mainfrom
sync-2.30
Jul 28, 2025
Merged

Sync with upstream 2.30.2#160
edolstra merged 20 commits intodetsys-mainfrom
sync-2.30

Conversation

@edolstra
Copy link
Collaborator

Motivation

Context

edolstra and others added 15 commits July 12, 2025 09:42
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 6896761)
* 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]>
…/pr-13108

Rip off the bandaid: Format the codebase with clang-format (backport NixOS#13108)
…/pr-13514

treewide: Fix Meson CPU names for powerpc CPUs (backport NixOS#13514)
@github-actions
Copy link

github-actions bot commented Jul 22, 2025

@github-actions github-actions bot temporarily deployed to pull request July 22, 2025 19:35 Inactive
@edolstra edolstra enabled auto-merge July 22, 2025 21:08
xokdvium and others added 5 commits July 23, 2025 20:36
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
@edolstra edolstra changed the title Sync with upstream 2.30 Sync with upstream 2.30.2 Jul 25, 2025
@github-actions github-actions bot temporarily deployed to pull request July 25, 2025 09:39 Inactive
@edolstra edolstra added this pull request to the merge queue Jul 28, 2025
Merged via the queue into detsys-main with commit 7c35c48 Jul 28, 2025
34 checks passed
@edolstra edolstra deleted the sync-2.30 branch July 28, 2025 16:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants