Navigation Menu

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

Jump to bottom

[20.03] riot-{desktop,web}: 1.5.15 -> 1.6.0 #87142

Merged
2 commits merged into from May 7, 2020
Merged

[20.03] riot-{desktop,web}: 1.5.15 -> 1.6.0 #87142

2 commits merged into from May 7, 2020

Conversation

blitz
Copy link
Contributor

@blitz blitz commented May 6, 2020

Motivation for this change

Backported version 1.6.0 from master, because it introduces device cross-signing support that is needed to cleanly interoperate with the Android and web clients.

No modifications were necessary. Commits applied cleanly.

Looks like this wasn't contributed to master as a PR, but manually pushed around #86919?

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.

@blitz blitz requested a review from Ma27 May 6, 2020 21:48
Ma27
Ma27 approved these changes May 6, 2020
View reviewed changes
Copy link
Member

@Ma27 Ma27 left a comment

Choose a reason for hiding this comment

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

Nope, pushed directly to master. Already raised the discussion whether to backport this in the nix-matrix channel, I'm totally in favor of it 👍

@ofborg ofborg bot requested review from pacien and worldofpeace May 6, 2020 21:58
dasJ
dasJ approved these changes May 6, 2020
View reviewed changes
Copy link
Member

@dasJ dasJ left a comment

Choose a reason for hiding this comment

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

❤️

cc @ajs124

@ghost ghost merged commit 88e91e4 into NixOS:release-20.03 May 7, 2020
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fadenb fadenb fadenb approved these changes

@dasJ dasJ dasJ approved these changes

@Ma27 Ma27 Ma27 approved these changes

@pacien pacien Awaiting requested review from pacien

@worldofpeace worldofpeace Awaiting requested review from worldofpeace

@mguentner mguentner Awaiting requested review from mguentner

@WilliButz WilliButz Awaiting requested review from WilliButz

@nyanloutre nyanloutre Awaiting requested review from nyanloutre

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@blitz @fadenb @dasJ @Ma27