nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 00:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

podman: 5.2.3 -> 5.3.0 (#356754)

Browse Source
This commit is contained in:
Austin Horstman 2024-11-18 20:38:50 -06:00 committed by GitHub
commit 93a8ad9422
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/by-name/po/podman/hardcode-paths.patch
View File

@ -1,8 +1,8 @@
diff --git a/vendor/github.com/containers/common/pkg/config/default.go b/vendor/github.com/containers/common/pkg/config/default.go
index 3a6d804ad..5628e2bf6 100644
index 02ff128..d3254ba 100644
--- a/vendor/github.com/containers/common/pkg/config/default.go
+++ b/vendor/github.com/containers/common/pkg/config/default.go
@@ -366,75 +366,34 @@ func defaultEngineConfig() (*EngineConfig, error) {
@@ -378,75 +378,34 @@ func defaultEngineConfig() (*EngineConfig, error) {
c.Retry = 3
c.OCIRuntimes = map[string][]string{
"crun": {
@ -88,7 +88,7 @@ index 3a6d804ad..5628e2bf6 100644
},
}
c.PlatformToOCIRuntime = map[string]string{
@@ -445,26 +404,12 @@ func defaultEngineConfig() (*EngineConfig, error) {
@@ -457,26 +416,12 @@ func defaultEngineConfig() (*EngineConfig, error) {
// Needs to be called after populating c.OCIRuntimes.
c.OCIRuntime = c.findRuntime()

4
pkgs/by-name/po/podman/package.nix
View File

@ -66,13 +66,13 @@ let
in
buildGoModule rec {
pname = "podman";
version = "5.2.3";
version = "5.3.0";
src = fetchFromGitHub {
owner = "containers";
repo = "podman";
rev = "v${version}";
hash = "sha256-2FnUijeQhre7B4utsGGEGbMuuMVZlPDoM2di3z1d4vs=";
hash = "sha256-v7srZ1S4qnEOgXvhj+61tSWqzx9qFv0m3iBEUoMu7+U=";
};
patches = [

8
pkgs/by-name/po/podman/rm-podman-mac-helper-msg.patch
View File

@ -1,22 +1,22 @@
diff --git a/pkg/machine/machine_common.go b/pkg/machine/machine_common.go
index 1afc3d15b..a8aafcaae 100644
index d2ba418..5098cdc 100644
--- a/pkg/machine/machine_common.go
+++ b/pkg/machine/machine_common.go
@@ -33,13 +33,8 @@ func GetDevNullFiles() (*os.File, *os.File, error) {
@@ -34,13 +34,8 @@ func GetDevNullFiles() (*os.File, *os.File, error) {
// WaitAPIAndPrintInfo prints info about the machine and does a ping test on the
// API socket
func WaitAPIAndPrintInfo(forwardState APIForwardingState, name, helper, forwardSock string, noInfo, rootful bool) {
- suffix := ""
var fmtString string
- if name != DefaultMachineName {
- if name != define.DefaultMachineName {
- suffix = " " + name
- }
-
if forwardState == NoForwarding {
return
}
@@ -61,14 +56,6 @@ address can't be used by podman. `
@@ -62,14 +57,6 @@ address can't be used by podman. `
if len(helper) < 1 {
fmt.Print(fmtString)