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

Revert "Don't evaluate haskellPackages when gitit is disabled"

Browse Source 
This reverts commit 99750d89dd962cc7011b02e487ed1a38c7842524.
This commit is contained in:
Edward Tjörnhammar 2015-09-20 21:36:49 +02:00
parent 122d5e497e
commit aeba3eabcd
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nixos/modules/services/misc/gitit.nix
View File

@ -35,6 +35,7 @@ let
}; };
haskellPackages = mkOption { haskellPackages = mkOption {
default = pkgs.haskellPackages;
defaultText = "pkgs.haskellPackages"; defaultText = "pkgs.haskellPackages";
example = literalExample "pkgs.haskell.packages.ghc784"; example = literalExample "pkgs.haskell.packages.ghc784";
description = "haskellPackages used to build gitit and plugins."; description = "haskellPackages used to build gitit and plugins.";
@ -137,6 +138,7 @@ let
staticDir = mkOption { staticDir = mkOption {
type = types.path; type = types.path;
default = gititShared + "/data/static";
description = '' description = ''
Specifies the path of the static directory (containing javascript, Specifies the path of the static directory (containing javascript,
css, and images). If it does not exist, gitit will create it and css, and images). If it does not exist, gitit will create it and
@ -207,6 +209,7 @@ let
templatesDir = mkOption { templatesDir = mkOption {
type = types.path; type = types.path;
default = gititShared + "/data/templates";
description = '' description = ''
Specifies the path of the directory containing page templates. If it Specifies the path of the directory containing page templates. If it
does not exist, gitit will create it with default templates. Users does not exist, gitit will create it with default templates. Users
@ -288,6 +291,7 @@ let
plugins = mkOption { plugins = mkOption {
type = with types; listOf str; type = with types; listOf str;
default = [ (gititShared + "/plugins/Dot.hs") ];
description = '' description = ''
Specifies a list of plugins to load. Plugins may be specified either Specifies a list of plugins to load. Plugins may be specified either
by their path or by their module name. If the plugin name starts by their path or by their module name. If the plugin name starts
@ -641,13 +645,6 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
services.gitit = {
haskellPackages = mkDefault pkgs.haskellPackages;
staticDir = gititShared + "/data/static";
templatesDir = gititShared + "/data/templates";
plugins = [ ];
};
users.extraUsers.gitit = { users.extraUsers.gitit = {
group = config.users.extraGroups.gitit.name; group = config.users.extraGroups.gitit.name;
description = "Gitit user"; description = "Gitit user";