diff options
| author | Pascal Bach <pascal.bach@nextrem.ch> | 2023-12-17 11:57:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-17 11:57:35 +0100 |
| commit | 3e44b588da42b553c78b8aebe3753e582afd1284 (patch) | |
| tree | de9314bf812fb3c97547a3a49c2e8168e93506c0 /pkgs/applications | |
| parent | 0009d02d743d24318fececedcaedfac269c0ead1 (diff) | |
| parent | f2dc18834be35908a3cbc8af5c2e97e1d2d53c99 (diff) | |
| download | nixlib-3e44b588da42b553c78b8aebe3753e582afd1284.tar nixlib-3e44b588da42b553c78b8aebe3753e582afd1284.tar.gz nixlib-3e44b588da42b553c78b8aebe3753e582afd1284.tar.bz2 nixlib-3e44b588da42b553c78b8aebe3753e582afd1284.tar.lz nixlib-3e44b588da42b553c78b8aebe3753e582afd1284.tar.xz nixlib-3e44b588da42b553c78b8aebe3753e582afd1284.tar.zst nixlib-3e44b588da42b553c78b8aebe3753e582afd1284.zip | |
Merge pull request #273437 from sirchia/update-podman-4.8.1
podman: 4.7.2 -> 4.8.1
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/virtualization/podman/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 8841abcd3671..b714db0bd62a 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -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 = [ diff --git a/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch b/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch index 5663f5e8a018..179ce41f02b2 100644 --- a/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch +++ b/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch @@ -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) |