Skip to content

staging-next 2025-04-24 #401526

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1,147 commits into
base: master
Choose a base branch
from
Open

staging-next 2025-04-24 #401526

wants to merge 1,147 commits into from

Conversation

emilazy and others added 30 commits April 21, 2025 01:50
There is still a remaining warning:

    ld: warning: object file (/nix/store/mn46c4sb8qcjmw6iy1dh9rivk8i8kg5d-ponyc-0.58.6/lib/pony/0.58.6/lib/native/libponyrt.a(except_try_catch.o)) was built for newer macOS version (15.0) than being linked (13.0)

but I suspect that might have to do with our toolchain’s target
triple or something and anyway I’ve spent more time on this than
I wanted to already. The package was broken beforehand so this is
an improvement.
That code path is only used for 32‐bit Darwin.
`CFLAGS` is now always defined, but this is a mass rebuild.

We can also make the indentation go back ot the way it was before by
inlining the `let inherit (finalAttrs) ... in` too.
…SubUidGidRange

Previously, when adding a new user when at least two users already exist,
this new user was assigned the same subuid range as the second existing user.
This was done with booxter’s fantastic [nix-clean-apple_sdk] tool,
simply modified to look for `libobjc` rather than the existing list he
already used in <#398707>. Some
manual work was applied, including cleaning up a string interpolation
in the terrifying MacVim derivation, stray comments, empty lists,
function parameters, and `inherit`s, including all of the references in
`all-packages.nix`.

[nix-clean-apple_sdk]: https://github.com/booxter/nix-clean-apple_sdk
Currently if the credential helpers packaged with git aren't on your PATH, git will fail to locate them. This most notably affects git maintanence1 which generates systemd units / launchd agents that invoke git directly without setting PATH. Home Manager is also able to generate maintanence units for systemd and does not set PATH2, meaning credential helpers will not work without additional configuration.

Moving the credential helpers to git's exec path3 allows git to locate them regardless of how PATH is set, and matches the packaging of Fedora4 and Homebrew5. Typically credential helpers are not added to PATH unless they are provided by another package separate from git (e.g. git-credential-gcloud).

I opted to create symlinks at the old bin paths in case some users were relying on invoking them directly. In practice I doubt this is done much. If we want to slim down git's bin dir I think the symlinks could be removed, and in doing so we'd better match the packaging done in other distributions.
This was removed by upstream in
<renpy/renpy@f2d3e0d>.
This isn’t used by the X11 backend anyway, which is the only one
we build for macOS. Even though it has a native macOS frontend. But
I don’t want to spend more time on this.
Patch needs adjusting, build process is super messed up, package
is out of date and not used in Nixpkgs other than by another unused
library… not worth it.
K900 and others added 13 commits April 29, 2025 21:47
From experience, cryptography-related packages are frequently affected
by either incorrectness in GHC or bugs relating to word size on
different architecture, so it's usually bad to disable their test
suites.

In the case of cryptohash-sha256, SHA is used as a point of reference
which doesn't pass its test suite on 32bit, so we can only pray that
cryptohash-sha256 doesn't suffer from a similar problem.
Could be observed by executing GHCi or running isocline's “test suite”.
@vcunat
Copy link
Member Author

vcunat commented May 3, 2025

  • python3Packages.dissect-cstruct is regressing a test now
    /cc maintainer: @fabaff
    https://hydra.nixos.org/build/295647137
    I failed to find any reference to this test failure (e.g. upstream), and updating to 4.4 would even extend the failing set. I wouldn't consider this a merge blocker, but -review says that over 200 jobs depend on it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
1.severity: security Issues which raise a security issue, or PRs that fix one 6.topic: dotnet Language: .NET 6.topic: emacs Text editor 6.topic: erlang 6.topic: games 6.topic: haskell 6.topic: java Including JDK, tooling, other languages, other VMs 6.topic: lib The Nixpkgs function library 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related 6.topic: lua 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: nodejs 6.topic: ocaml 6.topic: php 6.topic: printing 6.topic: python 6.topic: qt/kde 6.topic: R 6.topic: ruby 6.topic: rust 6.topic: stdenv Standard environment 6.topic: systemd 6.topic: tcl 6.topic: teams Relating to team creation, updates, other management actions 6.topic: vim 6.topic: vscode 8.has: changelog 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+
Projects
Status: No status
Development

Successfully merging this pull request may close these issues.