mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-07-13 21:50:33 +03:00
* Get rid of the `experimental' flag.
svn path=/nixos/branches/modular-nixos/; revision=16010
This commit is contained in:
parent
9460a30851
commit
d06556e274
2 changed files with 1 additions and 9 deletions
|
@ -17,7 +17,6 @@
|
||||||
|
|
||||||
httpd = {
|
httpd = {
|
||||||
enable = true;
|
enable = true;
|
||||||
experimental = true;
|
|
||||||
adminAddr = "admin@example.org";
|
adminAddr = "admin@example.org";
|
||||||
|
|
||||||
subservices = {
|
subservices = {
|
||||||
|
|
|
@ -15,13 +15,6 @@ let
|
||||||
";
|
";
|
||||||
};
|
};
|
||||||
|
|
||||||
experimental = mkOption {
|
|
||||||
default = false;
|
|
||||||
description = "
|
|
||||||
Whether to use the new-style Apache configuration.
|
|
||||||
";
|
|
||||||
};
|
|
||||||
|
|
||||||
extraConfig = mkOption {
|
extraConfig = mkOption {
|
||||||
default = "";
|
default = "";
|
||||||
description = "
|
description = "
|
||||||
|
@ -565,7 +558,7 @@ let
|
||||||
in
|
in
|
||||||
|
|
||||||
|
|
||||||
mkIf (config.services.httpd.enable && config.services.httpd.experimental) {
|
mkIf config.services.httpd.enable {
|
||||||
require = [
|
require = [
|
||||||
options
|
options
|
||||||
];
|
];
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue