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.

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

vfkit: init at 0.5.1 #334907

Merged
merged 2 commits into from
Sep 8, 2024
Merged

vfkit: init at 0.5.1 #334907

merged 2 commits into from
Sep 8, 2024

Conversation

sarcasticadmin
Copy link
Member

@sarcasticadmin sarcasticadmin commented Aug 15, 2024

Description of changes

Fixes: #306179 #305868

init vfkit using the prebuilt universal macOS binary from the upstream project (suggested in #306179 (comment)). This isn't ideal but it looks like there are existing issues getting vfkit to build. Recent attempt: #306438 This seems to be related to work that's in-progress for the macOS SDK in nixpkgs: #229210 I figure it's better to have vfkit in nixpkgs and working with podman on macOS than for it to be broken until there's a better path forward.

Additionally, I've add vfkit to the PATH for podman.

prior to having vfkit:

$ podman machine start
Starting machine "podman-machine-default"
ERRO[0000] process 67230 has not ended
Error: exec: "vfkit": executable file not found in $PATH

Running podman with vfkit:

$ ./result/bin/podman machine start
Starting machine "podman-machine-default"

This machine is currently configured in rootless mode. If your containers
require root permissions (e.g. ports < 1024), or if you run into compatibility
issues with non-podman clients, you can switch using the following command:

        podman machine set --rootful

API forwarding listening on: /var/folders/r0/k849jt6s5ss4222ll7t21vc40000gn/T/podman/podman-machine-default-api.sock
You can still connect Docker API clients by setting DOCKER_HOST using the
following command in your terminal session:

        export DOCKER_HOST='unix:///var/folders/r0/k849jt6s5ss4222ll7t21vc40000gn/T/podman/podman-machine-default-api.sock'

Machine "podman-machine-default" started successfully

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.

@ofborg ofborg bot added the 8.has: package (new) This PR adds a new package label Aug 15, 2024
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Aug 15, 2024
micnncim added a commit to micnncim/nur that referenced this pull request Sep 5, 2024
See NixOS/nixpkgs#305868 and
NixOS/nixpkgs#334907 for more information.

Signed-off-by: micnncim <micnncim@gmail.com>
micnncim added a commit to micnncim/nur that referenced this pull request Sep 5, 2024
See NixOS/nixpkgs#305868 and
NixOS/nixpkgs#334907 for more information.

Signed-off-by: micnncim <micnncim@gmail.com>
micnncim added a commit to micnncim/nur that referenced this pull request Sep 5, 2024
See NixOS/nixpkgs#305868 and
NixOS/nixpkgs#334907 for more information.

Signed-off-by: micnncim <micnncim@gmail.com>
Copy link
Member

@Lassulus Lassulus left a comment

Choose a reason for hiding this comment

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

lgtm

@Lassulus Lassulus merged commit 1a779f1 into NixOS:master Sep 8, 2024
35 checks passed
Copy link
Contributor

github-actions bot commented Sep 8, 2024

Successfully created backport PR for release-24.05:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux backport release-24.05 Backport PR automatically
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Package request: vfkit
2 participants