Skip to content

neovim-unwrapped: update build inputs for new Darwin SDK#346946

Merged
emilazy merged 1 commit intoNixOS:stagingfrom
reckenrode:push-vmkklytlqptm
Oct 11, 2024
Merged

neovim-unwrapped: update build inputs for new Darwin SDK#346946
emilazy merged 1 commit intoNixOS:stagingfrom
reckenrode:push-vmkklytlqptm

Conversation

@reckenrode
Copy link
Contributor

@reckenrode reckenrode commented Oct 6, 2024

The Darwin SDK in nixpkgs no longer provides libutil by default due to possible confusion when packages (such as Python) detect libutil.h and assume a different platform. Neovim requires it, so include it explicitly on Darwin.

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/)
  • 24.11 Release Notes (or backporting 23.11 and 24.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.

@reckenrode reckenrode mentioned this pull request Oct 6, 2024
Merged
52 tasks
@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Oct 6, 2024
@ofborg ofborg bot requested review from manveru and rvolosatovs October 7, 2024 00:02
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely target the staging branches. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Oct 7, 2024
@github-actions github-actions bot added 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: haskell General-purpose, statically typed, purely functional programming language 8.has: documentation This PR adds or changes documentation 8.has: changelog This PR adds or changes release notes 8.has: module (update) This PR changes an existing module in `nixos/` 6.topic: emacs Text editor 6.topic: ruby A dynamic, open source programming language with a focus on simplicity and productivity. 6.topic: nodejs Node.js is a free, open-source, cross-platform JavaScript runtime environment 6.topic: pantheon The Pantheon desktop environment 6.topic: module system About "NixOS" module system internals 6.topic: systemd Software suite that provides an array of system components for Linux operating systems. 6.topic: nim Nim programing language 6.topic: vscode A free and versatile code editor that supports almost every major programming language. 6.topic: lib The Nixpkgs function library 8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` labels Oct 7, 2024
@reckenrode reckenrode force-pushed the reckenrode/darwin-sdk-refactor branch 2 times, most recently from 183877a to 1fd30e4 Compare October 8, 2024 02:51
@github-actions github-actions bot removed 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: haskell General-purpose, statically typed, purely functional programming language labels Oct 8, 2024
@github-actions github-actions bot removed 6.topic: module system About "NixOS" module system internals 6.topic: systemd Software suite that provides an array of system components for Linux operating systems. 6.topic: nim Nim programing language 6.topic: vscode A free and versatile code editor that supports almost every major programming language. 6.topic: lib The Nixpkgs function library 8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` labels Oct 8, 2024
@reckenrode reckenrode deleted the branch NixOS:staging October 8, 2024 03:30
@reckenrode reckenrode closed this Oct 8, 2024
@reckenrode reckenrode reopened this Oct 8, 2024
@reckenrode reckenrode force-pushed the reckenrode/darwin-sdk-refactor branch 2 times, most recently from a240201 to 4112f1a Compare October 9, 2024 02:16
@reckenrode
neovim-unwrapped: update build inputs for new Darwin SDK
bed5515 
The Darwin SDK in nixpkgs no longer provides libutil by default due to
possible confusion when packages (such as Python) detect `libutil.h` and
assume a different platform. Neovim requires it, so include it
explicitly on Darwin.
@reckenrode reckenrode force-pushed the reckenrode/darwin-sdk-refactor branch 2 times, most recently from a1adff0 to e3f2829 Compare October 10, 2024 20:25
@emilazy emilazy marked this pull request as ready for review October 10, 2024 22:54
@emilazy emilazy deleted the branch NixOS:staging October 11, 2024 00:00
@emilazy emilazy closed this Oct 11, 2024
@reckenrode reckenrode reopened this Oct 11, 2024
@reckenrode reckenrode changed the base branch from reckenrode/darwin-sdk-refactor to staging October 11, 2024 00:05
@emilazy emilazy merged commit a5c0bbc into NixOS:staging Oct 11, 2024
@reckenrode reckenrode deleted the push-vmkklytlqptm branch October 11, 2024 13:27
@andrevmatos andrevmatos mentioned this pull request Nov 2, 2024
Merged
GaetanLepage added a commit to nix-community/neovim-nightly-overlay that referenced this pull request Nov 2, 2024
@GaetanLepage
neovim: stop overriding libiconv on linux as it has been removed in n…
ab5a46b 
…ixpkgs

NixOS/nixpkgs#346946
GaetanLepage added a commit to nix-community/neovim-nightly-overlay that referenced this pull request Nov 5, 2024
@GaetanLepage
neovim: stop overriding libiconv on linux as it has been removed in n…
2752a93 
…ixpkgs

NixOS/nixpkgs#346946
GaetanLepage added a commit to nix-community/neovim-nightly-overlay that referenced this pull request Nov 5, 2024
@GaetanLepage
neovim: stop overriding libiconv on linux as it has been removed in n…
2164ee9 
…ixpkgs

NixOS/nixpkgs#346946
GaetanLepage added a commit to nix-community/neovim-nightly-overlay that referenced this pull request Nov 5, 2024
@GaetanLepage
neovim: stop overriding libiconv on linux as it has been removed in n…
341a4e0 
…ixpkgs

NixOS/nixpkgs#346946
@reckenrode reckenrode mentioned this pull request Nov 5, 2024
Merged
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@emilazy emilazy emilazy approved these changes

@manveru manveru Awaiting requested review from manveru

@rvolosatovs rvolosatovs Awaiting requested review from rvolosatovs

Assignees

No one assigned

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: 1001-2500 This PR causes many rebuilds on Darwin and should most likely target the staging branches. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@reckenrode @emilazy