From c9f8f66248dde642e7a0eea52fe4c32ddb464796 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Thu, 22 Oct 2020 13:45:25 +0200
Subject: [PATCH] lib/options.nix: Use merge-friendly inherit syntax

---
 lib/options.nix | 35 ++++++++++++++++++++++++++++++-----
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/lib/options.nix b/lib/options.nix
index 97bb2e77176c..87cd8b797969 100644
--- a/lib/options.nix
+++ b/lib/options.nix
@@ -3,12 +3,37 @@
 
 let
   inherit (lib)
-    isAttrs isBool isDerivation isFunction isInt isList isString
-    all collect concatMap concatLists elemAt filter foldl' head length mapAttrs optionals optional take
+    all
+    collect
+    concatLists
+    concatMap
+    elemAt
+    filter
+    foldl'
+    head
+    isAttrs
+    isBool
+    isDerivation
+    isFunction
+    isInt
+    isList
+    isString
+    length
+    mapAttrs
+    optional
+    optionals
+    take
+    ;
+  inherit (lib.attrsets)
+    optionalAttrs
+    ;
+  inherit (lib.strings)
+    concatMapStrings
+    concatStringsSep
+    ;
+  inherit (lib.types)
+    mkOptionType
     ;
-  inherit (lib.attrsets) optionalAttrs;
-  inherit (lib.strings) concatMapStrings concatStringsSep;
-  inherit (lib.types) mkOptionType;
 in
 rec {