Skip to content

Conversation

@daniel-fahey
Copy link
Contributor

@daniel-fahey daniel-fahey commented Mar 13, 2024

Description of changes

This adds an optional GUI to Proton Mail Bridge (pname = protonmail-bridge-gui) reusing (and preserving) the existing CLI package as its backend (pname = protonmail-bridge). It is built from a patched source using CMake and Qt 6. It also fixes #255523.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@daniel-fahey daniel-fahey force-pushed the protonmail-bridge-gui branch from 8979f24 to 42c0b54 Compare March 13, 2024 12:40
@daniel-fahey daniel-fahey requested a review from MrFreezeex March 13, 2024 12:44
@daniel-fahey
Copy link
Contributor Author

Reviews from those more experienced with building Qt applications would be very welcome @NixOS/qt-kde

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Mar 13, 2024
@daniel-fahey daniel-fahey force-pushed the protonmail-bridge-gui branch from 42c0b54 to 443559d Compare March 13, 2024 14:27
@ofborg ofborg bot added 8.has: package (new) This PR adds a new package 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. and removed 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Mar 13, 2024
@daniel-fahey daniel-fahey force-pushed the protonmail-bridge-gui branch from 443559d to 0138d0b Compare March 13, 2024 15:07
@daniel-fahey daniel-fahey changed the title protonmail-bridge: add optional GUI protonmail-bridge-gui: init at 3.9.1 Mar 13, 2024
@daniel-fahey daniel-fahey force-pushed the protonmail-bridge-gui branch 2 times, most recently from 8c21c49 to 29fc80a Compare March 13, 2024 15:43
Copy link
Contributor

@eclairevoyant eclairevoyant left a comment

Choose a reason for hiding this comment

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

Thanks for the contribution! A couple changes below:

@daniel-fahey
Copy link
Contributor Author

Thanks @eclairevoyant! I'll try your suggestions tonight/tomorrow morning

@daniel-fahey daniel-fahey marked this pull request as draft March 15, 2024 17:17
@daniel-fahey
Copy link
Contributor Author

Put into draft while I fix protonmail-bridge --cli

@daniel-fahey daniel-fahey force-pushed the protonmail-bridge-gui branch 2 times, most recently from 534a141 to 121043d Compare March 19, 2024 14:51
@daniel-fahey daniel-fahey marked this pull request as ready for review March 19, 2024 14:51
@ofborg ofborg bot requested a review from MrFreezeex March 19, 2024 14:58
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. and removed 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Mar 19, 2024
@daniel-fahey daniel-fahey force-pushed the protonmail-bridge-gui branch 3 times, most recently from 38ea440 to b4614e8 Compare March 19, 2024 20:26
Copy link
Contributor

@SebTM SebTM left a comment

Choose a reason for hiding this comment

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

LGTM even I'm not very into C++ :D - tested it on unstable with latest commits and builds / works fine (setup with an account and thunderbird) - also tested to have both installed in parallel that there are no conflicts.

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one person. label Mar 20, 2024
@daniel-fahey daniel-fahey force-pushed the protonmail-bridge-gui branch from b4614e8 to df4ffc9 Compare March 20, 2024 10:57
@daniel-fahey
Copy link
Contributor Author

Thanks for everyone's time! I think I've resolved all the issues that have been spotted so far.

@daniel-fahey daniel-fahey requested a review from drupol March 20, 2024 11:11
@ofborg ofborg bot requested a review from MrFreezeex March 20, 2024 11:22
@drupol drupol merged commit c4f1f45 into NixOS:master Mar 20, 2024
@daniel-fahey daniel-fahey deleted the protonmail-bridge-gui branch October 18, 2024 15:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

protonmail-bridge GUI missing

7 participants