public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/redis: fix merging

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

cc @jtojnar
This commit is contained in:
Florian Klink 2019-11-08 15:37:30 +01:00
parent a2429cffa3
commit 6303131eb9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nixos/modules/services/databases/redis.nix
View File

@ -185,10 +185,10 @@ in
###### implementation ###### implementation
config = mkIf config.services.redis.enable { config = mkIf config.services.redis.enable {
boot.kernel.sysctl = (mkMerge [
boot.kernel.sysctl = { { "vm.nr_hugepages" = "0"; }
"vm.nr_hugepages" = "0"; ( mkIf cfg.vmOverCommit { "vm.overcommit_memory" = "1"; } )
} // mkIf cfg.vmOverCommit { "vm.overcommit_memory" = "1"; }; ]);
networking.firewall = mkIf cfg.openFirewall { networking.firewall = mkIf cfg.openFirewall {
allowedTCPPorts = [ cfg.port ]; allowedTCPPorts = [ cfg.port ];