From 018d5a1c726837ecd52ccb38e918a7c9110c69a3 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Tue, 18 Nov 2025 23:02:27 +0100 Subject: [PATCH 1/5] element-web-unwrapped: 1.12.3 -> 1.12.4 Release notes: https://github.com/element-hq/element-web/releases/tag/v1.12.4 Changelog: https://github.com/element-hq/element-web/compare/v1.12.3...v1.12.4 --- pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 f3f416350178..47037b899d13 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.12.3"; + "version" = "1.12.4"; "hashes" = { - "webSrcHash" = "sha256-a/RrUzJU/pjyD36WmNIqjSTBn5cfUOGNSe/l6iGp/0A="; - "webYarnHash" = "sha256-TXOehZRw5UIhGTnpR0KzvEizSW9Qk2VTr+cG/XstB+k="; + "webSrcHash" = "sha256-5sRKVgKbU4hr1cubY/0PdLDClBcFGxdu9TITORL6beI="; + "webYarnHash" = "sha256-S+glH2HkGyINEGHWn1TMK2y45gk7WtxTe+u4luqVgsw="; }; } From 58586fea04e5231c932648343b619bc254126acb Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Tue, 18 Nov 2025 23:04:22 +0100 Subject: [PATCH 2/5] element-desktop: 1.12.3 -> 1.12.4 Release notes: https://github.com/element-hq/element-desktop/releases/tag/v1.12.4 Changelog: https://github.com/element-hq/element-desktop/compare/v1.12.3...v1.12.4 --- pkgs/by-name/el/element-desktop/element-desktop-pin.nix | 6 +++--- pkgs/by-name/el/element-desktop/yarn.nix | 1 + 2 files changed, 4 insertions(+), 3 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 a5034a0f1ae1..39f5b44f814c 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.12.3"; + "version" = "1.12.4"; "hashes" = { - "desktopSrcHash" = "sha256-4pv6KxcTocguJo7DlBO+/pi+n8JbTHWukMtagaGaDy8="; - "desktopYarnHash" = "sha256-lQn5dAiC15O/2eaWfWJedFjBgmnglAlmAEOhz+in0DM="; + "desktopSrcHash" = "sha256-6fgbwLccILdb1iCcLrKauBzWMjMAZQgKo09gZhJB9Gk="; + "desktopYarnHash" = "sha256-7eYmz298m6ceREcaAo9CSMMFC3fB/ZC1+ArPb9pqc0o="; }; } diff --git a/pkgs/by-name/el/element-desktop/yarn.nix b/pkgs/by-name/el/element-desktop/yarn.nix index 159a1db2aaea..df839ddbc981 100644 --- a/pkgs/by-name/el/element-desktop/yarn.nix +++ b/pkgs/by-name/el/element-desktop/yarn.nix @@ -41,4 +41,5 @@ stdenvNoCC.mkDerivation { outputHash = hash; outputHashMode = "recursive"; + outputHashAlgo = "sha256"; } From d45d12e45162c019a1b6921dc1d95cca373c4459 Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Wed, 26 Nov 2025 20:50:52 +0100 Subject: [PATCH 3/5] element-web-unwrapped: Build shared-components - add comment for offlineCacheSharedComponents - add webSharedComponentsYarnHash to update.sh --- pkgs/by-name/el/element-desktop/update.sh | 5 +++++ .../el/element-web-unwrapped/element-web-pin.nix | 1 + pkgs/by-name/el/element-web-unwrapped/package.nix | 15 ++++++++++++++- 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/el/element-desktop/update.sh b/pkgs/by-name/el/element-desktop/update.sh index ca573c6e994c..63ef2e2d39f1 100755 --- a/pkgs/by-name/el/element-desktop/update.sh +++ b/pkgs/by-name/el/element-desktop/update.sh @@ -54,6 +54,11 @@ getHashes() { }; } EOF + + if [ "$variant" = "web" ]; then + local shared_components_yarn_hash="$(fixupHash "$(prefetch-yarn-deps "$src_path/packages/shared-components/yarn.lock")")" + sed -i "/^ \"webYarnHash/a \ \"webSharedComponentsYarnHash\" = \"$shared_components_yarn_hash\";" "$output" + fi } getHashes web ../element-web-unwrapped/element-web-pin.nix 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 47037b899d13..a5d786ed2276 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 @@ -3,5 +3,6 @@ "hashes" = { "webSrcHash" = "sha256-5sRKVgKbU4hr1cubY/0PdLDClBcFGxdu9TITORL6beI="; "webYarnHash" = "sha256-S+glH2HkGyINEGHWn1TMK2y45gk7WtxTe+u4luqVgsw="; + "webSharedComponentsYarnHash" = "sha256-azvUG/Oyq38q/llJd0AtEliFCX0+TrEtzfHsd+UpaEs="; }; } diff --git a/pkgs/by-name/el/element-web-unwrapped/package.nix b/pkgs/by-name/el/element-web-unwrapped/package.nix index b747fafd8d91..850a5217a91e 100644 --- a/pkgs/by-name/el/element-web-unwrapped/package.nix +++ b/pkgs/by-name/el/element-web-unwrapped/package.nix @@ -11,7 +11,7 @@ let pinData = import ./element-web-pin.nix; - inherit (pinData.hashes) webSrcHash webYarnHash; + inherit (pinData.hashes) webSrcHash webYarnHash webSharedComponentsYarnHash; noPhoningHome = { disable_guests = true; # disable automatic guest account registration at matrix.org }; @@ -35,6 +35,13 @@ stdenv.mkDerivation ( hash = webSrcHash; }; + # https://github.com/element-hq/element-web/commit/e883b05206129857aa00ca726252e10a0eb05cf9 + # introduced a link: dependency that we need to fetch as well + offlineCacheSharedComponents = fetchYarnDeps { + yarnLock = finalAttrs.src + "/packages/shared-components/yarn.lock"; + sha256 = webSharedComponentsYarnHash; + }; + offlineCache = fetchYarnDeps { yarnLock = finalAttrs.src + "/yarn.lock"; sha256 = webYarnHash; @@ -50,6 +57,12 @@ stdenv.mkDerivation ( runHook preBuild export VERSION=${finalAttrs.version} + + pushd packages/shared-components + yarnOfflineCache=${finalAttrs.offlineCacheSharedComponents} yarnConfigHook + popd + yarn --offline --cwd packages/shared-components prepare + yarn --offline build:res yarn --offline build:module_system yarn --offline build:bundle From c2be4f810a06545befc4acb55ee377d0666767d3 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Wed, 3 Dec 2025 23:23:58 +0100 Subject: [PATCH 4/5] element-web-unwrapped: 1.12.4 -> 1.12.6 Release notes: https://github.com/element-hq/element-web/releases/tag/v1.12.5 Changelog: https://github.com/element-hq/element-web/compare/v1.12.4...v1.12.6 --- pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 a5d786ed2276..adaebeb66580 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,8 +1,8 @@ { - "version" = "1.12.4"; + "version" = "1.12.6"; "hashes" = { - "webSrcHash" = "sha256-5sRKVgKbU4hr1cubY/0PdLDClBcFGxdu9TITORL6beI="; - "webYarnHash" = "sha256-S+glH2HkGyINEGHWn1TMK2y45gk7WtxTe+u4luqVgsw="; - "webSharedComponentsYarnHash" = "sha256-azvUG/Oyq38q/llJd0AtEliFCX0+TrEtzfHsd+UpaEs="; + "webSrcHash" = "sha256-MZohRkaPNoevaLmOb60OcebYJDd0sI3UaPEFMXh7y38="; + "webYarnHash" = "sha256-3iV2XXphubxDG+FzbNC9cHY+gjSTssv6iQK9U7BLMp0="; + "webSharedComponentsYarnHash" = "sha256-fwRasJ3iI+4DjqfNNpZ5CceEydJITUTeB7brhcmqOKk="; }; } From d1bc225b837f621fa9bfc804886cc8f43fa05851 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Wed, 3 Dec 2025 23:24:39 +0100 Subject: [PATCH 5/5] element-desktop: 1.12.4 -> 1.12.6 Release notes: https://github.com/element-hq/element-desktop/releases/tag/v1.12.5 Changelog: https://github.com/element-hq/element-desktop/compare/v1.12.4...v1.12.6 --- pkgs/by-name/el/element-desktop/element-desktop-pin.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 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 39f5b44f814c..ae3089d89bb3 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.12.4"; + "version" = "1.12.6"; "hashes" = { - "desktopSrcHash" = "sha256-6fgbwLccILdb1iCcLrKauBzWMjMAZQgKo09gZhJB9Gk="; - "desktopYarnHash" = "sha256-7eYmz298m6ceREcaAo9CSMMFC3fB/ZC1+ArPb9pqc0o="; + "desktopSrcHash" = "sha256-3CuEFbota6MPVLPeHkXgtb0OmDW91w08+XVnT3mDHaI="; + "desktopYarnHash" = "sha256-SPXbp+6zmwXD0uN4ByV6kIni+DGQT8evYMioH1NZJVU="; }; }