Unverified Commit a68bc4fe authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #266296 from yayayayaka/element-1.11.48 

element-{web,desktop}: 1.11.47 -> 1.11.50
parents dfb9303e f77f6bcd

pkgs/applications/networking/instant-messengers/element/element-web.nix

+11 −11
Original line number Diff line number Diff line
@@ -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

pkgs/applications/networking/instant-messengers/element/pin.nix

+5 −5
Original line number Diff line number Diff line 
{

  "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";

  };

}

pkgs/build-support/node/fetch-yarn-deps/default.nix

+1 −0
Original line number Diff line number Diff line
@@ -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