summary refs log tree commit diff
diff options
context:
space:
mode:
authorJörg Thalheim <joerg@thalheim.io>2020-11-10 10:29:18 +0100
committerJörg Thalheim <joerg@thalheim.io>2020-11-10 10:49:25 +0100
commit4c64fa224eca82883088852914fa8fd28789dc32 (patch)
tree327fe33d09f964350d07bbd567902b903c4a656b
parent88d1da8e5d94202c88d65816bb5793829f1baa7d (diff)
downloadnixpkgs-4c64fa224eca82883088852914fa8fd28789dc32.tar
nixpkgs-4c64fa224eca82883088852914fa8fd28789dc32.tar.gz
nixpkgs-4c64fa224eca82883088852914fa8fd28789dc32.tar.bz2
nixpkgs-4c64fa224eca82883088852914fa8fd28789dc32.tar.lz
nixpkgs-4c64fa224eca82883088852914fa8fd28789dc32.tar.xz
nixpkgs-4c64fa224eca82883088852914fa8fd28789dc32.tar.zst
nixpkgs-4c64fa224eca82883088852914fa8fd28789dc32.zip
nixos/loki: mergeable configuration
type.attrs is not mergable
-rw-r--r--nixos/modules/services/monitoring/loki.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/services/monitoring/loki.nix b/nixos/modules/services/monitoring/loki.nix
index d5e7beeb043..51cabaa274a 100644
--- a/nixos/modules/services/monitoring/loki.nix
+++ b/nixos/modules/services/monitoring/loki.nix
@@ -39,7 +39,7 @@ in {
     };
 
     configuration = mkOption {
-      type = types.attrs;
+      type = (pkgs.formats.json {}).type;
       default = {};
       description = ''
         Specify the configuration for Loki in Nix.