alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

nginxMainline: 1.21.6 -> 1.22.0

Browse source
This commit is contained in:
ajs124 2022-05-25 11:05:19 +02:00
parent 14ef375cf0
commit 893214cd0e
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/servers/http/nginx/generic.nix
View file

@ -1,4 +1,4 @@
outer@{ lib, stdenv, fetchurl, fetchpatch, openssl, zlib, pcre, libxml2, libxslt
outer@{ lib, stdenv, fetchurl, fetchpatch, openssl, zlib, pcre2, libxml2, libxslt
, nginx-doc
, nixosTests
@ -53,7 +53,7 @@ stdenv.mkDerivation {
inherit sha256;
};
buildInputs = [ openssl zlib pcre libxml2 libxslt gd geoip perl ]
buildInputs = [ openssl zlib pcre2 libxml2 libxslt gd geoip perl ]
++ buildInputs
++ mapModules "inputs";

8
pkgs/servers/http/nginx/mainline.nix
View file

@ -1,6 +1,6 @@
{ callPackage, openssl_3_0, ... }@args:
{ callPackage, ... }@args:
callPackage ./generic.nix (args // { openssl = openssl_3_0; }) {
version = "1.21.6";
sha256 = "1bh52jqqcaj5wlh2kvhxr00jhk2hnk8k97ki4pwyj4c8920p1p36";
callPackage ./generic.nix args {
version = "1.22.0";
sha256 = "0lzb4sn8hv491zad9kbpvka3m5ayjf1pxqbwllri980idyd5cgdk";
}

1
pkgs/top-level/all-packages.nix
View file

@ -22064,6 +22064,7 @@ with pkgs;
nginxMainline = callPackage ../servers/http/nginx/mainline.nix {
zlib = zlib-ng.override { withZlibCompat = true; };
openssl = openssl_3_0;
withKTLS = true;
withPerl = false;
# We don't use `with` statement here on purpose!