Skip to content

rpm: fix build on Darwin#346967

Merged
emilazy merged 1 commit intoNixOS:masterfrom
reckenrode:push-vvywqpsumluy
Nov 6, 2024
Merged

rpm: fix build on Darwin#346967
emilazy merged 1 commit intoNixOS:masterfrom
reckenrode:push-vvywqpsumluy

Conversation

@reckenrode
Copy link
Contributor

@reckenrode reckenrode commented Oct 6, 2024

RPM needs a 13.x SDK or newer.

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
@emilazy
Copy link
Member

emilazy commented Oct 7, 2024

Finally, macOS Nix users can have a decent package manager.

@ofborg ofborg bot added 6.topic: darwin Running or building packages on Darwin 8.has: package (new) This PR adds a new package labels Oct 7, 2024
@ofborg ofborg bot requested a review from copumpkin October 7, 2024 01:05
@ofborg ofborg bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 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
@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:master 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:04
emilazy
emilazy requested changes Oct 11, 2024
View reviewed changes
Copy link
Member

@emilazy emilazy left a comment

Choose a reason for hiding this comment

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

Could you try bumping to 4.20 instead, which includes these fixes? Otherwise we need to adjust the commit hashes.

pkgs/tools/package-management/rpm/default.nix Outdated
Comment on lines 41 to 46
Copy link
Member

@emilazy emilazy Oct 11, 2024

Choose a reason for hiding this comment

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

This is included in 4.19 and 4.20; we should probably bump the version instead. If not, we should at least point to b960c0b43a080287a7c13533eeb2d9f288db1414, which is the version of the commit that was landed and won’t get GC’d.

pkgs/tools/package-management/rpm/default.nix Outdated
Comment on lines +49 to +56
Copy link
Member

@emilazy emilazy Oct 11, 2024

Choose a reason for hiding this comment

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

This PR was also rebased for merge and is in 4.20.

@reckenrode reckenrode force-pushed the push-vvywqpsumluy branch 3 times, most recently from 0f3443f to 945c5d8 Compare October 11, 2024 22:41
emilazy
emilazy reviewed Oct 11, 2024
View reviewed changes
pkgs/tools/package-management/rpm/default.nix Outdated
Copy link
Member

@emilazy emilazy Oct 11, 2024

Choose a reason for hiding this comment

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

BTW, I’m guessing this can be platforms.unix.

@reckenrode
Copy link
Contributor Author

reckenrode commented Oct 13, 2024

RPM 4.20 is a non-trivial effort to package. That’s way beyond what I want to do to update it for Darwin. If this isn’t mergable, I’d rather leave Darwin marked broken.

@emilazy
Copy link
Member

emilazy commented Oct 13, 2024

I think it’s fine to merge this and let someone else handle RPM 4.20 as long as we can point the fetches to the copies of the commits that were actually merged rather than the potentially ephemeral ones from the PRs.

@reckenrode
Copy link
Contributor Author

reckenrode commented Oct 13, 2024

I fixed the commit to be the one from the repo.

@emilazy
Copy link
Member

emilazy commented Oct 13, 2024

The other PR needs its commits changing too (it seems like they do rebase merges).

@reckenrode
rpm: fix build on Darwin
7187419 
RPM needs a 13.x SDK or newer.
@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one person. label Nov 4, 2024
@reckenrode reckenrode marked this pull request as draft November 4, 2024 23:41
@reckenrode reckenrode changed the base branch from staging to master November 4, 2024 23:52
@reckenrode reckenrode marked this pull request as ready for review November 4, 2024 23:52
@reckenrode
Copy link
Contributor Author

reckenrode commented Nov 4, 2024 •
edited
Loading

No changes except I retargeted to master due to the low number of rebuilds. I’ll merge once all checks finish (except for the slow, aarch64-darwin one).

@reckenrode
Copy link
Contributor Author

reckenrode commented Nov 6, 2024

@emilazy Is this good to merge? It’s blocked currently.

emilazy
emilazy approved these changes Nov 6, 2024
View reviewed changes
Copy link
Member

@emilazy emilazy left a comment

Choose a reason for hiding this comment

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

Forgot I had a blocking review on this, sorry. Seems fine, hopefully someone else can figure out the new build system another time.

@emilazy emilazy merged commit 0080e28 into NixOS:master Nov 6, 2024
@reckenrode reckenrode deleted the push-vvywqpsumluy branch November 6, 2024 18:59
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

@copumpkin copumpkin Awaiting requested review from copumpkin

+1 more reviewer

@paparodeo paparodeo paparodeo approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

6.topic: darwin Running or building packages on Darwin 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@reckenrode @emilazy @paparodeo @wegank