dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

nginx: explicitly use stable version

Browse Source 
Also updates the documention of the NixOS option `services.nginx.package`
that upstream recommends using the mainline version instead.

Fixes #21665.
This commit is contained in:
Franz Pletz 2017-03-20 19:58:52 +01:00
parent 337f731c2b
commit c13922f012
No known key found for this signature in database
GPG Key ID: 846FDED7792617B4
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nixos/modules/services/web-servers/nginx/default.nix
View File

@ -246,11 +246,13 @@ in
}; };
package = mkOption { package = mkOption {
default = pkgs.nginx; default = pkgs.nginxStable;
defaultText = "pkgs.nginx"; defaultText = "pkgs.nginxStable";
type = types.package; type = types.package;
description = " description = "
Nginx package to use. Nginx package to use. This defaults to the stable version. Note
that the nginx team recommends to use the mainline version which
available in nixpkgs as <literal>nginxMainline</literal>.
"; ";
}; };

2
pkgs/servers/http/nginx/generic.nix
View File

@ -62,6 +62,6 @@ stdenv.mkDerivation {
homepage = http://nginx.org; homepage = http://nginx.org;
license = licenses.bsd2; license = licenses.bsd2;
platforms = platforms.all; platforms = platforms.all;
maintainers = with maintainers; [ thoughtpolice raskin ]; maintainers = with maintainers; [ thoughtpolice raskin fpletz ];
}; };
} }

4
pkgs/top-level/all-packages.nix
View File

@ -10687,7 +10687,9 @@ with pkgs;
neard = callPackage ../servers/neard { }; 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! # We don't use `with` statement here on purpose!
# See https://github.com/NixOS/nixpkgs/pull/10474/files#r42369334 # See https://github.com/NixOS/nixpkgs/pull/10474/files#r42369334
modules = [ nginxModules.rtmp nginxModules.dav nginxModules.moreheaders ]; modules = [ nginxModules.rtmp nginxModules.dav nginxModules.moreheaders ];