Merge pull request #224458 from helsinki-systems/upd/nginx
nginxMainline: 1.23.3 -> 1.23.4
This commit is contained in:
commit
a50962e4c4
|
@ -4,11 +4,14 @@
|
||||||
, rev ? null
|
, rev ? null
|
||||||
, md5 ? null
|
, md5 ? null
|
||||||
, sha256 ? null
|
, sha256 ? null
|
||||||
|
, hash ? null
|
||||||
, fetchSubrepos ? false
|
, fetchSubrepos ? false
|
||||||
, preferLocalBuild ? true }:
|
, preferLocalBuild ? true }:
|
||||||
|
|
||||||
if md5 != null then
|
if md5 != null then
|
||||||
throw "fetchhg does not support md5 anymore, please use sha256"
|
throw "fetchhg does not support md5 anymore, please use sha256 or hash"
|
||||||
|
else if hash != null && sha256 != null then
|
||||||
|
throw "Only one of sha256 or hash can be set"
|
||||||
else
|
else
|
||||||
# TODO: statically check if mercurial as the https support if the url starts woth https.
|
# TODO: statically check if mercurial as the https support if the url starts woth https.
|
||||||
stdenvNoCC.mkDerivation {
|
stdenvNoCC.mkDerivation {
|
||||||
|
@ -20,9 +23,14 @@ stdenvNoCC.mkDerivation {
|
||||||
|
|
||||||
subrepoClause = lib.optionalString fetchSubrepos "S";
|
subrepoClause = lib.optionalString fetchSubrepos "S";
|
||||||
|
|
||||||
outputHashAlgo = "sha256";
|
outputHashAlgo = if hash != null then null else "sha256";
|
||||||
outputHashMode = "recursive";
|
outputHashMode = "recursive";
|
||||||
outputHash = sha256;
|
outputHash = if hash != null then
|
||||||
|
hash
|
||||||
|
else if sha256 != null then
|
||||||
|
sha256
|
||||||
|
else
|
||||||
|
lib.fakeSha256;
|
||||||
|
|
||||||
inherit url rev;
|
inherit url rev;
|
||||||
inherit preferLocalBuild;
|
inherit preferLocalBuild;
|
||||||
|
|
|
@ -17,7 +17,7 @@ outer@{ lib, stdenv, fetchurl, fetchpatch, openssl, zlib, pcre, libxml2, libxslt
|
||||||
, version
|
, version
|
||||||
, nginxVersion ? version
|
, nginxVersion ? version
|
||||||
, src ? null # defaults to upstream nginx ${version}
|
, src ? null # defaults to upstream nginx ${version}
|
||||||
, sha256 ? null # when not specifying src
|
, hash ? null # when not specifying src
|
||||||
, configureFlags ? []
|
, configureFlags ? []
|
||||||
, nativeBuildInputs ? []
|
, nativeBuildInputs ? []
|
||||||
, buildInputs ? []
|
, buildInputs ? []
|
||||||
|
@ -55,7 +55,7 @@ stdenv.mkDerivation {
|
||||||
|
|
||||||
src = if src != null then src else fetchurl {
|
src = if src != null then src else fetchurl {
|
||||||
url = "https://nginx.org/download/nginx-${version}.tar.gz";
|
url = "https://nginx.org/download/nginx-${version}.tar.gz";
|
||||||
inherit sha256;
|
inherit hash;
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ removeReferencesTo ]
|
nativeBuildInputs = [ removeReferencesTo ]
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{ callPackage, ... }@args:
|
{ callPackage, ... }@args:
|
||||||
|
|
||||||
callPackage ./generic.nix args {
|
callPackage ./generic.nix args {
|
||||||
version = "1.23.3";
|
version = "1.23.4";
|
||||||
sha256 = "sha256-dctXh9u5+uGLFIEPkcxDQ/ZM5MJOJzAhNvtSSYBCulQ=";
|
hash = "sha256-1DMA42uySafm7cYLyhsPw3Kguvzi80bXas+2d6h5D8A=";
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,7 +9,7 @@ callPackage ./generic.nix args {
|
||||||
src = fetchhg {
|
src = fetchhg {
|
||||||
url = "https://hg.nginx.org/nginx-quic";
|
url = "https://hg.nginx.org/nginx-quic";
|
||||||
rev = "0af598651e33"; # branch=quic
|
rev = "0af598651e33"; # branch=quic
|
||||||
sha256 = "sha256-rG0jXA+ci7anUxZCBhXZLZKwnTtzzDEAViuoImKpALA=";
|
hash = "sha256-rG0jXA+ci7anUxZCBhXZLZKwnTtzzDEAViuoImKpALA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
|
|
|
@ -2,5 +2,5 @@
|
||||||
|
|
||||||
callPackage ./generic.nix args {
|
callPackage ./generic.nix args {
|
||||||
version = "1.22.1";
|
version = "1.22.1";
|
||||||
sha256 = "sha256-nrszOp6CuVKs0+K0rrHU/2QG9ySRurbNn+afDepzfzE=";
|
hash = "sha256-nrszOp6CuVKs0+K0rrHU/2QG9ySRurbNn+afDepzfzE=";
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue