dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

nixos/cri-o: Remove unnecessary lib. qualifiers

Browse Source 
We're already using `with lib` here, so we can just say `mkOption`, etc.
This commit is contained in:
embr 2021-07-16 13:07:46 +02:00 committed by zowoq
parent 1cf78b53af
commit 8e6c4f9a2e
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
nixos/modules/virtualisation/cri-o.nix
View File

@ -16,7 +16,7 @@ in
]; ];
meta = { meta = {
maintainers = lib.teams.podman.members; maintainers = teams.podman.members;
}; };
options.virtualisation.cri-o = { options.virtualisation.cri-o = {
@ -58,7 +58,7 @@ in
extraPackages = mkOption { extraPackages = mkOption {
type = with types; listOf package; type = with types; listOf package;
default = [ ]; default = [ ];
example = lib.literalExample '' example = literalExample ''
[ [
pkgs.gvisor pkgs.gvisor
] ]
@ -68,7 +68,7 @@ in
''; '';
}; };
package = lib.mkOption { package = mkOption {
type = types.package; type = types.package;
default = crioPackage; default = crioPackage;
internal = true; internal = true;
@ -84,7 +84,7 @@ in
internal = true; internal = true;
}; };
settings = lib.mkOption { settings = mkOption {
type = format.type; type = format.type;
default = { }; default = { };
description = '' description = ''
@ -103,13 +103,13 @@ in
storage_driver = cfg.storageDriver; storage_driver = cfg.storageDriver;
image = { image = {
pause_image = lib.mkIf (cfg.pauseImage != null) cfg.pauseImage; pause_image = mkIf (cfg.pauseImage != null) cfg.pauseImage;
pause_command = lib.mkIf (cfg.pauseCommand != null) cfg.pauseCommand; pause_command = mkIf (cfg.pauseCommand != null) cfg.pauseCommand;
}; };
network = { network = {
plugin_dirs = [ "${pkgs.cni-plugins}/bin" ]; plugin_dirs = [ "${pkgs.cni-plugins}/bin" ];
network_dir = lib.mkIf (cfg.networkDir != null) cfg.networkDir; network_dir = mkIf (cfg.networkDir != null) cfg.networkDir;
}; };
runtime = { runtime = {
@ -121,8 +121,8 @@ in
optional (config.virtualisation.containers.ociSeccompBpfHook.enable) optional (config.virtualisation.containers.ociSeccompBpfHook.enable)
config.boot.kernelPackages.oci-seccomp-bpf-hook; config.boot.kernelPackages.oci-seccomp-bpf-hook;
default_runtime = lib.mkIf (cfg.runtime != null) cfg.runtime; default_runtime = mkIf (cfg.runtime != null) cfg.runtime;
runtimes = lib.mkIf (cfg.runtime != null) { runtimes = mkIf (cfg.runtime != null) {
"${cfg.runtime}" = { }; "${cfg.runtime}" = { };
}; };
}; };