Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[20.09] element: 1.7.24 -> 1.7.25 #119241

Merged
merged 7 commits into from Apr 17, 2021
Merged

Conversation

Ma27
Copy link
Member

@Ma27 Ma27 commented Apr 12, 2021

Motivation for this change

Backport PR for #119233. For some reason element-desktop is breaking:

Keytar isn't installed; secure key storage is disabled.
Seshat isn't installed, event indexing is disabled.
/home/ma27/.config/Element exists: yes
/home/ma27/.config/Riot exists: no
No update_base_url is defined: auto update is disabled
(node:6375) UnhandledPromiseRejectionWarning: TypeError: mainWindow.webContents.session.setSpellCheckerEnabled is not a function
    at App.<anonymous> (/nix/store/ydd7z7rjvbjzw5y4qnj2waxrvmbvdbbc-element-desktop-1.7.25/share/element/electron/src/electron-main.js:947:36)
(node:6375) UnhandledPromiseRejectionWarning: Unhandled promise rejection. This error originated either by throwing inside of an async function without a catch block, or by rejecting a promise which was not handled with .catch(). To terminate the node process on unhandled promise rejection, use the CLI flag `--unhandled-rejections=strict` (see https://nodejs.org/api/cli.html#cli_unhandled_rejections_mode). (rejection id: 1)
(node:6375) [DEP0018] DeprecationWarning: Unhandled promise rejections are deprecated. In the future, promise rejections that are not handled will terminate the Node.js process with a non-zero exit code.

We probably need electron 12 to fix this, but I didn't push this for now since I don't know and don't use element-desktop.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Copy link
Contributor

@drewrisinger drewrisinger left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • Diff LGTM
  • Commits LGTM
  • Builds via nix-review on x86-64-linux:
1 package built:
element-desktop

[nix-shell:~/.cache/nixpkgs-review/pr-119241]$ element-desktop --help
Keytar isn't installed; secure key storage is disabled.
Seshat isn't installed, event indexing is disabled.
Options:
  --profile-dir {path}: Path to where to store the profile.
  --profile {name}:     Name of alternate profile to use, allows for running multiple accounts.
  --devtools:           Install and use react-devtools and react-perf.
  --no-update:          Disable automatic updating.
  --hidden:             Start the application hidden in the system tray.
  --help:               Displays this help message.
And more such as --proxy, see:https://electronjs.org/docs/api/command-line-switches

@Ma27
Copy link
Member Author

Ma27 commented Apr 12, 2021

Yeah, have you tried, actually running element-desktop @drewrisinger ? Because that's the problem I have right now :)

@drewrisinger
Copy link
Contributor

Yeah, have you tried, actually running element-desktop @drewrisinger ? Because that's the problem I have right now :)

Nope. When I did, I got the same error you did. I'm not familiar enough with electron/element-desktop to contribute anything, sorry.

@TredwellGit
Copy link
Member

This needs Electron 12. Backport:
#117621
#119578

@Ma27
Copy link
Member Author

Ma27 commented Apr 16, 2021

@TredwellGit done :)

Copy link
Member

@prusnak prusnak left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK for the electron-related changes

@Ma27 Ma27 merged commit 82f8d5a into NixOS:release-20.09 Apr 17, 2021
@Ma27 Ma27 deleted the backport-element branch April 17, 2021 07:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants