pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #266296 from yayayayaka/element-1.11.48

element-{web,desktop}: 1.11.47 -> 1.11.50

authored by Nick Cao and committed by GitHub a68bc4fe dfb9303e

+17 -16
unified split
+11 -11
pkgs/applications/networking/instant-messengers/element/element-web.nix
··· 35 36 nativeBuildInputs = [ yarn prefetch-yarn-deps jq nodejs ]; 37 38 configurePhase = '' 39 runHook preConfigure 40 ··· 52 patchShebangs node_modules 53 54 runHook postConfigure 55 - ''; 56 - 57 - buildPhase = '' 58 - runHook preBuild 59 - 60 - export VERSION=${finalAttrs.version} 61 - yarn build:res --offline 62 - yarn build:module_system --offline 63 - yarn build:bundle --offline 64 - 65 - runHook postBuild 66 ''; 67 68 installPhase = ''
··· 35 36 nativeBuildInputs = [ yarn prefetch-yarn-deps jq nodejs ]; 37 38 + buildPhase = '' 39 + runHook preBuild 40 + 41 + export VERSION=${finalAttrs.version} 42 + yarn --offline build:res 43 + yarn --offline build:module_system 44 + yarn --offline build:bundle 45 + 46 + runHook postBuild 47 + ''; 48 + 49 configurePhase = '' 50 runHook preConfigure 51 ··· 63 patchShebangs node_modules 64 65 runHook postConfigure 66 ''; 67 68 installPhase = ''
+5 -5
pkgs/applications/networking/instant-messengers/element/pin.nix
··· 1 { 2 - "version" = "1.11.47"; 3 "hashes" = { 4 - "desktopSrcHash" = "sha256-Ea3LJt+3HAOX2PTREMojtuPVTeA6u7VJtysd8bbTbwU="; 5 - "desktopYarnHash" = "1nssv92yk1a53v7mvijkrb3gzif5xrz2j6lxvg7p340z42rm7f9v"; 6 - "webSrcHash" = "sha256-DPBMZMjDnwjdNsePcUBBU0KRGOpOmNHgQZn9/ad/Qss="; 7 - "webYarnHash" = "0rzipmaq0jarzdawl7lmxnapwzl52kklxadm859hgx9b1hd5vwj7"; 8 }; 9 }
··· 1 { 2 + "version" = "1.11.50"; 3 "hashes" = { 4 + "desktopSrcHash" = "sha256-ZSzH0QWUSmoSk57TF7EH3DbUFO4VX8jCrH55oruMP+s="; 5 + "desktopYarnHash" = "044sjxpd86zhmd0wcqmsnjvrh1krspp2qd9xzlxii4zwm9jz1hxn"; 6 + "webSrcHash" = "sha256-6BzqETzQL4Xi4YqSyjFmIgajPPpagTS4tYhOZrEfEpo="; 7 + "webYarnHash" = "1aw40r44dvl43bfgl2cr52hdj833maq2xyg3xa49837m7lf6pr8c"; 8 }; 9 }
+1
pkgs/build-support/node/fetch-yarn-deps/default.nix
··· 64 65 nativeBuildInputs = [ prefetch-yarn-deps cacert ]; 66 GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; 67 68 buildPhase = '' 69 runHook preBuild
··· 64 65 nativeBuildInputs = [ prefetch-yarn-deps cacert ]; 66 GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; 67 + NODE_EXTRA_CA_CERTS = "${cacert}/etc/ssl/certs/ca-bundle.crt"; 68 69 buildPhase = '' 70 runHook preBuild