schildichat: 1.10.3-sc.0.test.1 -> 1.10.4-sc.1 (#162131)
This commit is contained in:
parent
0d55ad8248
commit
a8c080b0b9
@ -1,7 +1,9 @@
|
||||
{
|
||||
"version": "1.10.3-sc.0.test.1",
|
||||
"rev": "3a8eecb023c832acc4390d3a51c0940eafb2b3bd",
|
||||
"srcHash": "07amc69ghfz39jbps14ysfql4m42dmzbdjq9hqvzirhqz52mshf3",
|
||||
"webYarnHash": "0knkl8sanqcx0lxjclz6s8vm5wpn8aywx9vydz7lda3l6c2g5zqf",
|
||||
"version": "1.10.4-sc.1",
|
||||
"rev": "v1.10.4-sc.1",
|
||||
"srcHash": "0sxibzskbw9pa6wmbk1y3n7p74cfj9zvm2hsw76sp6wfac1wnbwl",
|
||||
"webYarnHash": "1z8xr35gh74y2iv9kfk6d6b6f3iclcrpkdds5q7rh2irpf14fwpw",
|
||||
"jsSdkYarnHash": "1cwvb0hwq19dh2937fmcbfvnkkfmalk9wrxf1yv81nsbyjnx86di",
|
||||
"reactSdkYarnHash": "0j4rxg11q35idfzvjrpmyrwkz9yqgzpwps3xqx1k4qcs844jjs9f",
|
||||
"desktopYarnHash": "0akmgib212gkygvs2snn9c43k3ika3ipg85d480j3hqyb6yxwqmn"
|
||||
}
|
||||
|
@ -25,10 +25,18 @@ in stdenv.mkDerivation rec {
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
webOfflineCache = fetchYarnDeps {
|
||||
yarnLock = src + "/element-web/yarn.lock";
|
||||
sha256 = pinData.webYarnHash;
|
||||
};
|
||||
jsSdkOfflineCache = fetchYarnDeps {
|
||||
yarnLock = src + "/matrix-js-sdk/yarn.lock";
|
||||
sha256 = pinData.jsSdkYarnHash;
|
||||
};
|
||||
reactSdkOfflineCache = fetchYarnDeps {
|
||||
yarnLock = src + "/matrix-react-sdk/yarn.lock";
|
||||
sha256 = pinData.reactSdkYarnHash;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ yarn fixup_yarn_lock jq nodejs ];
|
||||
|
||||
@ -37,14 +45,30 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
export HOME=$PWD/tmp
|
||||
mkdir -p $HOME
|
||||
|
||||
pushd element-web
|
||||
yarn config --offline set yarn-offline-mirror $offlineCache
|
||||
fixup_yarn_lock yarn.lock
|
||||
yarn config --offline set yarn-offline-mirror $webOfflineCache
|
||||
yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive
|
||||
patchShebangs node_modules
|
||||
rm -rf node_modules/matrix-react-sdk
|
||||
patchShebangs node_modules/ ../matrix-react-sdk/scripts/
|
||||
ln -s $PWD/../matrix-react-sdk node_modules/
|
||||
ln -s $PWD/node_modules ../matrix-react-sdk/
|
||||
rm -rf node_modules/matrix-js-sdk
|
||||
ln -s $PWD/../matrix-js-sdk node_modules/
|
||||
popd
|
||||
|
||||
pushd matrix-js-sdk
|
||||
fixup_yarn_lock yarn.lock
|
||||
yarn config --offline set yarn-offline-mirror $jsSdkOfflineCache
|
||||
yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive
|
||||
patchShebangs node_modules
|
||||
popd
|
||||
|
||||
pushd matrix-react-sdk
|
||||
fixup_yarn_lock yarn.lock
|
||||
yarn config --offline set yarn-offline-mirror $reactSdkOfflineCache
|
||||
yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive
|
||||
patchShebangs node_modules scripts
|
||||
popd
|
||||
|
||||
runHook postConfigure
|
||||
@ -54,7 +78,7 @@ in stdenv.mkDerivation rec {
|
||||
runHook preBuild
|
||||
|
||||
pushd matrix-react-sdk
|
||||
node_modules/.bin/reskindex -h ../element-web/src/header
|
||||
../element-web/node_modules/.bin/reskindex -h ../element-web/src/header
|
||||
popd
|
||||
|
||||
pushd element-web
|
||||
|
@ -27,6 +27,8 @@ src_hash=$(echo $src_data | jq -r .sha256)
|
||||
|
||||
web_yarn_hash=$(prefetch-yarn-deps $src/element-web/yarn.lock)
|
||||
desktop_yarn_hash=$(prefetch-yarn-deps $src/element-desktop/yarn.lock)
|
||||
js_sdk_yarn_hash=$(prefetch-yarn-deps $src/matrix-js-sdk/yarn.lock)
|
||||
react_sdk_yarn_hash=$(prefetch-yarn-deps $src/matrix-react-sdk/yarn.lock)
|
||||
|
||||
cat > pin.json << EOF
|
||||
{
|
||||
@ -34,6 +36,8 @@ cat > pin.json << EOF
|
||||
"rev": "$rev",
|
||||
"srcHash": "$src_hash",
|
||||
"webYarnHash": "$web_yarn_hash",
|
||||
"jsSdkYarnHash": "$js_sdk_yarn_hash",
|
||||
"reactSdkYarnHash": "$react_sdk_yarn_hash",
|
||||
"desktopYarnHash": "$desktop_yarn_hash"
|
||||
}
|
||||
EOF
|
||||
|
Loading…
Reference in New Issue
Block a user