upgrade synapse and colmena

Signed-off-by: Sumner Evans <[email protected]>

flake.nix

@@ -1,6 +1,7 @@
 {
   description = "Nevarro Infrastructure NixOS deployments";
   inputs = {
+    colmena.url = "github:zhaofengli/colmena";
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     flake-utils.url = "github:numtide/flake-utils";
     mineshspc = {
@@ -15,8 +16,9 @@
     };
   };
 
-  outputs = inputs@{ nixpkgs, flake-utils, ... }:
+  outputs = inputs@{ self, colmena, nixpkgs, flake-utils, ... }:
     {
+      colmenaHive = colmena.lib.makeHive self.outputs.colmena;
       colmena = import ./nixos/colmena.nix (inputs // {
         terraform-outputs = nixpkgs.lib.importJSON ./terraform-output.json;
       });
@@ -30,7 +32,7 @@
         devShells.default = pkgs.mkShell {
           packages = with pkgs; [
             cargo
-            colmena
+            colmena.packages.${system}.colmena
             git-crypt
             openssl
             pre-commit

nixos/colmena.nix

@@ -15,19 +15,19 @@ in {
           matrix-synapse-unwrapped =
             super.matrix-synapse-unwrapped.overridePythonAttrs (old: rec {
               pname = "matrix-synapse";
-              version = "1.118.0";
+              version = "1.119.0";
 
               src = super.fetchFromGitHub {
                 owner = "element-hq";
                 repo = "synapse";
                 rev = "v${version}";
-                hash = "sha256-dMa1L1MYzt/XfCD8hGt+WupAwl5l4zwVcj5mQ8KtTp8=";
+                hash = "sha256-+3FrxSfQteIga5uiRNzAlV+xNESB9PUX/UkkL6UMETQ=";
               };
 
               cargoDeps = super.rustPackages.rustPlatform.fetchCargoTarball {
                 inherit src;
                 name = "${pname}-${version}";
-                hash = "sha256-FJaj5T2wMIn/A0JNUGpXyNtPvXIAF8Ivkej4vS1S3dA=";
+                hash = "sha256-c/19RaBmtfKkFFQyDBwH+yqHp4YNQSqCu23WYbpOc98=";
               };
 
               doInstallCheck = false;

nixos/hosts/matrix/default.nix

@@ -30,8 +30,6 @@
       keyFor "matrix/shared-secret-auth/nevarro.space" "matrix-synapse";
     nevarro_space_cleanup_synapse_environment_file =
       keyFor "matrix/cleanup-synapse/nevarro.space" "root";
-    nevarro_space_sliding_sync_environment_file =
-      keyFor "matrix/sliding-sync/nevarro.space" "root";
 
     # App Service Secrets
     appservice_login_shared_secret_yaml = {

nixos/modules/services/matrix/synapse/default.nix

@@ -331,17 +331,6 @@ in {
       '';
     };
 
-    # Run the sliding-sync proxy.
-    services.matrix-sliding-sync = {
-      enable = true;
-      createDatabase = true;
-      environmentFile = "/run/keys/nevarro_space_sliding_sync_environment_file";
-      settings = {
-        SYNCV3_SERVER = "https://matrix.nevarro.space";
-        SYNCV3_BINDADDR = "0.0.0.0:8012";
-      };
-    };
-
     # Ensure that Redis is setup for Synapse.
     services.redis.servers."".enable = true;