From 37533e3e89a1ec3f6f67a874935b19c92c6d25a3 Mon Sep 17 00:00:00 2001 From: magic_rb Date: Mon, 3 Jun 2024 00:00:08 +0200 Subject: [PATCH] Update containers to work with new core pin Signed-off-by: magic_rb --- .../matrix/synapse/synapse-package.nix | 16 ---------------- overlays/mautrix-discord.nix | 2 +- overlays/mautrix-slack.nix | 2 +- 3 files changed, 2 insertions(+), 18 deletions(-) diff --git a/nixng/containers/matrix/synapse/synapse-package.nix b/nixng/containers/matrix/synapse/synapse-package.nix index 0fb6d37..23e5200 100644 --- a/nixng/containers/matrix/synapse/synapse-package.nix +++ b/nixng/containers/matrix/synapse/synapse-package.nix @@ -22,20 +22,4 @@ in "url-preview" "user-search" ]; - - matrix-synapse-unwrapped = fix (self: - pkgs.matrix-synapse-unwrapped.overridePythonAttrs (old: { - version = assert versionOlder old.version "1.105.1"; "1.105.1"; - src = fetchFromGitHub { - owner = "element-hq"; - repo = "synapse"; - rev = "v${self.version}"; - hash = "sha256-sul9wz9NXz87ZIbvSHWYQabTW/PlwAJJ2keaO0NbHHU="; - }; - cargoDeps = rustPlatform.fetchCargoTarball { - inherit (self) src; - name = "${self.pname}-${self.version}"; - hash = "sha256-Cp1Bnf96invtmYayGfBVGwxW2jk/nRVCzueubd9HIG4="; - }; - })); } diff --git a/overlays/mautrix-discord.nix b/overlays/mautrix-discord.nix index 752346b..39616e9 100644 --- a/overlays/mautrix-discord.nix +++ b/overlays/mautrix-discord.nix @@ -21,7 +21,7 @@ buildInputs = singleton prev.olm; - vendorSha256 = "sha256-+dmlJZPc2Tw9G64MeLPY5Rgml3UKEqAtgGI1ImRvMBU="; + vendorHash = "sha256-+dmlJZPc2Tw9G64MeLPY5Rgml3UKEqAtgGI1ImRvMBU="; doCheck = false; diff --git a/overlays/mautrix-slack.nix b/overlays/mautrix-slack.nix index 98f4a44..d613f13 100644 --- a/overlays/mautrix-slack.nix +++ b/overlays/mautrix-slack.nix @@ -21,7 +21,7 @@ buildInputs = singleton prev.olm; - vendorSha256 = "sha256-Adfz6mHYa22OqEZZHrvst31XdZFo7LuxQI20whq3Zes="; + vendorHash = "sha256-Adfz6mHYa22OqEZZHrvst31XdZFo7LuxQI20whq3Zes="; doCheck = false;