gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

element-{web,desktop}: 1.12.3 -> 1.12.6 (#465374)

Browse Source
This commit is contained in:
Sandro
2025-12-04 15:27:37 +00:00
committed by GitHub
parent 035910500d d1bc225b83
commit 8429e36770
5 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/el/element-desktop/element-desktop-pin.nix
+3 -3
View File
@@ -1,7 +1,7 @@
{
"version" = "1.12.3";
"version" = "1.12.6";
"hashes" = {
"desktopSrcHash" = "sha256-4pv6KxcTocguJo7DlBO+/pi+n8JbTHWukMtagaGaDy8=";
"desktopYarnHash" = "sha256-lQn5dAiC15O/2eaWfWJedFjBgmnglAlmAEOhz+in0DM=";
"desktopSrcHash" = "sha256-3CuEFbota6MPVLPeHkXgtb0OmDW91w08+XVnT3mDHaI=";
"desktopYarnHash" = "sha256-SPXbp+6zmwXD0uN4ByV6kIni+DGQT8evYMioH1NZJVU=";
};
}
pkgs/by-name/el/element-desktop/update.sh
+5
View File
@@ -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
pkgs/by-name/el/element-desktop/yarn.nix
+1
View File
@@ -41,4 +41,5 @@ stdenvNoCC.mkDerivation {
outputHash = hash;
outputHashMode = "recursive";
outputHashAlgo = "sha256";
}
pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix
+4 -3
View File
@@ -1,7 +1,8 @@
{
"version" = "1.12.3";
"version" = "1.12.6";
"hashes" = {
"webSrcHash" = "sha256-a/RrUzJU/pjyD36WmNIqjSTBn5cfUOGNSe/l6iGp/0A=";
"webYarnHash" = "sha256-TXOehZRw5UIhGTnpR0KzvEizSW9Qk2VTr+cG/XstB+k=";
"webSrcHash" = "sha256-MZohRkaPNoevaLmOb60OcebYJDd0sI3UaPEFMXh7y38=";
"webYarnHash" = "sha256-3iV2XXphubxDG+FzbNC9cHY+gjSTssv6iQK9U7BLMp0=";
"webSharedComponentsYarnHash" = "sha256-fwRasJ3iI+4DjqfNNpZ5CceEydJITUTeB7brhcmqOKk=";
};
}
pkgs/by-name/el/element-web-unwrapped/package.nix
+14 -1
View File
@@ -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