mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-14 01:33:10 +00:00
* Get rid of the `experimental' flag.
svn path=/nixos/branches/modular-nixos/; revision=16010
This commit is contained in:
parent
9460a30851
commit
d06556e274
@ -17,7 +17,6 @@
|
||||
|
||||
httpd = {
|
||||
enable = true;
|
||||
experimental = true;
|
||||
adminAddr = "admin@example.org";
|
||||
|
||||
subservices = {
|
||||
|
@ -15,13 +15,6 @@ let
|
||||
";
|
||||
};
|
||||
|
||||
experimental = mkOption {
|
||||
default = false;
|
||||
description = "
|
||||
Whether to use the new-style Apache configuration.
|
||||
";
|
||||
};
|
||||
|
||||
extraConfig = mkOption {
|
||||
default = "";
|
||||
description = "
|
||||
@ -565,7 +558,7 @@ let
|
||||
in
|
||||
|
||||
|
||||
mkIf (config.services.httpd.enable && config.services.httpd.experimental) {
|
||||
mkIf config.services.httpd.enable {
|
||||
require = [
|
||||
options
|
||||
];
|
||||
|
Loading…
Reference in New Issue
Block a user