From 6303131eb9a1f1e02312a9af3b7d77f6f4f9fcd0 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 8 Nov 2019 15:37:30 +0100
Subject: nixos/redis: fix merging

https://github.com/NixOS/nixpkgs/pull/71584 did merging without mkMerge.

cc @jtojnar
---
 nixos/modules/services/databases/redis.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'nixos')

diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix
index 5695eeaf74cb..95128a641d94 100644
--- a/nixos/modules/services/databases/redis.nix
+++ b/nixos/modules/services/databases/redis.nix
@@ -185,10 +185,10 @@ in
   ###### implementation
 
   config = mkIf config.services.redis.enable {
-
-    boot.kernel.sysctl = {
-      "vm.nr_hugepages" = "0";
-    } // mkIf cfg.vmOverCommit { "vm.overcommit_memory" = "1"; };
+    boot.kernel.sysctl = (mkMerge [
+      { "vm.nr_hugepages" = "0"; }
+      ( mkIf cfg.vmOverCommit { "vm.overcommit_memory" = "1"; } )
+    ]);
 
     networking.firewall = mkIf cfg.openFirewall {
       allowedTCPPorts = [ cfg.port ];
-- 
cgit 1.4.1