Skip to content

Comments

haskellPackages: update stackage and hackage#231162

Merged
sternenseemann merged 21 commits intomasterfrom
haskell-updates
May 19, 2023
Merged

haskellPackages: update stackage and hackage#231162
sternenseemann merged 21 commits intomasterfrom
haskell-updates

Conversation

@sternenseemann
Copy link
Member

This Merge

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

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 master 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 #228965. Come to #haskell:nixos.org if you have any questions.

This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
This commit has been generated by maintainers/scripts/haskell/update-stackage.sh
This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh
@github-actions github-actions bot added the 6.topic: haskell General-purpose, statically typed, purely functional programming language label May 10, 2023
@sternenseemann sternenseemann changed the title Haskell updates haskellPackages: update stackage and hackage May 10, 2023
sternenseemann and others added 2 commits May 11, 2023 00:46
@ofborg ofborg bot added 8.has: package (new) This PR adds a new package 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. labels May 11, 2023
@vcunat
Copy link
Member

vcunat commented May 12, 2023

I'm sorry, due to current situation I cancelled the jobset. I expect it to get back in about two days, with much of work done over one or two days following that. I hope it's not an issue; otherwise we could try to find some other approach.

@vcunat
Copy link
Member

vcunat commented May 12, 2023

BTW, I expect that you're aware that no "breaking changes" are allowed in these couple of weeks.
(and this PR does not look like it contains breaking changes, at a quick glance)

@sternenseemann
Copy link
Member Author

I'm sorry, due to current situation I cancelled the jobset. I expect it to get back in about two days, with much of work done over one or two days following that. I hope it's not an issue; otherwise we could try to find some other approach.

No problem, there's no real urgency in this iteration and I lack time anyways. I've restarted the aborted jobs now since the queue was pretty empty (<2000 jobs).

@vcunat
Copy link
Member

vcunat commented May 13, 2023

Yes, probably. staging-next #231026 will probably merged this weekend, so it will be redone afterwards, but not a problem.

@vcunat
Copy link
Member

vcunat commented May 14, 2023

I cancelled the old builds in favor of the new ones. I assume that's what you'd want, but feel free to override that.

github-actions bot and others added 5 commits May 18, 2023 00:12
This commit has been generated by maintainers/scripts/haskell/mark-broken.sh based on
*evaluation [1795235](https://hydra.nixos.org/eval/1795235) of nixpkgs commit [7398920](https://github.com/NixOS/nixpkgs/commits/7398920e33f6aef596210f787c276ed6568a7e06) as of 2023-05-19 13:57 UTC*
from the haskell-updates jobset on hydra under https://hydra.nixos.org/jobset/nixpkgs/haskell-updates
If we want to push only one branch, we'll have to specify branch and
remote explicitly. Pushing to origin doesn't work for everyone, since
some of us have a origin remote that can't be pushed to. Using plain
`git push` has the problem that it'll try pushing all checked out
branchs which fails e.g. if some branches (staging, staging-next, …) are
behind their remote counterparts.

The solution is to require everyone to configure a per branch pushRemote
for haskell-updates which will then be used by merge-and-open-pr.sh.
@sternenseemann
Copy link
Member Author

When Hydra gets a long a bit more, I'd merge this PR before branch-off (likely later today), as there are no breaking changes present.

This will cause a full rebuild of haskellPackages on staging-next (which shouldn't break anything though), is that okay with you @vcunat? I'm guessing staging-next is not a very pressing issue at the moment, as it doesn't target branch-off?

@vcunat
Copy link
Member

vcunat commented May 19, 2023

Yes, the last staging-next iteration for 23.05 is already on master and new one hasn't started yet.

@ofborg ofborg bot added the 8.has: clean-up This PR removes packages or removes other cruft label May 19, 2023
@sternenseemann sternenseemann merged commit f5f6305 into master May 19, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: haskell General-purpose, statically typed, purely functional programming language 8.has: clean-up This PR removes packages or removes other cruft 8.has: package (new) This PR adds a new package 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.

2 participants