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

This reverts commit 99750d89dd962cc7011b02e487ed1a38c7842524.

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