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.

Sign up for GitHub

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

Element 1.11.3 #186133

Merged
merged 3 commits into from
Aug 22, 2022
Merged

Element 1.11.3 #186133

merged 3 commits into from
Aug 22, 2022

Conversation

yu-re-ka
Copy link
Contributor

Description of changes
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 22.11 Release Notes (or backporting 22.05 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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@yu-re-ka yu-re-ka requested a review from sumnerevans August 11, 2022 17:36
@ofborg ofborg bot requested review from fadenb, mguentner, Ralith, dali99, Ma27 and Ekleog August 11, 2022 17:51
@yu-re-ka yu-re-ka mentioned this pull request Aug 11, 2022
Open
@Ma27
Copy link
Member

Ma27 commented Aug 18, 2022

Going to test this. Would also push the update to 1.11.3 to this branch then :)

Ma27
Ma27 requested changes Aug 18, 2022
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.

Getting hash mismatches:

Error: hash mismatch, expected dc26337b1f4cf451908c218c1b28baff7d5cf0625b81bd2a1b2af1e475b13ddd1a0b0878701d988cc6f65dff54ba8a20accae53bd713aa7079ac8e461d94dc50, got cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e

Same when updating to 1.11.3.

@yu-re-ka
Copy link
Contributor Author

Updated to 1.11.3 and removed the matrix-analytics-event lockfile change. Maybe the hash mismatch is gone now? Otherwise we need to debug.

@ofborg ofborg bot requested review from sumnerevans and Ma27 August 18, 2022 12:06
@yu-re-ka
element-web: remove the matrix-analytics-events hack
2e4158a 
It doesn't seem to be necessary anymore, element-desktop builds fine
without any changes to the lockfile.
@Ma27 Ma27 changed the title Element 1.11.2 Element 1.11.3 Aug 22, 2022
Ma27
Ma27 approved these changes Aug 22, 2022
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.

Successfully deployed 👍

@Ma27 Ma27 merged commit d17d134 into NixOS:master Aug 22, 2022
@Ma27
Copy link
Member

Ma27 commented Aug 22, 2022

@yu-re-ka thanks!

Would you mind preparing a backport PR for 22.05? Otherwise I'll try to it in the next days :)

Ma27 added a commit to Ma27/nixpkgs that referenced this pull request Sep 1, 2022
@Ma27
element-{web,desktop}: 1.11.0 -> 1.11.4, fix CVE-2022-36059 & CVE-202…
5e01e0a 
…2-36060

Backport of NixOS#189150, NixOS#186133.
@Ma27 Ma27 mentioned this pull request Sep 1, 2022
Merged
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ma27 Ma27 Ma27 approved these changes

@fadenb fadenb Awaiting requested review from fadenb

@mguentner mguentner Awaiting requested review from mguentner

@Ralith Ralith Awaiting requested review from Ralith

@dali99 dali99 Awaiting requested review from dali99

@Ekleog Ekleog Awaiting requested review from Ekleog

@sumnerevans sumnerevans Awaiting requested review from sumnerevans

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

Successfully merging this pull request may close these issues.
3 participants
@yu-re-ka @Ma27 @sumnerevans