From 16873acde8b421eda63a529333753071d7c17b31 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 4 Nov 2021 15:47:36 +0100 Subject: [PATCH 1/2] nginxMainline: 1.21.3 -> 1.21.4 --- pkgs/servers/http/nginx/mainline.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index 1b63b06f2cb4..2e051ca8c79d 100644 --- a/pkgs/servers/http/nginx/mainline.nix +++ b/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix args { - version = "1.21.3"; - sha256 = "0nhps7igdqcpcy1r8677ar807rfclpylmz3y858a678m1np4lxql"; + version = "1.21.4"; + sha256 = "1ziv3xargxhxycd5hp6r3r5mww54nvvydiywcpsamg3i9r3jzxyi"; } From ffa6cb97ff76a25489e83ba409e4a0c7dbbfd93c Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 5 Nov 2021 13:10:58 +0100 Subject: [PATCH 2/2] nginxMainline: use openssl_3_0 --- pkgs/servers/http/nginx/mainline.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index 2e051ca8c79d..774a3cbe6deb 100644 --- a/pkgs/servers/http/nginx/mainline.nix +++ b/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ -{ callPackage, ... }@args: +{ callPackage, openssl_3_0, ... }@args: -callPackage ./generic.nix args { +callPackage ./generic.nix (args // { openssl = openssl_3_0; }) { version = "1.21.4"; sha256 = "1ziv3xargxhxycd5hp6r3r5mww54nvvydiywcpsamg3i9r3jzxyi"; }