Skip to content

Comments

kmod: drop darwin support#182714

Merged
SuperSandro2000 merged 1 commit intoNixOS:stagingfrom
trofi:fix-kmod-for-darwin
Jul 26, 2022
Merged

kmod: drop darwin support#182714
SuperSandro2000 merged 1 commit intoNixOS:stagingfrom
trofi:fix-kmod-for-darwin

Conversation

@trofi
Copy link
Contributor

@trofi trofi commented Jul 24, 2022 •
edited
Loading

Description of changes

commit 7a2c07d "kmod: enable on darwin" added darwin
support mostly for depmod to be able to build linux kernel
on darwin.

In version 30 kmod requires more and more linux syscalls to build.
Instead of patching it for darwin let's drop it's support instead.

Maybe depmod could be packaged using some other way if needed.

Related: #182720 removed
kmod use on darwin from rare packages that still pulled it in.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 22.11 Release Notes (or backporting 22.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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Jul 24, 2022
@trofi trofi marked this pull request as draft July 24, 2022 16:29
@trofi
Copy link
Contributor Author

trofi commented Jul 24, 2022

The patch applies and builds on linux, but it's not enough to make it build on darwin :(: clock_nanosleep() is not a thing there. Switching to a draft.

@ofborg ofborg bot added 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Jul 24, 2022
@trofi trofi mentioned this pull request Jul 24, 2022
Merged
13 tasks
@trofi
Copy link
Contributor Author

trofi commented Jul 24, 2022

Removing kmod from darwin depends took very little: #182720

@matthewbauer as an author of 7a2c07d WDYT of dropping darwin support for kmod in nixpkgs?

@trofi trofi closed this Jul 25, 2022
@trofi trofi force-pushed the fix-kmod-for-darwin branch from cdd5769 to ded08ef Compare July 25, 2022 17:57
@trofi
kmod: drop darwin support
65b9c17 
commit 7a2c07d "kmod: enable on darwin" added darwin
support mostly for `depmod` to be able to build `linux` kernel
on `darwin`.

In version 30 kmod requires more and more linux syscalls to build.
Instead of patching it for darwin let's drop it's support instead.

Maybe `depmod` could be packaged using some other way if needed.

Related: NixOS#182720 removed
`kmod` use on `darwin` from rare packages that still pulled it in.
@trofi trofi reopened this Jul 25, 2022
@trofi trofi changed the base branch from staging-next to staging July 25, 2022 17:59
@trofi trofi changed the title kmod: update darwin-specific patch to apply again kmod: drop darwin support Jul 25, 2022
@trofi
Copy link
Contributor Author

trofi commented Jul 25, 2022

Changed to linux-only kmod. Ready to review.

@trofi trofi marked this pull request as ready for review July 25, 2022 18:00
@ofborg ofborg bot added 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch. 8.has: clean-up This PR removes packages or removes other cruft 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: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. and removed 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch. 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Jul 25, 2022
@trofi trofi requested a review from Artturin July 26, 2022 06:42
@vcunat
Copy link
Member

vcunat commented Jul 26, 2022

I wonder why it's marked with so many rebuilds. If that's a mistake, perhaps target at staging-next, as the kmod update is in there already? (PR #182386)

@SuperSandro2000 SuperSandro2000 merged commit 9834020 into NixOS:staging Jul 26, 2022
@trofi trofi deleted the fix-kmod-for-darwin branch July 26, 2022 18:35
@wegank wegank mentioned this pull request Jul 31, 2022
Closed
@wegank
Copy link
Member

wegank commented Jul 31, 2022

Maybe someone could wrap this up on Darwin, just like the memstreamHook stuffs...

@trofi trofi mentioned this pull request Aug 2, 2022
Merged
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@fpletz fpletz fpletz approved these changes

@Artturin Artturin Awaiting requested review from Artturin

Assignees

No one assigned

Labels

6.topic: darwin Running or building packages on Darwin 8.has: clean-up This PR removes packages or removes other cruft 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: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@trofi @vcunat @wegank @fpletz @SuperSandro2000