Merge pull request #115655 from helsinki-systems/upd/nginx

nginxMainline: 1.19.7 -> 1.19.8

authored by ajs124 and committed by GitHub 08ebda1a 7015e86e

+3 -3
+1 -1
nixos/modules/services/web-servers/nginx/default.nix
··· 804 804 ProtectControlGroups = true; 805 805 RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ]; 806 806 LockPersonality = true; 807 - MemoryDenyWriteExecute = !(builtins.any (mod: (mod.allowMemoryWriteExecute or false)) cfg.package.modules); 807 + MemoryDenyWriteExecute = !(builtins.any (mod: (mod.allowMemoryWriteExecute or false)) (optionals (cfg.package ? modules) cfg.package.modules)); 808 808 RestrictRealtime = true; 809 809 RestrictSUIDSGID = true; 810 810 PrivateMounts = true;
+2 -2
pkgs/servers/http/nginx/mainline.nix
··· 1 1 { callPackage, ... }@args: 2 2 3 3 callPackage ./generic.nix args { 4 - version = "1.19.7"; 5 - sha256 = "03mmfnkhayn8vm2yhs3ngvif6275c368ymx8wvhsbls11h1dvr3s"; 4 + version = "1.19.8"; 5 + sha256 = "01cb6hsaik1sfjihbrldmwrcn54gk4plfy350sl1b4rml6qik29h"; 6 6 }