From a4f1f4b3673727ddbc5758ea5f0836d013fcc111 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 24 Oct 2013 14:48:02 +0200
Subject: [PATCH] Small cleanup
---
lib/misc.nix | 4 +---
lib/modules.nix | 3 +--
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/lib/misc.nix b/lib/misc.nix
index 19e5081009d..c128b9af9d8 100644
--- a/lib/misc.nix
+++ b/lib/misc.nix
@@ -206,9 +206,7 @@ rec {
in
work startSet [] [];
- genericClosure =
- if builtins ? genericClosure then builtins.genericClosure
- else lazyGenericClosure;
+ genericClosure = builtins.genericClosure or lazyGenericClosure;
innerModifySumArgs = f: x: a: b: if b == null then (f a b) // x else
innerModifySumArgs f x (a // b);
diff --git a/lib/modules.nix b/lib/modules.nix
index acd10e7bf57..f914947e784 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -185,8 +185,7 @@ rec {
) funs;
- moduleMerge = path: modules:
- let modules_ = modules; in
+ moduleMerge = path: modules_:
let
addName = name:
if path == "" then name else path + "." + name;