summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2025-04-18 20:48:29 +0200
committerGitHub <noreply@github.com>2025-04-18 20:48:29 +0200
commit9f72c698491f135c898b8c5978a35d1126017dcb (patch)
tree8631f50cf49cab43a6df0dd7d22ea358bcd7c78d
parent[Backport release-24.11] pnpm_10: 10.8.0 -> 10.8.1 (#399182) (diff)
parentelement-desktop: 1.11.96 -> 1.11.97 (diff)
downloadnixpkgs-9f72c698491f135c898b8c5978a35d1126017dcb.tar.gz
Merge: [Backport release-24.11] element-{web,desktop}: 1.11.96 -> 1.11.97 (#399088)
-rw-r--r--pkgs/by-name/el/element-desktop/element-desktop-pin.nix6
-rw-r--r--pkgs/by-name/el/element-desktop/package.nix4
-rw-r--r--pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix6
3 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix
index 6c2c1af2e9c1..732b2cc0676d 100644
--- a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix
+++ b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix
@@ -1,7 +1,7 @@
{
- "version" = "1.11.96";
+ "version" = "1.11.97";
"hashes" = {
- "desktopSrcHash" = "sha256-oTU/Pvl4gBp69OrUrXEYXupl0WphsEWt32sB4v6T+gA=";
- "desktopYarnHash" = "sha256-zMdSA/CkMDXirWZ2uCPTgZ5iErV7rGyR+xcLh9sPDA8=";
+ "desktopSrcHash" = "sha256-4ea5C1I/bdGsy4CxsNB1GWL8RQnJpHr/MbIOB5Z+gFA=";
+ "desktopYarnHash" = "sha256-HI/aRf9pGao8m8z3oA0wdbjDQth3zijJeskV2D+KsgM=";
};
}
diff --git a/pkgs/by-name/el/element-desktop/package.nix b/pkgs/by-name/el/element-desktop/package.nix
index 10720891465a..1de6ae997c4e 100644
--- a/pkgs/by-name/el/element-desktop/package.nix
+++ b/pkgs/by-name/el/element-desktop/package.nix
@@ -9,7 +9,7 @@
nodejs,
fetchYarnDeps,
jq,
- electron_34,
+ electron_35,
element-web,
sqlcipher,
callPackage,
@@ -23,7 +23,7 @@ let
pinData = import ./element-desktop-pin.nix;
inherit (pinData.hashes) desktopSrcHash desktopYarnHash;
executableName = "element-desktop";
- electron = electron_34;
+ electron = electron_35;
keytar = callPackage ./keytar {
inherit electron;
};
diff --git a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix
index e6e132a09f70..efbc4f9e8d79 100644
--- a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix
+++ b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix
@@ -1,7 +1,7 @@
{
- "version" = "1.11.96";
+ "version" = "1.11.97";
"hashes" = {
- "webSrcHash" = "sha256-EfSQEyMG9v5Boev98FyfzLA3hZLzxSGxAnZFfbc2aVA=";
- "webYarnHash" = "sha256-Dp7WXEjWSDQjpmnJUrloIQau6is8YxTYzJmnQBIk+Ys=";
+ "webSrcHash" = "sha256-x7VS4l2uwXq2wjZeGwnaENHlhwnVz5Gt3f55kiH2Zhk=";
+ "webYarnHash" = "sha256-uwuBwAZYjt3WsbUCM8q9PaiV5WxKSpyJyVzM8gJOhPo=";
};
}