From ddf3f9ffa798358cac30b767023ebfe6b56f8146 Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 23 Aug 2024 18:09:25 +0100 Subject: [PATCH] element-call: 0.5.16 -> 0.6.1 Removes the bundled libolm. --- pkgs/by-name/el/element-call/name.patch | 10 ---------- pkgs/by-name/el/element-call/package.nix | 16 ++++++---------- 2 files changed, 6 insertions(+), 20 deletions(-) delete mode 100644 pkgs/by-name/el/element-call/name.patch diff --git a/pkgs/by-name/el/element-call/name.patch b/pkgs/by-name/el/element-call/name.patch deleted file mode 100644 index fa6ab068d18caf5..000000000000000 --- a/pkgs/by-name/el/element-call/name.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/package.json b/package.json -index e25221f2..5268d11a 100644 ---- a/package.json -+++ b/package.json -@@ -1,4 +1,5 @@ - { -+ "name": "element-call", - "version": "0.0.0", - "type": "module", - "scripts": { \ No newline at end of file diff --git a/pkgs/by-name/el/element-call/package.nix b/pkgs/by-name/el/element-call/package.nix index 8f9e27b3a9b3d74..ec567e419df6acd 100644 --- a/pkgs/by-name/el/element-call/package.nix +++ b/pkgs/by-name/el/element-call/package.nix @@ -6,32 +6,29 @@ , yarnBuildHook , nodejs , npmHooks -, olm }: let inherit (stdenv.hostPlatform) system; throwSystem = throw "Unsupported system: ${system}"; offlineCacheHash = { - x86_64-linux = "sha256-mZCnvX6hzkdi/zjPiefcmbyC2kGemjS4w7WTVkyq8W0="; - aarch64-linux = "sha256-mZCnvX6hzkdi/zjPiefcmbyC2kGemjS4w7WTVkyq8W0="; - x86_64-darwin = "sha256-G4doEnZORJqcl3bWaKZPuQmBeXNXud06nLO12Afr9kM="; - aarch64-darwin = "sha256-G4doEnZORJqcl3bWaKZPuQmBeXNXud06nLO12Afr9kM="; + x86_64-linux = "sha256-/8B7iIKOfMBu+IZGPpfvw9Ii+YSFbIQPlRN3TcNCYCI="; + aarch64-linux = "sha256-/8B7iIKOfMBu+IZGPpfvw9Ii+YSFbIQPlRN3TcNCYCI="; + x86_64-darwin = "sha256-3Xw0umnJwPcmPKBPTk0cL9vSWmUSbHKxN/Hrh8vWXCQ="; + aarch64-darwin = "sha256-3Xw0umnJwPcmPKBPTk0cL9vSWmUSbHKxN/Hrh8vWXCQ="; }.${system} or throwSystem; in stdenv.mkDerivation (finalAttrs: { pname = "element-call"; - version = "0.5.16"; + version = "0.6.1"; src = fetchFromGitHub { owner = "element-hq"; repo = "element-call"; rev = "v${finalAttrs.version}"; - hash = "sha256-GTHM27i716RZk+kDELMg/lYy355/SZoQLXGPQ90M4xg="; + hash = "sha256-QRsnopQe6pzqG3sztJhP4p8WWilH7C7+auL8fH9KR74="; }; - patches = [ ./name.patch ]; - offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; hash = offlineCacheHash; @@ -53,6 +50,5 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.asl20; maintainers = with maintainers; [ kilimnik ]; mainProgram = "element-call"; - inherit (olm.meta) knownVulnerabilities; }; })