From be33a681777a76efe180de4888e1642987a4b24d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 29 Oct 2013 14:23:10 +0100
Subject: Add fixMergeModules back in

NixOps uses it.
---
 lib/modules.nix | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'lib/modules.nix')

diff --git a/lib/modules.nix b/lib/modules.nix
index f96013f3042..e4ec3c3479c 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -294,4 +294,8 @@ rec {
   # FIXME: Add mkOrder back in. It's not currently used anywhere in
   # NixOS, but it should be useful.
 
+
+  /* Compatibility. */
+  fixMergeModules = modules: args: evalModules { inherit modules args; };
+
 }
-- 
cgit 1.4.1