1. DO NOT target nixos-* branches: they are automatically populated by Hydra. Target master (for new content), release-YY.MM (for backports to stable) or staging/staging-YY.MM (the counterparts of the former two, specifically for mass-rebuild changes).

   2. PR titles adhere to the same conventions as commit titles. Your should be named tutanota-desktop: 277.250414.1 -> 301.250806.1, adopt by s0ssh.

   3. Speaking of adopting while updating: this PR should consist of 3 commits -- version bump > new maintainer entry > add to meta.maintainers (the exact order doesn't matter much, just make sure that the maintainers: add s0ssh should precede tutanota-desktop: add s0ssh to maintainers)

Understood, thank you for bearing with me, since it's my first time contributing to nixpkgs. I've gone ahead and rebased the parent branch to release-25.05, changed the PR title, and split my changes into the commits as you described.

Let me know if there's anything else I should do for this PR (or look out for in the future). Thanks! =)

The tutanote .desktop file doesn't work, it doesn't launch for me for some reason, have to launch it via terminal to actually get to the app.

Also you should be targeting the master branch, not the nixos release branch unless your doing a backport, which your not since you updating to an even later version on nixos-unstable and also adding yourself as a maintainer. So you should rebase to master and then add the backport: release 25.05 label.

add the backport: release 25.05 label

they can't, they don't have NixOS org membership. only manual backport is the way: https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#manually-backporting-changes

add the backport: release 25.05 label

they can't, they don't have NixOS org membership. only manual backport is the way: https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#manually-backporting-changes

I can add the label for them :3

The tutanote .desktop file doesn't work, it doesn't launch for me for some reason, have to launch it via terminal to actually get to the app.

This has been an issue previously, and was not introduced by my contribution. Also forgive the newbie question, but if my goal is to backport this more recent package version onto the stable 25.05 channel, how would I go about doing that properly?

The tutanote .desktop file doesn't work, it doesn't launch for me for some reason, have to launch it via terminal to actually get to the app.

This has been an issue previously, and was not introduced by my contribution. Also forgive the newbie question, but if my goal is to backport this more recent package version onto the stable 25.05 channel, how would I go about doing that properly?

rebase to master
I add the flag to backport this to stable
PR gets merged
New PR gets automatically created for a backport to 25.05

The PR's base branch is set to release-25.05, but 40185 commits from the haskell-updates branch are included. Make sure you know the right base branch for your changes, then:

• If the changes should go to the haskell-updates branch, change the base branch to haskell-updates
• If the changes should go to the release-25.05 branch, rebase your PR onto the merge base with the release-25.05 branch:

  # git rebase --onto $(git merge-base upstream/release-25.05 HEAD) $(git merge-base upstream/haskell-updates HEAD)
  git rebase --onto b965e4c283060415956ccd39eee4ca34a6a56cf8 65742b9d5638798fdc59060801e2d8446dbadce0
  git push --force-with-lease

gotta change to branch on github too to master from release-25.05

gotta change to branch on github too to master from release-25.05

When I try to do this, I'm met with an error:

There are no new commits between base branch 'master' and head branch 'update-tutanota-desktop'

Clearly I'm doing something wrong, could you help me figure out what that might be?

@nyabinary Sorry for the ping, just bumping this up!

gotta change to branch on github too to master from release-25.05

When I try to do this, I'm met with an error:

There are no new commits between base branch 'master' and head branch 'update-tutanota-desktop'

Clearly I'm doing something wrong, could you help me figure out what that might be?

Did you change the branch via Github Web UI?

e,g.

gotta change to branch on github too to master from release-25.05

When I try to do this, I'm met with an error:

There are no new commits between base branch 'master' and head branch 'update-tutanota-desktop'

Clearly I'm doing something wrong, could you help me figure out what that might be?

Did you change the branch via Github Web UI? e,g.

Yes, I did do this. That's when I'm seeing the aforementioned error message.

gotta change to branch on github too to master from release-25.05

When I try to do this, I'm met with an error:

There are no new commits between base branch 'master' and head branch 'update-tutanota-desktop'

Clearly I'm doing something wrong, could you help me figure out what that might be?

Did you change the branch via Github Web UI? e,g.

Yes, I did do this. That's when I'm seeing the aforementioned error message.

hmm might need to close this PR and then open a new one then

Will create new PR. Thank you.