Unverified Commit a50962e4 authored by Franz Pletz's avatar Franz Pletz Committed by GitHub
Browse files

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

nginxMainline: 1.23.3 -> 1.23.4
parents 97ad0928 8be794b1

pkgs/build-support/fetchhg/default.nix

+11 −3
Original line number Diff line number Diff line
@@ -4,11 +4,14 @@ 
, rev ? null

, md5 ? null

, sha256 ? null

, hash ? null

, fetchSubrepos ? false

, preferLocalBuild ? true }:



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

# TODO: statically check if mercurial as the https support if the url starts woth https.

stdenvNoCC.mkDerivation {
@@ -20,9 +23,14 @@ stdenvNoCC.mkDerivation { 


  subrepoClause = lib.optionalString fetchSubrepos "S";



  outputHashAlgo = "sha256";

  outputHashAlgo = if hash != null then null else "sha256";

  outputHashMode = "recursive";

  outputHash = sha256;

  outputHash = if hash != null then

    hash

  else if sha256 != null then

    sha256

  else

    lib.fakeSha256;



  inherit url rev;

  inherit preferLocalBuild;

pkgs/servers/http/nginx/generic.nix

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ outer@{ lib, stdenv, fetchurl, fetchpatch, openssl, zlib, pcre, libxml2, libxslt 
, version

, nginxVersion ? version

, src ? null # defaults to upstream nginx ${version}

, sha256 ? null # when not specifying src

, hash ? null # when not specifying src

, configureFlags ? []

, nativeBuildInputs ? []

, buildInputs ? []
@@ -55,7 +55,7 @@ stdenv.mkDerivation { 


  src = if src != null then src else fetchurl {

    url = "https://nginx.org/download/nginx-${version}.tar.gz";

    inherit sha256;

    inherit hash;

  };



  nativeBuildInputs = [ removeReferencesTo ]

pkgs/servers/http/nginx/mainline.nix

+2 −2
Original line number Diff line number Diff line 
{ callPackage, ... }@args:



callPackage ./generic.nix args {

  version = "1.23.3";

  sha256 = "sha256-dctXh9u5+uGLFIEPkcxDQ/ZM5MJOJzAhNvtSSYBCulQ=";

  version = "1.23.4";

  hash = "sha256-1DMA42uySafm7cYLyhsPw3Kguvzi80bXas+2d6h5D8A=";

}

pkgs/servers/http/nginx/quic.nix

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ callPackage ./generic.nix args { 
  src = fetchhg {

    url = "https://hg.nginx.org/nginx-quic";

    rev = "0af598651e33"; # branch=quic

    sha256 = "sha256-rG0jXA+ci7anUxZCBhXZLZKwnTtzzDEAViuoImKpALA=";

    hash = "sha256-rG0jXA+ci7anUxZCBhXZLZKwnTtzzDEAViuoImKpALA=";

  };



  preConfigure = ''

pkgs/servers/http/nginx/stable.nix

+1 −1
Original line number Diff line number Diff line
@@ -2,5 +2,5 @@ 


callPackage ./generic.nix args {

  version = "1.22.1";

  sha256 = "sha256-nrszOp6CuVKs0+K0rrHU/2QG9ySRurbNn+afDepzfzE=";

  hash = "sha256-nrszOp6CuVKs0+K0rrHU/2QG9ySRurbNn+afDepzfzE=";

}