Unverified Commit e6e049b7 authored by Maciej Krüger's avatar Maciej Krüger Committed by GitHub
Browse files

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

parents da2d7137 27d53b81

pkgs/servers/http/nginx/mainline.nix

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



callPackage ./generic.nix args {

  version = "1.24.0";

  hash = "sha256-d6JUFje5KmIePudndsi3tAz21wfmm6U6lAKD4w/y9V0=";

  version = "1.25.0";

  hash = "sha256-XtRNRZQycqTopbz0Q0I3IQ8t4xuQP8peOBwbvX7uHow=";

}

pkgs/servers/http/nginx/quic.nix

+2 −13
Original line number Diff line number Diff line 
{ callPackage

, fetchhg

, nginxMainline

, ...

} @ args:



callPackage ./generic.nix args {

  pname = "nginxQuic";



  src = fetchhg {

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

    rev = "0af598651e33"; # branch=quic

    hash = "sha256-rG0jXA+ci7anUxZCBhXZLZKwnTtzzDEAViuoImKpALA=";

  };



  preConfigure = ''

    ln -s auto/configure configure

  '';

  inherit (nginxMainline) src version;



  configureFlags = [

    "--with-http_v3_module"

    "--with-stream_quic_module"

  ];



  version = "1.23.4";

}