about summary refs log tree commit diff
path: root/nixos/modules/rename.nix
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2013-10-28 00:13:13 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2013-10-28 22:45:55 +0100
commitf4dadc5df8561405df9aabf4fa2c2dcd13234b22 (patch)
tree3bdd6f3b8f24b7af059ab0db5836ea8731e50ed1 /nixos/modules/rename.nix
parent2cc37c17d9313a22c5f4f2acbdd5b665c53f9f3c (diff)
downloadnixlib-f4dadc5df8561405df9aabf4fa2c2dcd13234b22.tar
nixlib-f4dadc5df8561405df9aabf4fa2c2dcd13234b22.tar.gz
nixlib-f4dadc5df8561405df9aabf4fa2c2dcd13234b22.tar.bz2
nixlib-f4dadc5df8561405df9aabf4fa2c2dcd13234b22.tar.lz
nixlib-f4dadc5df8561405df9aabf4fa2c2dcd13234b22.tar.xz
nixlib-f4dadc5df8561405df9aabf4fa2c2dcd13234b22.tar.zst
nixlib-f4dadc5df8561405df9aabf4fa2c2dcd13234b22.zip
rename.nix: Don't use the extraConfigs feature
Diffstat (limited to 'nixos/modules/rename.nix')
-rw-r--r--nixos/modules/rename.nix8
1 files changed, 1 insertions, 7 deletions
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 1d19fe6da76d..82ba051eebf3 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -32,7 +32,6 @@ let
     zipAttrsWith (n: v:
       if tail v != [] then
         if n == "_type" then (head v)
-        else if n == "extraConfigs" then concatLists v
         else if n == "warnings" then concatLists v
         else if n == "description" || n == "apply" then
           abort "Cannot rename an option to multiple options."
@@ -55,12 +54,7 @@ let
             inherit visible;
           });
         }
-        { options = setTo (mkOption {
-            extraConfigs =
-              let externalDefs = (fromOf options).definitions; in
-              if externalDefs == [] then []
-              else map (def: def.value) (define externalDefs);
-          });
+        { config = setTo (mkIf (fromOf options).isDefined (define (mkMerge (fromOf options).definitions)));
         }
       ];