Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f07460487163
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 107e2b7b29fd
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 8, 2019

  1. nixos/redis: fix merging 

    NixOS/nixpkgs#71584 did merging without mkMerge.

cc @jtojnar

(cherry picked from commit 6303131)
    @flokli
    flokli committed Nov 8, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    Doctor-wu Doctor Wu
    GPG key ID: 7D1412F015912FB2
    Verified
    Learn about vigilant mode
    Copy the full SHA
    107e2b7 View commit details
Showing with 4 additions and 4 deletions.
  1. +4 −4 nixos/modules/services/databases/redis.nix
8 changes: 4 additions & 4 deletions nixos/modules/services/databases/redis.nix
View file
Original file line number Diff line number Diff line change
@@ -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 ];