Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

colima: use lima-bin on darwin for native macOS virtualization support #212980

Merged
merged 3 commits into from
Feb 7, 2023
Merged

colima: use lima-bin on darwin for native macOS virtualization support #212980

merged 3 commits into from
Feb 7, 2023

Conversation

tricktron
Copy link
Member

Description of changes

Tested with result/bin/colima start --vm-type vz.

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/)
  • 23.05 Release Notes (or backporting 22.11 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 Jan 27, 2023
@tricktron tricktron mentioned this pull request Jan 27, 2023
Merged
12 tasks
@ofborg ofborg bot requested a review from aaschmid January 27, 2023 16:32
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Jan 27, 2023
@tricktron @wegank
colima: make lima derivation configurable
06a3791 
Co-authored-by: Weijia Wang <9713184+wegank@users.noreply.github.com>
@tricktron tricktron requested a review from wegank February 5, 2023 13:00
@wegank wegank merged commit f0d56a9 into NixOS:master Feb 7, 2023
@tricktron tricktron deleted the f-colima-lima-bin branch February 7, 2023 13:41
@cecelot cecelot mentioned this pull request Feb 10, 2023
Closed
5 tasks
SuperSandro2000
SuperSandro2000 reviewed Feb 17, 2023
View reviewed changes
pkgs/applications/virtualization/colima/default.nix
, makeWrapper
, qemu
, testers
, colima
# use lima-bin on darwin to support native macOS virtualization
# https://github.com/NixOS/nixpkgs/pull/209171
, lima-drv ? if stdenv.isDarwin then lima-bin else lima
Copy link
Member

Choose a reason for hiding this comment

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

nit I would probably inline this unless it is desirable to be overwritable

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SuperSandro2000 SuperSandro2000 SuperSandro2000 left review comments

@wegank wegank wegank approved these changes

@aaschmid aaschmid Awaiting requested review from aaschmid

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@tricktron @SuperSandro2000 @wegank