diff options
| author | zowoq <59103226+zowoq@users.noreply.github.com> | 2023-02-02 09:25:13 +1000 |
|---|---|---|
| committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2023-02-06 18:46:38 +1000 |
| commit | 8b031cac44ae8fb02b6017863aeefe727806ad41 (patch) | |
| tree | b4edef9940d6a584e96867323614076989f3248c /pkgs/applications/virtualization/podman | |
| parent | b1e8f50695d2ade773639e071f71e9830ed5bd57 (diff) | |
| download | nixpkgs-8b031cac44ae8fb02b6017863aeefe727806ad41.tar nixpkgs-8b031cac44ae8fb02b6017863aeefe727806ad41.tar.gz nixpkgs-8b031cac44ae8fb02b6017863aeefe727806ad41.tar.bz2 nixpkgs-8b031cac44ae8fb02b6017863aeefe727806ad41.tar.lz nixpkgs-8b031cac44ae8fb02b6017863aeefe727806ad41.tar.xz nixpkgs-8b031cac44ae8fb02b6017863aeefe727806ad41.tar.zst nixpkgs-8b031cac44ae8fb02b6017863aeefe727806ad41.zip | |
podman: 4.3.1 -> 4.4.0
https://github.com/containers/podman/releases/tag/v4.4.0
Diffstat (limited to 'pkgs/applications/virtualization/podman')
| -rw-r--r-- | pkgs/applications/virtualization/podman/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch | 26 |
2 files changed, 15 insertions, 15 deletions
diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index f6cc83fde17..630d6a3be12 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -18,13 +18,13 @@ buildGoModule rec { pname = "podman"; - version = "4.3.1"; + version = "4.4.0"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - sha256 = "sha256-UOAQtGDoZe+Av4+9RQCJiV3//B/pdF0pEsca4FonGxY="; + sha256 = "sha256-kyeON8S7CCVdHt09wigNXDWScgyaLzC4EhOts8ViP2w="; }; 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 902a50e4ce2..d1fe9bcc9b0 100644 --- a/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch +++ b/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch @@ -1,16 +1,16 @@ diff --git a/pkg/machine/qemu/machine.go b/pkg/machine/qemu/machine.go -index a6907c0df..717d82ff3 100644 +index 4f25b4d26..8a79862fd 100644 --- a/pkg/machine/qemu/machine.go +++ b/pkg/machine/qemu/machine.go -@@ -1483,11 +1483,6 @@ func (v *MachineVM) waitAPIAndPrintInfo(forwardState apiForwardingState, forward - case 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 machineLocal: - fmt.Printf("\nAnother process was listening on the default Docker API socket address.\n") - case claimUnsupported: +@@ -1509,11 +1509,6 @@ func (v *MachineVM) waitAPIAndPrintInfo(forwardState apiForwardingState, forward + case 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 machineLocal: + fmt.Printf("\nAnother process was listening on the default Docker API socket address.\n") + case claimUnsupported: |