From 786902e1bc5c06b025c2c45bf5eab37febc465ea Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Sat, 3 Sep 2022 19:14:21 +0200 Subject: module: make use of structured settings Closes #10. --- modules/matrix-appservices/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/matrix-appservices/default.nix b/modules/matrix-appservices/default.nix index f57284d..f8eb980 100644 --- a/modules/matrix-appservices/default.nix +++ b/modules/matrix-appservices/default.nix @@ -170,7 +170,7 @@ in (filterAttrs (_: v: v.registrationData != { }) cfg.services); in mkIf cfg.addRegistrationFiles { - matrix-synapse.app_service_config_files = mkIf (cfg.homeserver == "matrix-synapse") registrationFiles; + matrix-synapse.settings.app_service_config_files = mkIf (cfg.homeserver == "matrix-synapse") registrationFiles; dendrite.settings.app_service_api.config_files = mkIf (cfg.homeserver == "dendrite") registrationFiles; }; }; -- cgit v1.2.3 From a97923107ae23b29f8dd3b196823d7dea721e687 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Sat, 3 Sep 2022 19:27:28 +0200 Subject: flake: switch nixpkgs input to nixos-22.05 21.11 is not supported anymore. --- flake.lock | 8 ++++---- flake.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index fe074e7..84cd955 100644 --- a/flake.lock +++ b/flake.lock @@ -48,16 +48,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1643503720, - "narHash": "sha256-tJic20ufuRnG8V+fTCd3YU6xl1ImxNspoEkXHct0AG4=", + "lastModified": 1662099760, + "narHash": "sha256-MdZLCTJPeHi/9fg6R9fiunyDwP3XHJqDd51zWWz9px0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0f316e4d72daed659233817ffe52bf08e081b5de", + "rev": "67e45078141102f45eff1589a831aeaa3182b41e", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-21.11", + "ref": "nixos-22.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 38e555e..323df27 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,6 @@ { inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-21.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.05"; devshell.url = "github:numtide/devshell"; nixlib.url = "github:divnix/nixpkgs.lib"; flake-compat = { -- cgit v1.2.3