From 5a78f2c7729b6d6be966af22a02ecfc0742e86f1 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sat, 24 Aug 2024 22:05:27 +0200
Subject: [PATCH] nixos/intel-sgx: remove `with lib;`

---
 nixos/modules/hardware/cpu/intel-sgx.nix | 31 ++++++++++++------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/nixos/modules/hardware/cpu/intel-sgx.nix b/nixos/modules/hardware/cpu/intel-sgx.nix
index c66b43a2ec27..79d0bc1599ee 100644
--- a/nixos/modules/hardware/cpu/intel-sgx.nix
+++ b/nixos/modules/hardware/cpu/intel-sgx.nix
@@ -1,11 +1,10 @@
 { config, lib, ... }:
-with lib;
 let
   cfg = config.hardware.cpu.intel.sgx;
   defaultPrvGroup = "sgx_prv";
 in
 {
-  options.hardware.cpu.intel.sgx.enableDcapCompat = mkOption {
+  options.hardware.cpu.intel.sgx.enableDcapCompat = lib.mkOption {
     description = ''
       Whether to enable backward compatibility for SGX software build for the
       out-of-tree Intel SGX DCAP driver.
@@ -15,43 +14,43 @@ in
       `/dev/sgx/enclave`  and `/dev/sgx/provision`,
       respectively.
     '';
-    type = types.bool;
+    type = lib.types.bool;
     default = true;
   };
 
   options.hardware.cpu.intel.sgx.provision = {
-    enable = mkEnableOption "access to the Intel SGX provisioning device";
-    user = mkOption {
+    enable = lib.mkEnableOption "access to the Intel SGX provisioning device";
+    user = lib.mkOption {
       description = "Owner to assign to the SGX provisioning device.";
-      type = types.str;
+      type = lib.types.str;
       default = "root";
     };
-    group = mkOption {
+    group = lib.mkOption {
       description = "Group to assign to the SGX provisioning device.";
-      type = types.str;
+      type = lib.types.str;
       default = defaultPrvGroup;
     };
-    mode = mkOption {
+    mode = lib.mkOption {
       description = "Mode to set for the SGX provisioning device.";
-      type = types.str;
+      type = lib.types.str;
       default = "0660";
     };
   };
 
-  config = mkMerge [
-    (mkIf cfg.provision.enable {
+  config = lib.mkMerge [
+    (lib.mkIf cfg.provision.enable {
       assertions = [
         {
-          assertion = hasAttr cfg.provision.user config.users.users;
+          assertion = lib.hasAttr cfg.provision.user config.users.users;
           message = "Given user does not exist";
         }
         {
-          assertion = (cfg.provision.group == defaultPrvGroup) || (hasAttr cfg.provision.group config.users.groups);
+          assertion = (cfg.provision.group == defaultPrvGroup) || (lib.hasAttr cfg.provision.group config.users.groups);
           message = "Given group does not exist";
         }
       ];
 
-      users.groups = optionalAttrs (cfg.provision.group == defaultPrvGroup) {
+      users.groups = lib.optionalAttrs (cfg.provision.group == defaultPrvGroup) {
         "${cfg.provision.group}" = { };
       };
 
@@ -59,7 +58,7 @@ in
         SUBSYSTEM=="misc", KERNEL=="sgx_provision", OWNER="${user}", GROUP="${group}", MODE="${mode}"
       '';
     })
-    (mkIf cfg.enableDcapCompat {
+    (lib.mkIf cfg.enableDcapCompat {
       services.udev.extraRules = ''
         SUBSYSTEM=="misc", KERNEL=="sgx_enclave",   SYMLINK+="sgx/enclave"
         SUBSYSTEM=="misc", KERNEL=="sgx_provision", SYMLINK+="sgx/provision"