From 7d1ed12e3745c5207ee0f85e797682e2d35e5379 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 22 Feb 2025 16:12:49 +0000 Subject: [PATCH 1/3] matrix-synapse.tools: fix the eval (delete) Without the change the eval fails as: $ nix build --no-link -f. matrix-synapse.tools error: attribute 'tools' missing at pkgs/by-name/ma/matrix-synapse/package.nix:47:54: 46| # for backward compatibility 47| inherit (matrix-synapse-unwrapped) plugins tests tools; | ^ 48| }; --- pkgs/by-name/ma/matrix-synapse/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ma/matrix-synapse/package.nix b/pkgs/by-name/ma/matrix-synapse/package.nix index 084816b1f383..9a7357a25735 100644 --- a/pkgs/by-name/ma/matrix-synapse/package.nix +++ b/pkgs/by-name/ma/matrix-synapse/package.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { unwrapped = matrix-synapse-unwrapped; # for backward compatibility - inherit (matrix-synapse-unwrapped) plugins tests tools; + inherit (matrix-synapse-unwrapped) plugins tests; }; # Carry the maintainer, licenses, and various useful information. From cdfbedc7c4ec98556431d17d73eeefbd7376215f Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Wed, 26 Feb 2025 14:25:38 -0700 Subject: [PATCH 2/3] matrix-synapse-unwrapped: add update script Signed-off-by: Sumner Evans --- pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix index 080bdd66bbc9..8277ec38a1d2 100644 --- a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix +++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix @@ -9,7 +9,7 @@ rustPlatform, rustc, nixosTests, - callPackage, + nix-update-script, }: let @@ -178,6 +178,7 @@ python3.pkgs.buildPythonApplication rec { tests = { inherit (nixosTests) matrix-synapse matrix-synapse-workers; }; inherit plugins; python = python3; + updateScript = nix-update-script { }; }; meta = with lib; { From 55484022156b02fd5cf179ba1f2dc6a8ae8720fb Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Wed, 26 Feb 2025 14:26:51 -0700 Subject: [PATCH 3/3] matrix-synapse: 1.124.0 -> 1.125 https://github.com/element-hq/synapse/releases/tag/v1.125.0 Signed-off-by: Sumner Evans --- pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix index 8277ec38a1d2..4d01dbb77d25 100644 --- a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix +++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix @@ -17,20 +17,20 @@ let in python3.pkgs.buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.124.0"; + version = "1.125.0"; format = "pyproject"; src = fetchFromGitHub { owner = "element-hq"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-hL1MdngaAVqgdN8GS9m3jn4twsbX0GPFa5cq+SCJ1oI="; + hash = "sha256-eo4JxNhVdAUeUmh0yUDE7+6csNbgdrYvf7UU/AMce7U="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-OIrjBhjSavJubpcMtHLrfuK7uhfNd+AHKUmHno32yo4="; + hash = "sha256-eAlybi5yDlnhdvVet5Xab4s1emyJrlQuEf3YzusU2M4="; }; postPatch = ''