From 33313b87e65fc04f5440511f007cf105dc37e63f Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 18 Aug 2022 10:46:32 +1000 Subject: [PATCH] buildah, cri-o, podman: drop unneeded cni-plugins input from wrapper --- pkgs/applications/virtualization/cri-o/wrapper.nix | 1 - pkgs/applications/virtualization/podman/wrapper.nix | 1 - pkgs/development/tools/buildah/wrapper.nix | 1 - 3 files changed, 3 deletions(-) diff --git a/pkgs/applications/virtualization/cri-o/wrapper.nix b/pkgs/applications/virtualization/cri-o/wrapper.nix index a0a39beeda20..a984db037d46 100644 --- a/pkgs/applications/virtualization/cri-o/wrapper.nix +++ b/pkgs/applications/virtualization/cri-o/wrapper.nix @@ -8,7 +8,6 @@ , crun # Container runtime (default with cgroups v2 for podman/buildah) , conmon # Container runtime monitor , util-linux # nsenter -, cni-plugins # not added to path , iptables }: diff --git a/pkgs/applications/virtualization/podman/wrapper.nix b/pkgs/applications/virtualization/podman/wrapper.nix index 48a08f518445..b0b3c4abd916 100644 --- a/pkgs/applications/virtualization/podman/wrapper.nix +++ b/pkgs/applications/virtualization/podman/wrapper.nix @@ -12,7 +12,6 @@ , slirp4netns # User-mode networking for unprivileged namespaces , fuse-overlayfs # CoW for images, much faster than default vfs , util-linux # nsenter -, cni-plugins # not added to path , iptables , iproute2 , catatonit diff --git a/pkgs/development/tools/buildah/wrapper.nix b/pkgs/development/tools/buildah/wrapper.nix index 66cb060a8180..858a422a3405 100644 --- a/pkgs/development/tools/buildah/wrapper.nix +++ b/pkgs/development/tools/buildah/wrapper.nix @@ -11,7 +11,6 @@ , slirp4netns # User-mode networking for unprivileged namespaces , fuse-overlayfs # CoW for images, much faster than default vfs , util-linux # nsenter -, cni-plugins # not added to path , iptables }: