From 1b2006270f9e1307f575a9a7bc82b6d4f3c37cec Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 28 Oct 2013 17:46:45 +0100
Subject: [PATCH] Support mkOverride in non-leaf nodes

---
 lib/modules.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/modules.nix b/lib/modules.nix
index f6b866304d05..d141838d466c 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -125,7 +125,6 @@ rec {
       if opt.options ? default && res ? default ||
          opt.options ? example && res ? example ||
          opt.options ? description && res ? description ||
-         opt.options ? merge && res ? merge || # FIXME: remove merge
          opt.options ? apply && res ? apply ||
          opt.options ? type && res ? type
       then
@@ -185,8 +184,9 @@ rec {
       concatMap pushDownProperties cfg.contents
     else if cfg._type or "" == "if" then
       map (mapAttrs (n: v: mkIf cfg.condition v)) (pushDownProperties cfg.content)
+    else if cfg._type or "" == "override" then
+      map (mapAttrs (n: v: mkOverride cfg.priority v)) (pushDownProperties cfg.content)
     else
-      # FIXME: handle mkOverride?
       [ cfg ];
 
   /* Given a config value, expand mkMerge properties, and discharge