-
-
Notifications
You must be signed in to change notification settings - Fork 14.7k
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
podman: make work on darwin #157134
podman: make work on darwin #157134
Conversation
Closes NixOS#141041 Once 4.0.0 is released, there will be an environment variabled that we can set in the wrapper. Until then, this allows `podman machine start` to work on Darwin.
This reverts commit 1b4cdac.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This doesn't fix the problem I mentioned in #141041 (comment).
this wrapper somehow wrote to the store, but I don't see how that could be unless there is a problem
What I said was:
store paths get written to the vm config
See: #141041 (comment)
Also the podman maintainers have previously discussed this sort of patching and we really don't want to carry what will basically be a permanent patch. It may not seem like much to add a patch but needing to keep the
|
Hold up. I'm very confused. So the package is broken and doesn't work on darwin, so we are removing the wrapper -- which AFAICT is unrelated to the breakage, but breaks it further. But we neither mark the package as broken nor remove darwin from its supported platforms? And this solution contains a patch literally labelled "temporary", with a reference to the already-merged upstream fix, and instructions for when the already-merged upstream fix is released, but you are closing it because we won't carry permanent patches? I can understand many reasons for not wanting to merge this, but your stated reasons don't make sense. Did you read the code? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry, seems like I managed to drop a comment from a review.
By permanent patching I was referring to patching to fix the qemu
paths we could re-add the wrapper.
# path. When 4.0.0 is released, this goes away and the wrapper should set | ||
# $CONTAINERS_HELPER_BINARY_DIR instead: | ||
# https://github.com/containers/podman/blob/main/vendor/github.com/containers/common/pkg/config/config.go#L1171 | ||
./0001-Look-for-gvproxy-in-PATH.patch |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't want to add this patch with 4.0.0
being released soon as it will complicate the update, we can deal with darwin after we've completed the upgrade.
|
Aha, I get it. Sorry for the grumpy. |
4.0 update is merged, PR to wrap |
Motivation for this change
Make podman work on Mac.
This is a temporary solution to #141041, with notes on how to work with upstream's change once 4.0.0 is released.
This restores the wrapper for darwin. @zowoq mentions that this wrapper somehow wrote to the store, but I don't
see how that could be unless there is a problem with one of packages passed to lib.makeBinPath (in which case
removing the wrapper isn't the right fix).
Things done
sandbox = true
set innix.conf
? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)nixos/doc/manual/md-to-db.sh
to update generated release notes@marsam @zowoq