summary refs log tree commit diff
path: root/nixos/modules/virtualisation
diff options
context:
space:
mode:
authorembr <git@liclac.eu>2021-07-16 13:07:46 +0200
committerzowoq <59103226+zowoq@users.noreply.github.com>2021-07-20 15:35:45 +1000
commit8e6c4f9a2ec1febe7f644dd3be9af597c14c9e7c (patch)
tree8d58bee11d8e108354a8c99a04bb1fe1a6a00723 /nixos/modules/virtualisation
parent1cf78b53afa080eaa7d34f912adad7e98c4290eb (diff)
downloadnixpkgs-8e6c4f9a2ec1febe7f644dd3be9af597c14c9e7c.tar
nixpkgs-8e6c4f9a2ec1febe7f644dd3be9af597c14c9e7c.tar.gz
nixpkgs-8e6c4f9a2ec1febe7f644dd3be9af597c14c9e7c.tar.bz2
nixpkgs-8e6c4f9a2ec1febe7f644dd3be9af597c14c9e7c.tar.lz
nixpkgs-8e6c4f9a2ec1febe7f644dd3be9af597c14c9e7c.tar.xz
nixpkgs-8e6c4f9a2ec1febe7f644dd3be9af597c14c9e7c.tar.zst
nixpkgs-8e6c4f9a2ec1febe7f644dd3be9af597c14c9e7c.zip
nixos/cri-o: Remove unnecessary `lib.` qualifiers
We're already using `with lib` here, so we can just say `mkOption`, etc.
Diffstat (limited to 'nixos/modules/virtualisation')
-rw-r--r--nixos/modules/virtualisation/cri-o.nix18
1 files changed, 9 insertions, 9 deletions
diff --git a/nixos/modules/virtualisation/cri-o.nix b/nixos/modules/virtualisation/cri-o.nix
index b93776a3871..c135081959a 100644
--- a/nixos/modules/virtualisation/cri-o.nix
+++ b/nixos/modules/virtualisation/cri-o.nix
@@ -16,7 +16,7 @@ in
   ];
 
   meta = {
-    maintainers = lib.teams.podman.members;
+    maintainers = teams.podman.members;
   };
 
   options.virtualisation.cri-o = {
@@ -58,7 +58,7 @@ in
     extraPackages = mkOption {
       type = with types; listOf package;
       default = [ ];
-      example = lib.literalExample ''
+      example = literalExample ''
         [
           pkgs.gvisor
         ]
@@ -68,7 +68,7 @@ in
       '';
     };
 
-    package = lib.mkOption {
+    package = mkOption {
       type = types.package;
       default = crioPackage;
       internal = true;
@@ -84,7 +84,7 @@ in
       internal = true;
     };
 
-    settings = lib.mkOption {
+    settings = mkOption {
       type = format.type;
       default = { };
       description = ''
@@ -103,13 +103,13 @@ in
       storage_driver = cfg.storageDriver;
 
       image = {
-        pause_image = lib.mkIf (cfg.pauseImage != null) cfg.pauseImage;
-        pause_command = lib.mkIf (cfg.pauseCommand != null) cfg.pauseCommand;
+        pause_image = mkIf (cfg.pauseImage != null) cfg.pauseImage;
+        pause_command = mkIf (cfg.pauseCommand != null) cfg.pauseCommand;
       };
 
       network = {
         plugin_dirs = [ "${pkgs.cni-plugins}/bin" ];
-        network_dir = lib.mkIf (cfg.networkDir != null) cfg.networkDir;
+        network_dir = mkIf (cfg.networkDir != null) cfg.networkDir;
       };
 
       runtime = {
@@ -121,8 +121,8 @@ in
           optional (config.virtualisation.containers.ociSeccompBpfHook.enable)
             config.boot.kernelPackages.oci-seccomp-bpf-hook;
 
-        default_runtime = lib.mkIf (cfg.runtime != null) cfg.runtime;
-        runtimes = lib.mkIf (cfg.runtime != null) {
+        default_runtime = mkIf (cfg.runtime != null) cfg.runtime;
+        runtimes = mkIf (cfg.runtime != null) {
           "${cfg.runtime}" = { };
         };
       };