Skip to content

treewide: remove references to deprecated darwin.libobjc stub#400402

Merged
emilazy merged 1 commit intoNixOS:stagingfrom
emilazy:push-szwzxwkmvlpt
Apr 22, 2025
Merged

treewide: remove references to deprecated darwin.libobjc stub#400402
emilazy merged 1 commit intoNixOS:stagingfrom
emilazy:push-szwzxwkmvlpt

Conversation

@emilazy
Copy link
Member

@emilazy emilazy commented Apr 20, 2025

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 inherits, including all of the references in all-packages.nix.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 6.topic: haskell General-purpose, statically typed, purely functional programming language 6.topic: ruby A dynamic, open source programming language with a focus on simplicity and productivity. 6.topic: vim Advanced text editor 6.topic: R R is a programming language for statistical computing and data visualization. labels Apr 20, 2025
@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Apr 20, 2025
@github-actions github-actions bot added 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 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. labels Apr 20, 2025
@emilazy emilazy force-pushed the push-szwzxwkmvlpt branch from 08d9458 to 9152208 Compare April 20, 2025 23:03
Comment on lines 167 to 171
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The whole FractalArt = ... can now go away.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks; the script is too naive to handle that. Done manually.

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 <NixOS#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
Copy link
Contributor

@reckenrode reckenrode left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. The packages that are adding libresolv shouldn’t need to do that. Darwin provides libresolv in the SDK (and did even prior to the rework). Fixing that is out of scope for this PR though.

@emilazy emilazy merged commit 4d04fc1 into NixOS:staging Apr 22, 2025
25 of 27 checks passed
@emilazy emilazy deleted the push-szwzxwkmvlpt branch April 22, 2025 21:30
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 6.topic: haskell General-purpose, statically typed, purely functional programming language 6.topic: R R is a programming language for statistical computing and data visualization. 6.topic: ruby A dynamic, open source programming language with a focus on simplicity and productivity. 6.topic: vim Advanced text editor 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-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.

3 participants