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

This reverts commit 99750d89dd962cc7011b02e487ed1a38c7842524.

+4 -7
+4 -7
nixos/modules/services/misc/gitit.nix
··· 35 35 }; 36 36 37 37 haskellPackages = mkOption { 38 + default = pkgs.haskellPackages; 38 39 defaultText = "pkgs.haskellPackages"; 39 40 example = literalExample "pkgs.haskell.packages.ghc784"; 40 41 description = "haskellPackages used to build gitit and plugins."; ··· 137 138 138 139 staticDir = mkOption { 139 140 type = types.path; 141 + default = gititShared + "/data/static"; 140 142 description = '' 141 143 Specifies the path of the static directory (containing javascript, 142 144 css, and images). If it does not exist, gitit will create it and ··· 207 209 208 210 templatesDir = mkOption { 209 211 type = types.path; 212 + default = gititShared + "/data/templates"; 210 213 description = '' 211 214 Specifies the path of the directory containing page templates. If it 212 215 does not exist, gitit will create it with default templates. Users ··· 288 291 289 292 plugins = mkOption { 290 293 type = with types; listOf str; 294 + default = [ (gititShared + "/plugins/Dot.hs") ]; 291 295 description = '' 292 296 Specifies a list of plugins to load. Plugins may be specified either 293 297 by their path or by their module name. If the plugin name starts ··· 640 644 options.services.gitit = gititOptions; 641 645 642 646 config = mkIf cfg.enable { 643 - 644 - services.gitit = { 645 - haskellPackages = mkDefault pkgs.haskellPackages; 646 - staticDir = gititShared + "/data/static"; 647 - templatesDir = gititShared + "/data/templates"; 648 - plugins = [ ]; 649 - }; 650 647 651 648 users.extraUsers.gitit = { 652 649 group = config.users.extraGroups.gitit.name;