morgen: 3.5.9 -> 3.6.6

[Jegp]

Upgrades Morgen from 3.5.9 to 3.6.6

This is a follow-up of #361802

I tried making the PR as skimmable and easy-to-process as possible. I would love to hear how I can make the process easier on the maintainers. Thank you for the work you're doing here!

Things done

• Built on platform(s)
  • x86_64-linux
  • aarch64-linux
  • x86_64-darwin
  • aarch64-darwin
• For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
  • sandbox = relaxed
  • sandbox = true
• Tested, as applicable:
  • NixOS test(s) (look inside nixos/tests)
  • and/or package tests
  • or, for functions and "core" functionality, tests in lib/tests or pkgs/test
  • made sure NixOS tests are linked to the relevant packages
• 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/)
• 25.05 Release Notes (or backporting 24.11 and 25.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.

---

Add a 👍 reaction to pull requests you find important.

[felbinger]

I tried making the PR as skimmable and easy-to-process as possible.

You failed :)

You made the nix expression invalid.

Check the CI pipeline, after proposing the change, if it fails fix it!

If your confident, that your changes are ready to be merged contact the maintainers of the package (here: justanotherariel, see meta section of the file you edited...)

And again: Do not create a new pr for each version bump because a new patch has been released, simply update your pr.

[Jegp]

You failed :)

You made the nix expression invalid.

Thank you! I fixed and tested the changes locally. I'll keep an eye on the checks.

If your confident, that your changes are ready to be merged contact the maintainers of the package (here: justanotherariel, see meta section of the file you edited...)

Thanks, that's helpful because it gives me agency. If all the tests pass, I'll reach out to them.

[felbinger]

Looks good so far, ofborg will take very long time to finish, but your change looks good. If you tested it locally and it all still works (which is the case usually for simple patch updates) you can ping the maintainer to check it too.
Due to the fact that morgen hasn't been moved to the new structure (pkgs/by-name) yet, he (at least as a simple package maintainer) won't be able to merge it though (He may have merge rights for the whole repo, I didn't check). With the new structure package maintainers can merge their packages themself using a bot.

[Jegp]

Line re-introduced :-)

Looks good so far, ofborg will take very long time to finish, but your change looks good. If you tested it locally and it all still works (which is the case usually for simple patch updates) you can ping the maintainer to check it too. Due to the fact that morgen hasn't been moved to the new structure (pkgs/by-name) yet, he (at least as a simple package maintainer) won't be able to merge it though (He may have merge rights for the whole repo, I didn't check). With the new structure package maintainers can merge their packages themself using a bot.

Thanks for the information. I'm learning a lot! But if that's the case, shouldn't I just move the whole thing to pkgs/by-name/mo/morgen?

[justanotherariel]

Yea, I planned doing that at some point but didn't get to it. Sorry for the late reply - things have been very busy lately. Seems like something broke in the auto update script... that needs fixing too, then ryantm will take care of creating these PRs.
Please fix the failing pipeline (trailing whitespace), after which I can take a look. I'll then make my own PR moving morgen to the pkgs dir and fixing the update script - hopefully in the next couple of days.
Cheers

[justanotherariel]

And you can (and should) test your chages in nixpkgs by checking out the repository/branch, and then executing nix run .#morgen in that directory, if you have nix experimental commands enabled. There's probably a way to do it with nix-shell too. If you need an update quickly, you can include your own git patches when importing nixpkgs in your flake - but that may be a bit too advanced.

[Jegp]

No worries about a late reply. This is volunteer work. I must admit the process here is confusing to me, but I am just trying to be helpful.

I did test it locally. That's the version I'm running now.

I believe the trailing whitespace was fixed after I addressed the comment from @felbinger

[Jegp]

Branch has been updated with latest version of Morgen, 3.6.6

[felbinger]

Branch has been updated with latest version of Morgen, 3.6.6

Please rebase, merge commits aren't allowed!

# first drop the merge commit
git reset --hard HEAD~1

# then rebase your branch with official nixpkgs
git remote add upstream [email protected]:nixos/nixpkgs
git fetch --all
git rebase upstream/master

# and force push
git push -f

[felbinger]

nixpkgs-review result

Generated using nixpkgs-review-gha

Command: nixpkgs-review pr 367347

Logs: https://github.com/felbinger/nixpkgs-review-gha/actions/runs/13330340733

---

x86_64-linux

✅ 1 package built:

• morgen

[Jegp]

Branch has been updated with latest version of Morgen, 3.6.6

Please rebase, merge commits aren't allowed!

Turns out that rebasing was a pretty poor strategy. It added a ton of partial or unresolved commits. Which surprises me, because I would assume nixpkgs commit history shouldn't contain that kind of discrepancies. Do you know why that's the case?

Anyway, I reset to nixpkgs master and cherry-picked the commit for Morgen. So it should be up-to-date now.