Skip to content

Comments

haskellPackages: Stackage 23.19 -> 23.21#404362

Merged
sternenseemann merged 54 commits intostagingfrom
haskell-updates
May 16, 2025
Merged

haskellPackages: Stackage 23.19 -> 23.21#404362
sternenseemann merged 54 commits intostagingfrom
haskell-updates

Conversation

@sternenseemann
Copy link
Member

This Merge

This PR is the regular merge of the haskell-updates branch into staging.

This branch is being continually built and tested by hydra at https://hydra.nixos.org/jobset/nixpkgs/haskell-updates. You may be able to find an up-to-date Hydra build report at cdepillabout/nix-haskell-updates-status.

We roughly aim to merge these haskell-updates PRs at least once every two weeks. See the @NixOS/haskell team calendar for who is currently in charge of this branch.

haskellPackages Workflow Summary

Our workflow is currently described in pkgs/development/haskell-modules/HACKING.md.

The short version is this:

  • We regularly update the Stackage and Hackage pins on haskell-updates (normally at the beginning of a merge window).
  • The community fixes builds of Haskell packages on that branch.
  • We aim at at least one merge of haskell-updates into staging every two weeks.
  • We only do the merge if the mergeable job is succeeding on hydra.
  • If a maintained package is still broken at the time of merge, we will only merge if the maintainer has been pinged 7 days in advance. (If you care about a Haskell package, become a maintainer!)

More information about Haskell packages in nixpkgs can be found in the nixpkgs manual.


This is the follow-up to #401105. Come to #haskell:nixos.org if you have any questions.

@github-actions github-actions bot added 6.topic: haskell General-purpose, statically typed, purely functional programming language 4.workflow: package set update Development branch for package set updates (haskell/python) labels May 5, 2025
@sternenseemann sternenseemann changed the title Haskell updates haskellPackages: Stackage 23.19 -> 23.21 May 5, 2025
@sternenseemann sternenseemann marked this pull request as draft May 5, 2025 12:41
@sternenseemann
Copy link
Member Author

Waiting on symtegration/symtegration#137 to unmark symtegration as broken.

This commit has been generated by maintainers/scripts/haskell/mark-broken.sh based on
*evaluation [1815231](https://hydra.nixos.org/eval/1815231) of nixpkgs commit [cf12797](https://github.com/NixOS/nixpkgs/commits/cf127972bbf111593f302e81ef3a9778da162fc4) as of 2025-05-14 11:51 UTC*
from the haskell-updates jobset on hydra under https://hydra.nixos.org/jobset/nixpkgs/haskell-updates
@sternenseemann
Copy link
Member Author

I've tested all remaining queued builds on Hydra which compile successfully.

@wolfgangwalther a6fc1b0 looks to alter the sort order in some files, is that expected?

@sternenseemann sternenseemann marked this pull request as ready for review May 14, 2025 12:17
@wolfgangwalther
Copy link
Contributor

@wolfgangwalther a6fc1b0 looks to alter the sort order in some files, is that expected?

Hm. Maybe we still forgot to adjust one of the scripts earlier? Not sure. Can't look into it right now, but tonight.

@wolfgangwalther
Copy link
Contributor

a6fc1b0 looks to alter the sort order in some files, is that expected?

Looked into it: Yes, that was expected. In #401492 we fixed the mark-broken.sh script, but didn't run the script, yet. This was the first run after, so the sorting kicked in.

@wolfgangwalther
Copy link
Contributor

wolfgangwalther commented May 14, 2025

Currently postgres-websockets is broken at run-time, will open a PR to fix it soon.

Edit: #407098

@nix-owners nix-owners bot requested review from maralorn and wolfgangwalther May 16, 2025 08:44
@github-actions github-actions bot added 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. labels May 16, 2025
@sternenseemann sternenseemann merged commit 14736b6 into staging May 16, 2025
24 checks passed
@sternenseemann
Copy link
Member Author

@leona-ya Any specific reason you merged staging into haskell-updates? We intentionally don't do that usually since it means that haskell-updates becomes a second staging-next as we loose all cache sharing with master. For this merge it did not matter since we had already finished testing it.

For the next one, though, we effectively need to wait on the next staging-next iteration (which may be a while with branch-off, I guess?) in order to not overly burden Hydra. Unfortunately reverting merges also doesn't really work for our branch (afaik at least).

@leona-ya
Copy link
Member

wow. i wasn't avake enough this morning. I'm sorry for that. I did this because https://github.com/NixOS/nixpkgs/actions/runs/15057762545/job/42327220097 said master staging -> haskell-updates. I misread this as just staging -> haskell-updates and didn't think enough. I'm very sorry for this.

@sternenseemann
Copy link
Member Author

I also won't complain about getting a break :) The step name sacrificed clarity for brevity, I fear.

@wolfgangwalther
Copy link
Contributor

The step name sacrificed clarity for brevity, I fear.

I wondered about that, too. Quick fix could be to just flip the two branches, so that we get staging master -> haskell-updates? This should not matter for the call to git merge-base, right? In that case, reading too quickly would give you a merge of master into haskell-updates, which shouldn't be a problem.

If that's not enough, we can also just add another argument to the matrix and the reusable-workflow, to give a better job title.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4.workflow: package set update Development branch for package set updates (haskell/python) 6.topic: haskell General-purpose, statically typed, purely functional programming language 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants