Skip to content

[Backport release-23.05] tutanota-desktop: 3.112.6 -> 3.118.7#255888

Merged
delroth merged 1 commit intoNixOS:release-23.05from
WolfangAukang:backport-255335-to-release-23.05
Sep 18, 2023
Merged

[Backport release-23.05] tutanota-desktop: 3.112.6 -> 3.118.7#255888
delroth merged 1 commit intoNixOS:release-23.05from
WolfangAukang:backport-255335-to-release-23.05

Conversation

@WolfangAukang
Copy link
Contributor

@WolfangAukang WolfangAukang commented Sep 18, 2023

Description of changes

Backport of #255335
Related to #254798
Changelog: https://github.com/tutao/tutanota/releases/tag/tutanota-desktop-release-3.118.7

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/)
  • 23.11 Release Notes (or backporting 23.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
  • Fits CONTRIBUTING.md.

@WolfangAukang WolfangAukang added the 1.severity: security Issues which raise a security issue, or PRs that fix one label Sep 18, 2023
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 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. labels Sep 18, 2023
@delroth
Copy link
Contributor

delroth commented Sep 18, 2023

The commit message here is wrong, since 23.05 was still on 3.112.6. Which means it's also not really a cherry-pick anymore at this point :)

Could you fix:

  • The commit title, to use the right version.
  • The commit message, to remove the fact that it's a cherry-pick (maybe do still reference the master commit?)
  • The PR title just for future reference's sake (also to use the right version)

Thanks!

@delroth delroth self-assigned this Sep 18, 2023
@WolfangAukang WolfangAukang changed the title [Backport release-23.05] tutanota-desktop: 3.115.2 -> 3.118.7 [Backport release-23.05] tutanota-desktop: 3.112.6 -> 3.118.7 Sep 18, 2023
@WolfangAukang WolfangAukang force-pushed the backport-255335-to-release-23.05 branch from cc5fced to 73bf35d Compare September 18, 2023 17:49
@WolfangAukang
Copy link
Contributor Author

@delroth Ready, can you please check the changes?

@delroth
Copy link
Contributor

delroth commented Sep 18, 2023

@ofborg build tutanota-desktop

@delroth delroth merged commit 8ace93d into NixOS:release-23.05 Sep 18, 2023
@WolfangAukang WolfangAukang deleted the backport-255335-to-release-23.05 branch November 10, 2023 14:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

1.severity: security Issues which raise a security issue, or PRs that fix one 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 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. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants