diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2017-03-20 19:58:52 +0100 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2017-03-20 20:04:09 +0100 |
| commit | c13922f0120d43f491ee286fd9362dd12833b9e5 (patch) | |
| tree | ad867b63fe4fa27c6d23180d8a74405b797fd3f6 /pkgs | |
| parent | 337f731c2b0842357ef5c94fac1a9f103e9e3189 (diff) | |
| download | nixlib-c13922f0120d43f491ee286fd9362dd12833b9e5.tar nixlib-c13922f0120d43f491ee286fd9362dd12833b9e5.tar.gz nixlib-c13922f0120d43f491ee286fd9362dd12833b9e5.tar.bz2 nixlib-c13922f0120d43f491ee286fd9362dd12833b9e5.tar.lz nixlib-c13922f0120d43f491ee286fd9362dd12833b9e5.tar.xz nixlib-c13922f0120d43f491ee286fd9362dd12833b9e5.tar.zst nixlib-c13922f0120d43f491ee286fd9362dd12833b9e5.zip | |
nginx: explicitly use stable version
Also updates the documention of the NixOS option `services.nginx.package` that upstream recommends using the mainline version instead. Fixes #21665.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/servers/http/nginx/generic.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index 5d5a98ad8a8f..dfde20452723 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -62,6 +62,6 @@ stdenv.mkDerivation { homepage = http://nginx.org; license = licenses.bsd2; platforms = platforms.all; - maintainers = with maintainers; [ thoughtpolice raskin ]; + maintainers = with maintainers; [ thoughtpolice raskin fpletz ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 144fcbd27295..2e72eda08f5c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10687,7 +10687,9 @@ with pkgs; neard = callPackage ../servers/neard { }; - nginx = callPackage ../servers/http/nginx/stable.nix { + nginx = nginxStable; + + nginxStable = callPackage ../servers/http/nginx/stable.nix { # We don't use `with` statement here on purpose! # See https://github.com/NixOS/nixpkgs/pull/10474/files#r42369334 modules = [ nginxModules.rtmp nginxModules.dav nginxModules.moreheaders ]; |