diff options
author | Nick Cao <nickcao@nichi.co> | 2023-11-23 09:27:14 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-23 09:27:14 -0500 |
commit | a68bc4feaf4bbf4b626226ff8f0f8110588d4ebc (patch) | |
tree | 5c8d2737063ddbd9fc21395a73db141e05d1cf77 /pkgs | |
parent | dfb9303e00adbdba8ba0e79ba56ee80a08f400e6 (diff) | |
parent | f77f6bcd9640c7fc7aa5116237279dd6abbf22b3 (diff) | |
download | nixlib-a68bc4feaf4bbf4b626226ff8f0f8110588d4ebc.tar nixlib-a68bc4feaf4bbf4b626226ff8f0f8110588d4ebc.tar.gz nixlib-a68bc4feaf4bbf4b626226ff8f0f8110588d4ebc.tar.bz2 nixlib-a68bc4feaf4bbf4b626226ff8f0f8110588d4ebc.tar.lz nixlib-a68bc4feaf4bbf4b626226ff8f0f8110588d4ebc.tar.xz nixlib-a68bc4feaf4bbf4b626226ff8f0f8110588d4ebc.tar.zst nixlib-a68bc4feaf4bbf4b626226ff8f0f8110588d4ebc.zip |
Merge pull request #266296 from yayayayaka/element-1.11.48
element-{web,desktop}: 1.11.47 -> 1.11.50
Diffstat (limited to 'pkgs')
3 files changed, 17 insertions, 16 deletions
diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix index b6f8e0f8f99a..343c21d64730 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -35,6 +35,17 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { nativeBuildInputs = [ yarn prefetch-yarn-deps jq nodejs ]; + buildPhase = '' + runHook preBuild + + export VERSION=${finalAttrs.version} + yarn --offline build:res + yarn --offline build:module_system + yarn --offline build:bundle + + runHook postBuild + ''; + configurePhase = '' runHook preConfigure @@ -54,17 +65,6 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { runHook postConfigure ''; - buildPhase = '' - runHook preBuild - - export VERSION=${finalAttrs.version} - yarn build:res --offline - yarn build:module_system --offline - yarn build:bundle --offline - - runHook postBuild - ''; - installPhase = '' runHook preInstall diff --git a/pkgs/applications/networking/instant-messengers/element/pin.nix b/pkgs/applications/networking/instant-messengers/element/pin.nix index a49a2f271583..a730d8611b78 100644 --- a/pkgs/applications/networking/instant-messengers/element/pin.nix +++ b/pkgs/applications/networking/instant-messengers/element/pin.nix @@ -1,9 +1,9 @@ { - "version" = "1.11.47"; + "version" = "1.11.50"; "hashes" = { - "desktopSrcHash" = "sha256-Ea3LJt+3HAOX2PTREMojtuPVTeA6u7VJtysd8bbTbwU="; - "desktopYarnHash" = "1nssv92yk1a53v7mvijkrb3gzif5xrz2j6lxvg7p340z42rm7f9v"; - "webSrcHash" = "sha256-DPBMZMjDnwjdNsePcUBBU0KRGOpOmNHgQZn9/ad/Qss="; - "webYarnHash" = "0rzipmaq0jarzdawl7lmxnapwzl52kklxadm859hgx9b1hd5vwj7"; + "desktopSrcHash" = "sha256-ZSzH0QWUSmoSk57TF7EH3DbUFO4VX8jCrH55oruMP+s="; + "desktopYarnHash" = "044sjxpd86zhmd0wcqmsnjvrh1krspp2qd9xzlxii4zwm9jz1hxn"; + "webSrcHash" = "sha256-6BzqETzQL4Xi4YqSyjFmIgajPPpagTS4tYhOZrEfEpo="; + "webYarnHash" = "1aw40r44dvl43bfgl2cr52hdj833maq2xyg3xa49837m7lf6pr8c"; }; } diff --git a/pkgs/build-support/node/fetch-yarn-deps/default.nix b/pkgs/build-support/node/fetch-yarn-deps/default.nix index 06c82c8d8e2b..e837f7457d17 100644 --- a/pkgs/build-support/node/fetch-yarn-deps/default.nix +++ b/pkgs/build-support/node/fetch-yarn-deps/default.nix @@ -64,6 +64,7 @@ in { nativeBuildInputs = [ prefetch-yarn-deps cacert ]; GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + NODE_EXTRA_CA_CERTS = "${cacert}/etc/ssl/certs/ca-bundle.crt"; buildPhase = '' runHook preBuild |