[staging] merge from staging-next

[pbsds]

fixes https://github.com/NixOS/nixpkgs/actions/runs/12605651116
caused by #368177

manual fixes: https://gist.github.com/pbsds/d417f0759e75ec34b81f389efa564fd0
of interest is pkgs/development/python-modules/music-assistant-models/default.nix which was migrated to tag incorrectly

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.

[nix-owners]

The PR's base branch is set to staging, but 144 commits from the master branch are included. Make sure you know the right base branch for your changes, then:

• If the changes should go to the master branch, change the base branch to master
• If the changes should go to the staging branch, rebase your PR onto the merge base with the staging branch:

  # git rebase --onto $(git merge-base upstream/staging HEAD) $(git merge-base upstream/master HEAD)
  git rebase --onto a2891e6416a43fd4288c2697dc0012b768d08014 b16a62cd6010999a77f2e9ee290397278030f41f
  git push --force-with-lease

[emilazy]

(We tend to push these directly because GitHub is… like this, and our CI isn’t great at handling it either. Though I do wish we had a way of doing proper review.)

[pbsds]

I thought staging was write-protected?

[nix-owners]

The PR's base branch is set to staging, but 144 commits from the master branch are included. Make sure you know the right base branch for your changes, then:

• If the changes should go to the master branch, change the base branch to master
• If the changes should go to the staging branch, rebase your PR onto the merge base with the staging branch:

  # git rebase --onto $(git merge-base upstream/staging HEAD) $(git merge-base upstream/master HEAD)
  git rebase --onto a2891e6416a43fd4288c2697dc0012b768d08014 b16a62cd6010999a77f2e9ee290397278030f41f
  git push --force-with-lease

[emilazy]

For force pushes I expect so, but people regularly make direct commits to staging-next and I imagine staging is probably the same. Certainly people do manual merge commits to them constantly, since the automation fails a lot. (I think actually you can push merge commits to master manually too, and some people do for PR merges.)

[emilazy]

(Anyway the Gist looks good to me, and I even maintain some of those packages. I’d make this a proper approval but clicking the tab I need to be on for that makes my browser die.)

[Atemu]

My browser is too powerful to be stopped by a mere 3000 changes

[Atemu]

cc @mweinelt about the fix for the botched music-assistant-models migration. Perhaps double check that it's correct now.

[pbsds]

huh, i was working out a git worktree-based approach to do the merge into an upstream remote directly. This is what i had gotten to when i saw you merge this:

git fetch upstream staging
git fetch upstream staging-next
git worktree add ../fix/merge-conflict upstream/staging
cd ../fix/merge-conflict
git checkout -b fix-merge-conflict --track upstream/staging
git merge upstream/staging-next
# do fixes
git commit
git push

What do you commonly do @emilazy?

[emilazy]

I think people usually just do the very basic git switch staging && git merge staging-next. I do jj new staging staging-next (and then jj bookmark set staging && jj git push --remote origin when I’m done resolving conflicts) because I’m Nixpkgs’ resident Jujutsu shill :)

[mweinelt]

cc @mweinelt about the fix for the botched music-assistant-models migration. Perhaps double check that it's correct now.

It's wrong.