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

podman: 4.9.3 -> 5.0.0 #299302

Closed
wants to merge 2 commits into from
Closed

podman: 4.9.3 -> 5.0.0 #299302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eef4cad
podman: v4.9.3 -> v5.0.0
zaphar Mar 26, 2024
6cdc09e
podman: Remove mac helper message
zaphar Mar 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkgs/applications/virtualization/podman/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,13 @@ let
in
buildGoModule rec {
pname = "podman";
version = "4.9.3";
version = "5.0.0";

src = fetchFromGitHub {
owner = "containers";
repo = "podman";
rev = "v${version}";
hash = "sha256-PdAXcXtc/Jl3ttWWB6TciiOwWescJ51Glhf2ZhOw550=";
hash = "sha256-wJXpLH/Mtg3P7osNtw1bDRU0i67C+tlV4VrzV0GoJTw=";
};

patches = [
Expand Down
16 changes: 8 additions & 8 deletions pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@ diff --git a/pkg/machine/machine_common.go b/pkg/machine/machine_common.go
index 4e43dd54c..a981d93bf 100644
--- a/pkg/machine/machine_common.go
+++ b/pkg/machine/machine_common.go
@@ -127,14 +127,6 @@ address can't be used by podman. `
@@ -60,14 +60,7 @@ address can't be used by podman. `

if len(helper) < 1 {
fmt.Print(fmtString)
fmt.Print(fmtString)
- } else {
- fmtString += `If you would like to install it, run the following commands:
-
- sudo %s install
- podman machine stop%[2]s; podman machine start%[2]s
-
- `
- fmt.Printf(fmtString, helper, suffix)
}
case MachineLocal:
fmt.Printf("\nAnother process was listening on the default Docker API socket address.\n")
-`
fmt.Printf(fmtString, helper, suffix)
}
case MachineLocal:
fmt.Printf("\nAnother process was listening on the default Docker API socket address.\n")