From 2d72d4775e7896f54db0739f1ca044cae9afe558 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Dec 2022 18:47:19 +0000 Subject: [PATCH] cri-o: 1.25.1 -> 1.26.0 --- nixos/modules/virtualisation/cri-o.nix | 4 ++-- pkgs/applications/virtualization/cri-o/default.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/modules/virtualisation/cri-o.nix b/nixos/modules/virtualisation/cri-o.nix index c71035c338db..3503a6fff6a9 100644 --- a/nixos/modules/virtualisation/cri-o.nix +++ b/nixos/modules/virtualisation/cri-o.nix @@ -124,8 +124,8 @@ in }; }; - environment.etc."cni/net.d/10-crio-bridge.conf".source = "${cfg.package}/etc/cni/net.d/10-crio-bridge.conf"; - environment.etc."cni/net.d/99-loopback.conf".source = "${cfg.package}/etc/cni/net.d/99-loopback.conf"; + environment.etc."cni/net.d/10-crio-bridge.conflist".source = "${cfg.package}/etc/cni/net.d/10-crio-bridge.conflist"; + environment.etc."cni/net.d/99-loopback.conflist".source = "${cfg.package}/etc/cni/net.d/99-loopback.conflist"; environment.etc."crio/crio.conf.d/00-default.conf".source = cfgFile; # Enable common /etc/containers configuration diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 7d197d30b939..19097ae1d99e 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "cri-o"; - version = "1.25.1"; + version = "1.26.0"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "sha256-MFqCRHsIpc8ianyNW+PsDINQavbTZs2rZ2k6q/6wTkY="; + sha256 = "sha256-XVg1TBYD6Y/EByKnnD+mFL/qA6IqBohuEvUgjwN962g="; }; vendorSha256 = null; @@ -54,7 +54,7 @@ buildGoModule rec { installShellCompletion --$shell completions/$shell/* done - install contrib/cni/*.conf -Dt $out/etc/cni/net.d + install contrib/cni/*.conflist -Dt $out/etc/cni/net.d install crictl.yaml -Dt $out/etc installManPage docs/*.[1-9]