diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index e82ab35a344..e3ff4fc417d 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -22,9 +22,13 @@ buildGoModule rec { owner = "containers"; repo = "podman"; rev = "v${version}"; - sha256 = "141ii271w2azvhl8ragrgzmir9iq9npl8wmh5dr31kvq4z4syxw1"; + sha256 = "1dsriw2vjzjaddxdhl3wbj2ppnsyi29f4bjwc8lzyz20wfwx4ay4"; }; + patches = [ + ./remove-unconfigured-runtime-warn.patch + ]; + vendorSha256 = null; doCheck = false; diff --git a/pkgs/applications/virtualization/podman/remove-unconfigured-runtime-warn.patch b/pkgs/applications/virtualization/podman/remove-unconfigured-runtime-warn.patch new file mode 100644 index 00000000000..8530cd93cdf --- /dev/null +++ b/pkgs/applications/virtualization/podman/remove-unconfigured-runtime-warn.patch @@ -0,0 +1,23 @@ +Remove warning "WARN[0000] Found default OCIruntime /nix/store/.../bin/crun path which is missing from [engine.runtimes] in containers.conf + +It doesn't make sense as we promote using the podman wrapper where runtime paths will vary because they are nix store paths. +--- + vendor/github.com/containers/common/pkg/config/config.go | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/vendor/github.com/containers/common/pkg/config/config.go b/vendor/github.com/containers/common/pkg/config/config.go +index 4a98c7e92..4a95a2a49 100644 +--- a/vendor/github.com/containers/common/pkg/config/config.go ++++ b/vendor/github.com/containers/common/pkg/config/config.go +@@ -605,8 +605,7 @@ func (c *EngineConfig) findRuntime() string { + return name + } + } +- if path, err := exec.LookPath(name); err == nil { +- logrus.Warningf("Found default OCIruntime %s path which is missing from [engine.runtimes] in containers.conf", path) ++ if _, err := exec.LookPath(name); err == nil { + return name + } + } +-- +2.30.0 diff --git a/pkgs/applications/virtualization/podman/wrapper.nix b/pkgs/applications/virtualization/podman/wrapper.nix index 863888227b3..976ba6c67b3 100644 --- a/pkgs/applications/virtualization/podman/wrapper.nix +++ b/pkgs/applications/virtualization/podman/wrapper.nix @@ -31,6 +31,8 @@ in runCommand podman.name { name = "${podman.pname}-wrapper-${podman.version}"; inherit (podman) pname version passthru; + preferLocalBuild = true; + meta = builtins.removeAttrs podman.meta [ "outputsToInstall" ]; outputs = [