lol

Merge pull request #190717 from lukegb/paperless-tz

nixos/paperless: fix time.timeZone setting

authored by

Luke Granger-Brown and committed by
GitHub
9974dcfc f9544df6

+5 -5
+5 -5
nixos/modules/services/misc/paperless.nix
··· 16 16 PAPERLESS_MEDIA_ROOT = cfg.mediaDir; 17 17 PAPERLESS_CONSUMPTION_DIR = cfg.consumptionDir; 18 18 GUNICORN_CMD_ARGS = "--bind=${cfg.address}:${toString cfg.port}"; 19 - } // ( 20 - lib.mapAttrs (_: toString) cfg.extraConfig 21 - ) // optionalAttrs (config.time.timeZone != null) { 22 - PAPERLESS_TIME_ZONE = lib.mkDefault config.time.timeZone; 19 + } // optionalAttrs (config.time.timeZone != null) { 20 + PAPERLESS_TIME_ZONE = config.time.timeZone; 23 21 } // optionalAttrs enableRedis { 24 22 PAPERLESS_REDIS = "unix://${redisServer.unixSocket}"; 25 - }; 23 + } // ( 24 + lib.mapAttrs (_: toString) cfg.extraConfig 25 + ); 26 26 27 27 manage = let 28 28 setupEnv = lib.concatStringsSep "\n" (mapAttrsToList (name: val: "export ${name}=\"${val}\"") env);