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

element-desktop, element-web: init at 1.7.0 #93134

Merged
merged 1 commit into from Jul 16, 2020
Merged

element-desktop, element-web: init at 1.7.0 #93134

merged 1 commit into from Jul 16, 2020

Conversation

claudiiii
Copy link
Contributor

@claudiiii claudiiii commented Jul 14, 2020

Motivation for this change

A new version of riot-desktop was released a while ago: https://github.com/vector-im/riot-desktop/releases/tag/v1.6.8

See #93135 for riot-web.

Riot 1.7.0 is now Element, I changed everything from Riot to Element.

I tried to include keytar and matrix-seshat (#87752) but didn't find a way to build them, maybe someone with more knowledge of nodejs / yarn2nix in nix can help?

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.

src = fetchFromGitHub {
owner = "vector-im";
repo = "riot-desktop";
rev = "v${version}";
sha256 = "0l1ih7rkb0nnc79607kkg0k69j9kwqrczhgkqzsmvqxjz7pk9kgn";
sha256 = "1igln0a8inxamknsds524k8k7934frc7jjn6y9bn43d0mq2j2vh4";
};
electron = electron_7;
Copy link
Contributor

Choose a reason for hiding this comment

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It works with Electron 9 but mesa complains about missing iris drivers and there is no tray icon. But this might only be a problem on 20.03 and not unstable.

Copy link
Contributor

Choose a reason for hiding this comment

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

The openGL driver is a constant source of troubles when testing new updates, because of the /run/opengl-driver impurity. This should probably be tested by rebuilding the system at this PR revision and boot into it, or in a VM.

@ofborg ofborg bot requested a review from pacien July 14, 2020 19:11
@Ma27
Copy link
Member

Ma27 commented Jul 15, 2020

1.7.0 is out now. Also, please squash your commits together.

And for the future, it's sufficient to open up a single PR for both packages.

@claudiiii
Copy link
Contributor Author

@Ma27 How should I handle the name change form Riot to Element? Rename the files but keep the riot-* entries in all-packages, or keep the riot name for now?

@Ma27
Copy link
Member

Ma27 commented Jul 15, 2020

rename in all-packages.nix and keep the aliases in top-level/aliases.nix.

@claudiiii claudiiii changed the title riot-desktop: 1.6.7 -> 1.6.8 element-desktop, element-web: init at 1.7.0 Jul 15, 2020
@claudiiii
Copy link
Contributor Author

I updated everything to 1.7.0 and changed the name.

@xavierzwirtz
Copy link
Contributor

xavierzwirtz commented Jul 15, 2020

Tested element-desktop, works for me.

@worldofpeace worldofpeace merged commit b378190 into NixOS:master Jul 16, 2020
@worldofpeace
Copy link
Contributor

worldofpeace commented Jul 16, 2020

Did this rename incur some sort of breaking change that we have to backport to the release?

@pacien
Copy link
Contributor

pacien commented Jul 16, 2020

Good question; Is it also using a different directory for the user data? If not, is it migrating accounts automatically?

Porting this to the stable branch might not be straightforward as this new version depends on Electron 9, which isn't available on release-20.03.

@rnhmjoj
Copy link
Contributor

rnhmjoj commented Jul 16, 2020

The NixOS manual also needs to be changed. The matrix synapse section mentions and explain how to serve riot-web.

@claudiiii
Copy link
Contributor Author

Account data will be read from the old Riot.im location. I didn't need to change anything.

Electron 9 works on 20.03, couldn't it be backported as well?

@worldofpeace
Copy link
Contributor

Hmm, for some reason the desktop item was not being associated with the proper icon for me.

@claudiiii
Copy link
Contributor Author

claudiiii commented Jul 16, 2020

Interesting they just released 1.7.1 wich adds the new icons, I'll open a new pr with the update.

Edit: I opened #93303 which should fix the icons.

@Ma27
Copy link
Member

Ma27 commented Jul 16, 2020

@worldofpeace I haven't taken a closer look. I can update the package and docs tomorrow amd perform a backbport if needed.

@worldofpeace
Copy link
Contributor

@Ma27 It seems @claudiiii opened #93303. Docs still need to be updated though 👍

@claudiiii
Copy link
Contributor Author

@Ma27 I opened #93308 with a doc update.

@Ma27
Copy link
Member

Ma27 commented Jul 17, 2020

@worldofpeace @claudiiii due to the bgufixes on e.g. 1.7.1, does it make sense to backport this? (thanks to the aliases that should be ok I guess).

@claudiiii claudiiii deleted the update-riot-desktop branch February 2, 2021 14:57
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

6 participants