alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

cri-o: 1.25.1 -> 1.26.0

Browse source
This commit is contained in:
R. Ryantm 2022-12-24 18:47:19 +00:00 committed by zowoq
parent 448dc91db4
commit 2d72d4775e
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nixos/modules/virtualisation/cri-o.nix
View file

@ -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

6
pkgs/applications/virtualization/cri-o/default.nix
View file

@ -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]