From f4dadc5df8561405df9aabf4fa2c2dcd13234b22 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 28 Oct 2013 00:13:13 +0100
Subject: rename.nix: Don't use the extraConfigs feature

---
 nixos/modules/rename.nix | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'nixos/modules/rename.nix')

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)));
         }
       ];
 
-- 
cgit 1.4.1