public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fix subversion test and change the name of the "config" option to

Browse Source 
"configuration" because it may interfered with sub-modules keywords.

svn path=/nixos/trunk/; revision=18155
This commit is contained in:
Nicolas Pierron 2009-11-05 19:24:02 +00:00
parent ca00f6f3f8
commit 72f804c9b2
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/services/web-servers/apache-httpd/default.nix
View File

@ -44,9 +44,9 @@ let
rec { rec {
config = config =
if res ? options then if res ? options then
addDefaultOptionValues res.options svc.config addDefaultOptionValues res.options svc.configuration
else else
svc.config; svc.configuration;
res = svc // svc.function {inherit config pkgs serverInfo servicesPath;}; res = svc // svc.function {inherit config pkgs serverInfo servicesPath;};
}.res; }.res;
in map f defs; in map f defs;

4
modules/services/web-servers/apache-httpd/services.nix
View File

@ -53,14 +53,12 @@ let
serviceType = mkOption { serviceType = mkOption {
default = "";
description = "Obsolete name of <option>serviceName</option>."; description = "Obsolete name of <option>serviceName</option>.";
# serviceType is the old name of serviceName. # serviceType is the old name of serviceName.
apply = x: config.serviceName; apply = x: config.serviceName;
}; };
serviceName = mkOption { serviceName = mkOption {
default = "";
example = "trac"; example = "trac";
description = " description = "
(Deprecated) (Deprecated)
@ -90,7 +88,7 @@ let
f; f;
}; };
config = mkOption { configuration = mkOption {
default = {}; default = {};
description = " description = "
(Deprecated) Define option values of the current sub-service. (Deprecated) Define option values of the current sub-service.

8
tests/subversion.nix
View File

@ -56,9 +56,11 @@ rec {
services.httpd.adminAddr = "e.dolstra@tudelft.nl"; services.httpd.adminAddr = "e.dolstra@tudelft.nl";
services.httpd.extraSubservices = services.httpd.extraSubservices =
[ { serviceType = "subversion"; [ { serviceType = "subversion";
urlPrefix = ""; configuration = {
dataDir = "/data/subversion"; urlPrefix = "";
userCreationDomain = "192.168.0.0/16"; dataDir = "/data/subversion";
userCreationDomain = "192.168.0.0/16";
};
} }
]; ];
nixpkgs.config.packageOverrides = overrides; nixpkgs.config.packageOverrides = overrides;