Unverified Commit 4fa59d00 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

element-{web-unwrapped,desktop}: 1.11.112 -> 1.12.0 (#445603)

parents fda296cd 683abeec

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

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

  "version" = "1.11.112";

  "version" = "1.12.0";

  "hashes" = {

    "desktopSrcHash" = "sha256-L4/2VwPHBusVTCi8DzxmAUbvW0p1d/ffbz9ZwUmgzEo=";

    "desktopYarnHash" = "sha256-U+MuOe0N29AFrLCi7Xa9bDW70SmhQqqtjim+x7QAiJg=";

    "desktopSrcHash" = "sha256-Epkjv6tT0I65JTu4O5nHFRn0q18kE1+7joyTF1S3y+4=";

    "desktopYarnHash" = "sha256-2zy2xNzamjTyGE+Vm/gacMnby5Z0KfIWbgkl5EI5zi4=";

  };

}

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

+5 −7
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
  yarn,

  nodejs,

  jq,

  electron_37,

  electron_38,

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

  electron = electron_38;

  keytar = callPackage ./keytar {

    inherit electron;

  };
@@ -111,11 +111,9 @@ stdenv.mkDerivation ( 
      cp $out/share/element/electron/lib/i18n/strings/en_EN.json $out/share/element/electron/lib/i18n/strings/en-us.json

      ln -s $out/share/element/electron/lib/i18n/strings/en{-us,}.json



      # icons

      for icon in $out/share/element/electron/build/icons/*.png; do

        mkdir -p "$out/share/icons/hicolor/$(basename $icon .png)/apps"

        ln -s "$icon" "$out/share/icons/hicolor/$(basename $icon .png)/apps/element.png"

      done

      # icon

      mkdir -p "$out/share/icons/hicolor/icon/apps"

      ln -s "$out/share/element/electron/build/icon.png" "$out/share/icons/hicolor/icon/apps/element.png"



      # desktop item

      mkdir -p "$out/share"

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

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

  "version" = "1.11.112";

  "version" = "1.12.0";

  "hashes" = {

    "webSrcHash" = "sha256-rWbn3ibylEchBZR8ZF6lrPBSjJvF8Ezl/+7ZzgVhz7g=";

    "webYarnHash" = "sha256-ItrmxNlaRijNpp+gk1g3tTLw4roHuTqW2SnpapIH1Uk=";

    "webSrcHash" = "sha256-4e76IFOY7YiBX/cGobJNj1epH/Bnak+BgVPSjWC/8+s=";

    "webYarnHash" = "sha256-qZPHWPmcGFtwfOSCpft0hFLuS7smmq9w1JxJ+oqJZPA=";

  };

}