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.03] element-{web,desktop}: backport version bump & rename #93773

Merged
merged 5 commits into from Jul 27, 2020

Conversation

Ma27
Copy link
Member

@Ma27 Ma27 commented Jul 24, 2020

Motivation for this change

Backports the rename of riot-{web,desktop} to element (#93134, #93303, #93308) that has happened during the update to 1.7. Also added some warnings to advertise the use of pkgs.element* and to mention removed feature-flags (where the features are now available by default in element).

Rationale for backport: for the matrix subsystem on NixOS we've established a backport-by-default policy to remain up-to-date with the matrix.org infrastructure several months ago (previosuly we experienced compat-issues with their infrastructure occasionally). Several people (including me) from the Nix-matrix channel are already using element-web at 1.7 on NixOS systems (on both unstable and 20.03) without having any issues (while using and while migrating to it), so we currently consider this backport as doable.

cc @NixOS/backports @claudiiii

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.

@Ma27
Copy link
Member Author

Ma27 commented Jul 24, 2020

As suggested by @pacien, we should do the migration now on 20.03 and only have element* available on 20.09. For this, I opened #93774

@Ma27
Copy link
Member Author

Ma27 commented Jul 24, 2020

Hmm right, lib.warn doesn't work in aliases.nix. Will fix this before merging.

@claudiiii
Copy link
Contributor

Since Electron 9 is not in 20.03 but Electron 8 is, it might be worthwhile to use that, at least for the backport.

Ma27 and others added 3 commits July 26, 2020 11:59
It used to work with this version and `electron_9` isn't available on
20.03.
@Ma27
Copy link
Member Author

Ma27 commented Jul 26, 2020

Latest push should fix eval, also using electron_8 for riot-desktop now.

@Ma27
Copy link
Member Author

Ma27 commented Jul 26, 2020

@NixOS/backports any objctions?

@worldofpeace
Copy link
Contributor

No objections @Ma27

Copy link
Contributor

@worldofpeace worldofpeace left a comment

Choose a reason for hiding this comment

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

Haven't tested, but I believe this was okay.

@Ma27 Ma27 merged commit 91c9062 into NixOS:release-20.03 Jul 27, 2020
@Ma27 Ma27 deleted the element-20.03 branch July 27, 2020 10:53
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