pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #258851 from cyrillzadra/bump-podman470

podman: 4.6.2 -> 4.7.0

authored by

Mario Rodas and committed by
GitHub 32b8bd32 ae2aa4cc

+20 -17
unified split
+2 -2
pkgs/applications/virtualization/podman/default.nix
··· 62 62 in 63 63 buildGoModule rec { 64 64 pname = "podman"; 65 - version = "4.6.2"; 65 + version = "4.7.0"; 66 66 67 67 src = fetchFromGitHub { 68 68 owner = "containers"; 69 69 repo = "podman"; 70 70 rev = "v${version}"; 71 - hash = "sha256-Zxzb7ORyugvN9mhxa0s8r0ch16Ndbm3Z1JCsQcwbF6g="; 71 + hash = "sha256-xbU2F/QYtTKeZacTmwKDfIGuUg9VStEO/jkpChK0DyU="; 72 72 }; 73 73 74 74 patches = [
+18 -15
pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch
··· 1 - diff --git a/pkg/machine/qemu/machine.go b/pkg/machine/qemu/machine.go 2 - index a118285f7..d775f0099 100644 3 - --- a/pkg/machine/qemu/machine.go 4 - +++ b/pkg/machine/qemu/machine.go 5 - @@ -1560,11 +1560,6 @@ func (v *MachineVM) waitAPIAndPrintInfo(forwardState machine.APIForwardingState, 6 - case machine.NotInstalled: 7 - fmt.Printf("\nThe system helper service is not installed; the default Docker API socket\n") 8 - fmt.Printf("address can't be used by podman. ") 9 - - if helper := findClaimHelper(); len(helper) > 0 { 10 - - fmt.Printf("If you would like to install it run the\nfollowing commands:\n") 11 - - fmt.Printf("\n\tsudo %s install\n", helper) 12 - - fmt.Printf("\tpodman machine stop%s; podman machine start%s\n\n", suffix, suffix) 13 - - } 14 - case machine.MachineLocal: 1 + diff --git a/pkg/machine/machine_common.go b/pkg/machine/machine_common.go 2 + index 649748947..a981d93bf 100644 3 + --- a/pkg/machine/machine_common.go 4 + +++ b/pkg/machine/machine_common.go 5 + @@ -127,14 +127,6 @@ address can't be used by podman. ` 6 + 7 + if len(helper) < 1 { 8 + fmt.Print(fmtString) 9 + - } else { 10 + - fmtString += `If you would like to install it run the\nfollowing commands: 11 + - 12 + - sudo %s install 13 + - podman machine stop%[1]s; podman machine start%[1]s 14 + - 15 + - ` 16 + - fmt.Printf(fmtString, helper, suffix) 17 + } 18 + case MachineLocal: 15 19 fmt.Printf("\nAnother process was listening on the default Docker API socket address.\n") 16 - case machine.ClaimUnsupported: