Unverified Commit 088603e1 authored by Maximilian Bosch's avatar Maximilian Bosch Committed by GitHub
Browse files

Merge: element-{web,desktop}: 1.11.96 -> 1.11.97 (#397197)

parents b2c889f6 952b8e98

pkgs/by-name/el/element-desktop/element-desktop-pin.nix

+3 −3
Original line number Diff line number Diff line 
{

  "version" = "1.11.96";

  "version" = "1.11.97";

  "hashes" = {

    "desktopSrcHash" = "sha256-oTU/Pvl4gBp69OrUrXEYXupl0WphsEWt32sB4v6T+gA=";

    "desktopYarnHash" = "sha256-zMdSA/CkMDXirWZ2uCPTgZ5iErV7rGyR+xcLh9sPDA8=";

    "desktopSrcHash" = "sha256-4ea5C1I/bdGsy4CxsNB1GWL8RQnJpHr/MbIOB5Z+gFA=";

    "desktopYarnHash" = "sha256-HI/aRf9pGao8m8z3oA0wdbjDQth3zijJeskV2D+KsgM=";

  };

}

pkgs/by-name/el/element-desktop/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
  nodejs,

  fetchYarnDeps,

  jq,

  electron_34,

  electron_35,

  element-web,

  sqlcipher,

  callPackage,
@@ -22,7 +22,7 @@ let 
  pinData = import ./element-desktop-pin.nix;

  inherit (pinData.hashes) desktopSrcHash desktopYarnHash;

  executableName = "element-desktop";

  electron = electron_34;

  electron = electron_35;

  keytar = callPackage ./keytar {

    inherit electron;

  };

pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix

+3 −3
Original line number Diff line number Diff line 
{

  "version" = "1.11.96";

  "version" = "1.11.97";

  "hashes" = {

    "webSrcHash" = "sha256-EfSQEyMG9v5Boev98FyfzLA3hZLzxSGxAnZFfbc2aVA=";

    "webYarnHash" = "sha256-Dp7WXEjWSDQjpmnJUrloIQau6is8YxTYzJmnQBIk+Ys=";

    "webSrcHash" = "sha256-x7VS4l2uwXq2wjZeGwnaENHlhwnVz5Gt3f55kiH2Zhk=";

    "webYarnHash" = "sha256-uwuBwAZYjt3WsbUCM8q9PaiV5WxKSpyJyVzM8gJOhPo=";

  };

}