b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #258851 from cyrillzadra/bump-podman470

Browse source 
podman: 4.6.2 -> 4.7.0
This commit is contained in:
Mario Rodas 2023-10-04 05:21:56 -05:00 committed by GitHub
parent ae2aa4cce9 565a409df9
commit 32b8bd327c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/virtualization/podman/default.nix
View file

@ -62,13 +62,13 @@ let
in
buildGoModule rec {
pname = "podman";
version = "4.6.2";
version = "4.7.0";
src = fetchFromGitHub {
owner = "containers";
repo = "podman";
rev = "v${version}";
hash = "sha256-Zxzb7ORyugvN9mhxa0s8r0ch16Ndbm3Z1JCsQcwbF6g=";
hash = "sha256-xbU2F/QYtTKeZacTmwKDfIGuUg9VStEO/jkpChK0DyU=";
};
patches = [

33
pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch
View file

@ -1,16 +1,19 @@
diff --git a/pkg/machine/qemu/machine.go b/pkg/machine/qemu/machine.go
index a118285f7..d775f0099 100644
--- a/pkg/machine/qemu/machine.go
+++ b/pkg/machine/qemu/machine.go
@@ -1560,11 +1560,6 @@ func (v *MachineVM) waitAPIAndPrintInfo(forwardState machine.APIForwardingState,
case machine.NotInstalled:
fmt.Printf("\nThe system helper service is not installed; the default Docker API socket\n")
fmt.Printf("address can't be used by podman. ")
- if helper := findClaimHelper(); len(helper) > 0 {
- fmt.Printf("If you would like to install it run the\nfollowing commands:\n")
- fmt.Printf("\n\tsudo %s install\n", helper)
- fmt.Printf("\tpodman machine stop%s; podman machine start%s\n\n", suffix, suffix)
- }
case machine.MachineLocal:
diff --git a/pkg/machine/machine_common.go b/pkg/machine/machine_common.go
index 649748947..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. `
if len(helper) < 1 {
fmt.Print(fmtString)
- } else {
- fmtString += `If you would like to install it run the\nfollowing commands:
-
- sudo %s install
- podman machine stop%[1]s; podman machine start%[1]s
-
- `
- fmt.Printf(fmtString, helper, suffix)
}
case MachineLocal:
fmt.Printf("\nAnother process was listening on the default Docker API socket address.\n")
case machine.ClaimUnsupported: