1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 19:51:17 +00:00

Merge pull request #273437 from sirchia/update-podman-4.8.1

podman: 4.7.2 -> 4.8.1
This commit is contained in:
Pascal Bach 2023-12-17 11:57:35 +01:00 committed by GitHub
commit 3e44b588da
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions

View file

@ -62,13 +62,13 @@ let
in
buildGoModule rec {
pname = "podman";
version = "4.7.2";
version = "4.8.1";
src = fetchFromGitHub {
owner = "containers";
repo = "podman";
rev = "v${version}";
hash = "sha256-o5FTCuFUbTlENqvh+u6fPEfD816tKWPxHu2yhBi/Mf0=";
hash = "sha256-EDIgipbv8Z7nVV6VQ5IAmvHvvpLyGEDHMDnwhMUm/BQ=";
};
patches = [

View file

@ -1,5 +1,5 @@
diff --git a/pkg/machine/machine_common.go b/pkg/machine/machine_common.go
index 649748947..a981d93bf 100644
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. `
@ -7,10 +7,10 @@ index 649748947..a981d93bf 100644
if len(helper) < 1 {
fmt.Print(fmtString)
- } else {
- fmtString += `If you would like to install it run the\nfollowing commands:
- fmtString += `If you would like to install it, run the following commands:
-
- sudo %s install
- podman machine stop%[1]s; podman machine start%[1]s
- podman machine stop%[2]s; podman machine start%[2]s
-
- `
- fmt.Printf(fmtString, helper, suffix)