From 4fbd002b3d9fdf4b7177a5fe4b6eeb9a6d73eb88 Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Tue, 19 Mar 2024 10:11:02 -0600 Subject: [PATCH] matrix-synapse-unwrapped: 1.102.0 -> 1.103.0 https://github.com/element-hq/synapse/releases/tag/v1.103.0 Signed-off-by: Sumner Evans --- flake.lock | 18 +++++++++--------- flake.nix | 1 - nixos/colmena.nix | 6 +++--- .../services/matrix/linkedin-matrix.nix | 4 ---- .../matrix/synapse/cleanup-synapse.nix | 4 ---- 5 files changed, 12 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index d7339e3..47c9332 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1709126324, - "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "d465f4819400de7c8d874d50b982301f28a84605", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -51,11 +51,11 @@ ] }, "locked": { - "lastModified": 1708963167, - "narHash": "sha256-64eIzgdlYB4J4ZHkqi66COXeYIxyH8SP5Jd91uIUAqQ=", + "lastModified": 1710254433, + "narHash": "sha256-XaOOgflMae/hWVVn07/C4nJ0Wz5yDPSCmNplwXApl/E=", "owner": "ColoradoSchoolOfMines", "repo": "mineshspc.com", - "rev": "e7a87b4b7751fc6a3e132e85a91ca751ad0733aa", + "rev": "447dac7171230860778258af3534eb60819d782f", "type": "github" }, "original": { @@ -66,11 +66,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1709703039, - "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", + "lastModified": 1710631334, + "narHash": "sha256-rL5LSYd85kplL5othxK5lmAtjyMOBg390sGBTb3LRMM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", + "rev": "c75037bbf9093a2acb617804ee46320d6d1fea5a", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 28449de..8f7193d 100644 --- a/flake.nix +++ b/flake.nix @@ -36,7 +36,6 @@ nodePackages.bash-language-server openssl pre-commit - rnix-lsp sops # Terraform + Linters diff --git a/nixos/colmena.nix b/nixos/colmena.nix index 4ef7e36..d2f672b 100644 --- a/nixos/colmena.nix +++ b/nixos/colmena.nix @@ -14,20 +14,20 @@ in { matrix-synapse-unwrapped = super.matrix-synapse-unwrapped.overridePythonAttrs (old: rec { pname = "matrix-synapse"; - version = "1.102.0"; + version = "1.103.0"; format = "pyproject"; src = super.fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-RJsuvNqqUiiVw6uKkG81rqo1ZoszUHK4UIJh8MReFqo="; + hash = "sha256-NwHX4pOM2PUf2MldaPTOzP9gOcTmILxM1Sx2HPkLBcw="; }; cargoDeps = super.rustPackages.rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-PoPJnSZ9QpcpVbqDMlqwgAqu0K8oornpihErLHXb6Gc="; + hash = "sha256-AyV0JPPJkJ4jdaw0FUXPqGF3Qkce1+RK70FkXAw+bLA="; }; doInstallCheck = false; diff --git a/nixos/modules/services/matrix/linkedin-matrix.nix b/nixos/modules/services/matrix/linkedin-matrix.nix index 4732c4b..029728b 100644 --- a/nixos/modules/services/matrix/linkedin-matrix.nix +++ b/nixos/modules/services/matrix/linkedin-matrix.nix @@ -221,10 +221,6 @@ in { services.postgresql.ensureDatabases = [ "linkedin-matrix" ]; services.postgresql.ensureUsers = [{ name = "linkedinmatrix"; - ensurePermissions = { - "DATABASE \"linkedin-matrix\"" = "ALL PRIVILEGES"; - "ALL TABLES IN SCHEMA public" = "ALL PRIVILEGES"; - }; }]; systemd.services.linkedin-matrix = { diff --git a/nixos/modules/services/matrix/synapse/cleanup-synapse.nix b/nixos/modules/services/matrix/synapse/cleanup-synapse.nix index 83e06bf..b8cd2d1 100644 --- a/nixos/modules/services/matrix/synapse/cleanup-synapse.nix +++ b/nixos/modules/services/matrix/synapse/cleanup-synapse.nix @@ -178,10 +178,6 @@ in { # Allow root to manage matrix-synapse database. services.postgresql.ensureUsers = [{ name = "root"; - ensurePermissions = { - "DATABASE \"matrix-synapse\"" = "ALL PRIVILEGES"; - "ALL TABLES IN SCHEMA public" = "ALL PRIVILEGES"; - }; }]; }; }