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

httpd: added serviceExpression which extends the serviceType concept -> allows that httpd services can live outside of nixpkgs (#22269)

Browse Source
This commit is contained in:
Joachim Schiele 2017-02-06 01:08:58 +01:00 committed by GitHub
parent b5957eaf2f
commit d491728653
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,6 +63,8 @@ let
let let
svcFunction = svcFunction =
if svc ? function then svc.function if svc ? function then svc.function
# instead of using serviceType="mediawiki"; you can copy mediawiki.nix to any location outside nixpkgs, modify it at will, and use serviceExpression=./mediawiki.nix;
else if svc ? serviceExpression then import (toString svc.serviceExpression)
else import (toString "${toString ./.}/${if svc ? serviceType then svc.serviceType else svc.serviceName}.nix"); else import (toString "${toString ./.}/${if svc ? serviceType then svc.serviceType else svc.serviceName}.nix");
config = (evalModules config = (evalModules
{ modules = [ { options = res.options; config = svc.config or svc; } ]; { modules = [ { options = res.options; config = svc.config or svc; } ];