From 8ff00dd4c5d19dff735d9db206aafc7cdb35e534 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 19 May 2009 14:55:17 +0000
Subject: [PATCH] svn path=/nixos/branches/modular-nixos/; revision=15653

---
 system/system.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/system.nix b/system/system.nix
index d0bf32d7bf4..0af8e602a47 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -15,7 +15,7 @@ rec {
   # values.
   config =
     pkgs.lib.fixOptionSets
-      pkgs.lib.newMergeOptionSets
+      pkgs.lib.mergeOptionSets
       pkgs configComponents;
 
   optionDeclarations =