Skip to content

various: drop darwin workarounds for infrec#456131

Closed
wolfgangwalther wants to merge 1 commit into
NixOS:stagingfrom
wolfgangwalther:pkgs-spliced-drop-darwin-bootstrap-stdenv
Closed

various: drop darwin workarounds for infrec#456131
wolfgangwalther wants to merge 1 commit into
NixOS:stagingfrom
wolfgangwalther:pkgs-spliced-drop-darwin-bootstrap-stdenv

Conversation

@wolfgangwalther

Copy link
Copy Markdown
Contributor

I can't cause infinite recursion by dropping these workarounds, so I conclude they're not necessary anymore.

Of course - it could very well be that I just hold it wrong, if that's the case please tell me how to reproduce that infrec :)

These were introduced in #346043, but I can't find reproducers in the commit messages.

Things done


Add a 👍 reaction to pull requests you find important.

@nixpkgs-ci nixpkgs-ci Bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. labels Oct 27, 2025
@ofborg ofborg Bot added the 6.topic: darwin Running or building packages on Darwin label Oct 27, 2025
@reckenrode

Copy link
Copy Markdown
Contributor

Do pkgsStatic and pkgsCross to the other Darwin architecture still work?

@wolfgangwalther

wolfgangwalther commented Oct 27, 2025

Copy link
Copy Markdown
Contributor Author

In a nix repl with system aarch64-darwin:

nix-repl> pkgsCross.x86_64-darwin.hello
«derivation /nix/store/jvl6kgxfhm3n794c51xd8l8g7wqxcy9i-hello-x86_64-apple-darwin-2.12.2.drv»

nix-repl> pkgsCross.x86_64-darwin.libxml2
«derivation /nix/store/4rv74m2x1589dq4fvcpa819vndsmshvb-libxml2-x86_64-apple-darwin-2.15.0.drv»

nix-repl> pkgsCross.x86_64-darwin.xcbuild
«derivation /nix/store/m8gph9bxns24h2i824pk220if00b01ks-xcbuild-x86_64-apple-darwin-0.1.1-unstable-2019-11-20.drv»

nix-repl> pkgsCross.x86_64-darwin.libpng
«derivation /nix/store/83w192aj84fiiqz7c1vkrwj2kgdfdk8k-libpng-apng-x86_64-apple-darwin-1.6.50.drv»

nix-repl> pkgsCross.x86_64-darwin.zlib
«derivation /nix/store/sf9n89an04zfa62ff64ipi5006mrd4k9-zlib-x86_64-apple-darwin-1.3.1.drv»

nix-repl> pkgsStatic.hello
«derivation /nix/store/7y1289gw9vzcxdiga5pc71glzh6ck19s-hello-static-arm64-apple-darwin-2.12.2.drv»

nix-repl> pkgsStatic.libxml2
«derivation /nix/store/v563q2wfh42gl5yrv71mq27l5b4mn755-libxml2-static-arm64-apple-darwin-2.15.0.drv»

nix-repl> pkgsStatic.xcbuild
«derivation /nix/store/3zg3f802d4bkcl72kyk7rkc810bi6jw8-xcbuild-static-arm64-apple-darwin-0.1.1-unstable-2019-11-20.drv»

nix-repl> pkgsStatic.libpng
«derivation /nix/store/w6vb0a8mdra02j2z5hsah9awxrr9l2f1-libpng-apng-static-arm64-apple-darwin-1.6.50.drv»

nix-repl> pkgsStatic.zlib
«derivation /nix/store/gy1sry5pjbm1jim6fk2f4f6pdb51k4jr-zlib-static-arm64-apple-darwin-1.3.1.drv»

So yes, both cross to darwin and static seem to work. I also double checked the other direction, i.e. on x86_64-darwin.

I did not do any builds, yet, but if the results so far seem alright, I'd fix the remaining CI issues and do a bootstrap. (Edit: currently building..)

I can't cause infinite recursion by dropping these workarounds, so I
conclude they're not necessary anymore.
@wolfgangwalther wolfgangwalther force-pushed the pkgs-spliced-drop-darwin-bootstrap-stdenv branch from 34b25e0 to 555919a Compare October 27, 2025 11:38
@wolfgangwalther

Copy link
Copy Markdown
Contributor Author

I did not do any builds, yet, but if the results so far seem alright, I'd fix the remaining CI issues and do a bootstrap. (Edit: currently building..)

I tried on the community builder, but hit openssl test errors in the sandbox. I gave up, because @emilazy assured me that we don't need rebuilds for this kind of fix. She also mentioned that this is heavily confusing and she would certainly expect infrec here.

@wolfgangwalther wolfgangwalther changed the base branch from master to staging October 28, 2025 09:53
@nixpkgs-ci nixpkgs-ci Bot closed this Oct 28, 2025
@nixpkgs-ci nixpkgs-ci Bot reopened this Oct 28, 2025
@wolfgangwalther

Copy link
Copy Markdown
Contributor Author

Any objections to merging this, @emilazy, @reckenrode?

@wolfgangwalther wolfgangwalther deleted the pkgs-spliced-drop-darwin-bootstrap-stdenv branch December 10, 2025 20:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants