From a2ad9d8e6df3095073d839aa3bb5f4b644cd0fec Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Mon, 1 Dec 2025 13:59:14 +0100 Subject: [PATCH] nixos/gollum: remove services.gollum.local-time option --- nixos/modules/services/misc/gollum.nix | 19 ++++++++++++------- nixos/tests/gollum.nix | 7 +++++++ 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/misc/gollum.nix b/nixos/modules/services/misc/gollum.nix index ccfa63d3823d..525333d80d11 100644 --- a/nixos/modules/services/misc/gollum.nix +++ b/nixos/modules/services/misc/gollum.nix @@ -18,6 +18,11 @@ in ] "MathJax rendering might be discontinued in the future, use services.gollum.math instead to enable KaTeX rendering or file a PR if you really need Mathjax" ) + (lib.mkRemovedOptionModule [ + "services" + "gollum" + "local-time" + ] "Set the value in services.gollum.extraConfig") ]; options.services.gollum = { @@ -38,6 +43,13 @@ in extraConfig = lib.mkOption { type = lib.types.lines; default = ""; + example = '' + wiki_options = { + show_local_time: true + } + + Precious::App.set(:wiki_options, wiki_options) + ''; description = "Content of the configuration file"; }; @@ -87,12 +99,6 @@ in description = "Disable editing pages"; }; - local-time = lib.mkOption { - type = lib.types.bool; - default = false; - description = "Use the browser's local timezone instead of the server's for displaying dates."; - }; - branch = lib.mkOption { type = lib.types.str; default = "master"; @@ -159,7 +165,6 @@ in ${lib.optionalString cfg.emoji "--emoji"} \ ${lib.optionalString cfg.h1-title "--h1-title"} \ ${lib.optionalString cfg.no-edit "--no-edit"} \ - ${lib.optionalString cfg.local-time "--local-time"} \ ${lib.optionalString (cfg.allowUploads != null) "--allow-uploads ${cfg.allowUploads}"} \ ${lib.optionalString (cfg.user-icons != null) "--user-icons ${cfg.user-icons}"} \ ${cfg.stateDir} diff --git a/nixos/tests/gollum.nix b/nixos/tests/gollum.nix index bf42ccc35e30..289257de3803 100644 --- a/nixos/tests/gollum.nix +++ b/nixos/tests/gollum.nix @@ -7,6 +7,13 @@ { pkgs, lib, ... }: { services.gollum.enable = true; + services.gollum.extraConfig = '' + wiki_options = { + show_local_time: true + } + + Precious::App.set(:wiki_options, wiki_options) + ''; }; };