diff options
author | Edward Tjörnhammar <ed@cflags.cc> | 2015-09-20 21:36:49 +0200 |
---|---|---|
committer | Edward Tjörnhammar <ed@cflags.cc> | 2015-09-20 21:40:17 +0200 |
commit | aeba3eabcdbfa6308d9af27b2a70e7864ec4d3e3 (patch) | |
tree | f366a0edb35cb6a36090b4d3620a9ef4c09c1ce8 /nixos | |
parent | 122d5e497e6df55f4b2e5c353bb2224b79cfd7b0 (diff) | |
download | nixlib-aeba3eabcdbfa6308d9af27b2a70e7864ec4d3e3.tar nixlib-aeba3eabcdbfa6308d9af27b2a70e7864ec4d3e3.tar.gz nixlib-aeba3eabcdbfa6308d9af27b2a70e7864ec4d3e3.tar.bz2 nixlib-aeba3eabcdbfa6308d9af27b2a70e7864ec4d3e3.tar.lz nixlib-aeba3eabcdbfa6308d9af27b2a70e7864ec4d3e3.tar.xz nixlib-aeba3eabcdbfa6308d9af27b2a70e7864ec4d3e3.tar.zst nixlib-aeba3eabcdbfa6308d9af27b2a70e7864ec4d3e3.zip |
Revert "Don't evaluate haskellPackages when gitit is disabled"
This reverts commit 99750d89dd962cc7011b02e487ed1a38c7842524.
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/services/misc/gitit.nix | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/nixos/modules/services/misc/gitit.nix b/nixos/modules/services/misc/gitit.nix index 8e9e761b6092..befd8c628f16 100644 --- a/nixos/modules/services/misc/gitit.nix +++ b/nixos/modules/services/misc/gitit.nix @@ -35,6 +35,7 @@ let }; haskellPackages = mkOption { + default = pkgs.haskellPackages; defaultText = "pkgs.haskellPackages"; example = literalExample "pkgs.haskell.packages.ghc784"; description = "haskellPackages used to build gitit and plugins."; @@ -137,6 +138,7 @@ let staticDir = mkOption { type = types.path; + default = gititShared + "/data/static"; description = '' Specifies the path of the static directory (containing javascript, css, and images). If it does not exist, gitit will create it and @@ -207,6 +209,7 @@ let templatesDir = mkOption { type = types.path; + default = gititShared + "/data/templates"; description = '' Specifies the path of the directory containing page templates. If it does not exist, gitit will create it with default templates. Users @@ -288,6 +291,7 @@ let plugins = mkOption { type = with types; listOf str; + default = [ (gititShared + "/plugins/Dot.hs") ]; description = '' 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 @@ -641,13 +645,6 @@ in config = mkIf cfg.enable { - services.gitit = { - haskellPackages = mkDefault pkgs.haskellPackages; - staticDir = gititShared + "/data/static"; - templatesDir = gititShared + "/data/templates"; - plugins = [ ]; - }; - users.extraUsers.gitit = { group = config.users.extraGroups.gitit.name; description = "Gitit user"; |