From 5b8b201e448fa9c6d085972b7b25dea112bc38ca Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Mon, 29 Jun 2020 09:34:41 +0200 Subject: [PATCH] Revert "traefik: unify TOML generation" This reverts commit a5e6901702ae08e5bcbe4c7b6574abd559aff6ce. yj doesn't distinguish floats and ints, which breaks some configs. --- nixos/modules/services/web-servers/traefik.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-servers/traefik.nix b/nixos/modules/services/web-servers/traefik.nix index 0631a26569c..4ab7307c3b6 100644 --- a/nixos/modules/services/web-servers/traefik.nix +++ b/nixos/modules/services/web-servers/traefik.nix @@ -20,10 +20,10 @@ let in valueType; dynamicConfigFile = if cfg.dynamicConfigFile == null then pkgs.runCommand "config.toml" { - buildInputs = [ pkgs.yj ]; + buildInputs = [ pkgs.remarshal ]; preferLocalBuild = true; } '' - yj -jt -i \ + remarshal -if json -of toml \ < ${ pkgs.writeText "dynamic_config.json" (builtins.toJSON cfg.dynamicConfigOptions)