workflows/periodic-merge: merge merge-base into haskell-updates

[sternenseemann]

Since haskell-updates is based on master, but merges into staging, we need to merge in a merge-base of staging and master. See #361143.

I'm a bit worried that the information GitHub uses for displaying Pull-Requests becomes stale and this will “add” commits to the PR compared to the base anyways. We'll find out, I suppose.

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.

[vcunat]

I don't share the worry. This point is the same as in the current staging-* pull requests, isn't it?

[sternenseemann]

@vcunat It should be fine, I agree. I had some problems with the current PR, but maybe that was mostly cases of the base reference not updating when staging was pushed when haskell-updates was already ahead which should never happen with this.

[sternenseemann]

I've tested this on my fork (by removing the if).

• Successful run: https://github.com/sternenseemann/nixpkgs/actions/runs/12480537165/job/34831522582
• Created merge commit: sternenseemann@a5e5cf0

Unfortunately, the workflow is pretty slow since it has to do a full fetch of nixpkgs. I don't think we can get the merge base via the GitHub API, unfortunately.

[vcunat]

We had lots of merge conflicts in this staging-next iteration. And even without them I'm not sure about the order of processing in these automatic merges.

[maralorn]

LGTM, any reasons not to merge this rn?

[sternenseemann]

Successful run with the latest version of the PR: https://github.com/sternenseemann/nixpkgs/actions/runs/12505278130/job/34888392237