diff options
| author | R. Ryantm <ryantm-bot@ryantm.com> | 2022-12-24 18:47:19 +0000 |
|---|---|---|
| committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2023-01-08 13:30:27 +1000 |
| commit | 2d72d4775e7896f54db0739f1ca044cae9afe558 (patch) | |
| tree | 8861c94e47e2b02eec6464fa4073d7ce457dc18b | |
| parent | 448dc91db4f17b5e6e1f5c247eb8a847d1378f56 (diff) | |
| download | nixpkgs-2d72d4775e7896f54db0739f1ca044cae9afe558.tar nixpkgs-2d72d4775e7896f54db0739f1ca044cae9afe558.tar.gz nixpkgs-2d72d4775e7896f54db0739f1ca044cae9afe558.tar.bz2 nixpkgs-2d72d4775e7896f54db0739f1ca044cae9afe558.tar.lz nixpkgs-2d72d4775e7896f54db0739f1ca044cae9afe558.tar.xz nixpkgs-2d72d4775e7896f54db0739f1ca044cae9afe558.tar.zst nixpkgs-2d72d4775e7896f54db0739f1ca044cae9afe558.zip | |
cri-o: 1.25.1 -> 1.26.0
| -rw-r--r-- | nixos/modules/virtualisation/cri-o.nix | 4 | ||||
| -rw-r--r-- | 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 c71035c338d..3503a6fff6a 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 7d197d30b93..19097ae1d99 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] |