From f8ab5fcd8d15dd551dfc5c6e34f27a1e92d7b1f6 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Tue, 20 Oct 2020 16:10:21 +0200
Subject: lib/modules: Simplify inherits

---
 lib/modules.nix | 66 ++++++++++++++++++++++++++++-----------------------------
 1 file changed, 32 insertions(+), 34 deletions(-)

(limited to 'lib/modules.nix')

diff --git a/lib/modules.nix b/lib/modules.nix
index 37e2e23ec12d4..6c4a8f7b3247e 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -1,53 +1,51 @@
 { lib }:
 
 let
-  inherit (lib.attrsets)
-    mapAttrsRecursiveCond
-    ;
-  inherit (lib.lists)
-    any all concatLists concatMap
-    count filter findFirst foldl foldl'
-    head imap1 length optional
-    reverseList sort
-    ;
-  inherit (lib.options)
-    isOption
-    mkOption
-    showDefs
-    showFiles
-    showOption
-    unknownModule
-    ;
-  inherit (lib.attrsets)
+  inherit (lib)
+    all
+    any
     attrByPath
     attrNames
     catAttrs
+    concatLists
+    concatMap
+    count
+    elem
+    filter
+    findFirst
+    flip
+    foldl
+    foldl'
     getAttrFromPath
+    head
+    id
+    imap1
+    isAttrs
+    isBool
+    isFunction
+    isString
+    length
     mapAttrs
     mapAttrsToList
+    mapAttrsRecursiveCond
+    min
+    optional
     optionalAttrs
+    optionalString
     recursiveUpdate
+    reverseList sort
     setAttrByPath
     toList
-    ;
-  inherit (lib.types)
     types
-    ;
-  inherit (lib.trivial)
-    flip
-    id
-    isBool
-    isFunction
-    isString
-    min
     warn
     ;
-  inherit (lib.strings)
-    optionalString
-    ;
-  inherit (lib)
-    elem
-    isAttrs
+  inherit (lib.options)
+    isOption
+    mkOption
+    showDefs
+    showFiles
+    showOption
+    unknownModule
     ;
 in
 
-- 
cgit 1.4.1