Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

haskellPackages: update stackage and hackage #138596

Merged
merged 59 commits into from
Sep 29, 2021
Merged

Conversation

cdepillabout
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.

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!)

This is the follow-up to #138316. 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/regenerate-hackage-packages.sh
cdepillabout and others added 2 commits September 20, 2021 11:12
haskell: update maintainer script for merging and opening PR to also upload package versions to Hackage
Just built with NIXPKGS_ALLOW_BROKEN, and it built fine
@ofborg ofborg bot added the ofborg-internal-error Ofborg encountered an error label Sep 20, 2021
@cole-h cole-h removed the ofborg-internal-error Ofborg encountered an error label Sep 20, 2021
@cole-h
Copy link
Member

cole-h commented Sep 20, 2021

@ofborg eval

@ofborg ofborg bot requested a review from guibou September 22, 2021 17:24
@ofborg ofborg bot added the 11.by: package-maintainer This PR was created by the maintainer of the package it changes label Sep 22, 2021
@sternenseemann
Copy link
Member

sternenseemann commented Sep 26, 2021

Seems like all serious build failures and regressions have been fixed. I want to focus on finishing this iteration up now.

You can check on the state of the jobset using this view: https://hydra.nixos.org/eval/1708385?compare=1706329. It compares to the evaluation of the last iteration just before merging, so excludes the noise the GHC-related rebuilds and staging-next caused.

If you see anything concerning, feel free to point it out and/or fix it. I'll try to do remaining cleanups and merging tomorrow.

Edit: new evaluation

@vcunat
Copy link
Member

vcunat commented Sep 27, 2021

There were cpio fixes in the meantime (to unblock channel), so you'll need to suffer yet another rebuild.

@sternenseemann
Copy link
Member

sternenseemann commented Sep 27, 2021

Right, that one is already running. Let's hope we don't run out of build time halfway through.

haskellPackages.hasura: 2.0.7 -> 2.0.9
@ofborg ofborg bot requested review from Lassulus and kalbasit September 27, 2021 23:53
github-actions bot and others added 14 commits September 28, 2021 00:06
websnap actually depends on the haskell webkit package (which is
broken), so this override introducing a dependency on a removed package
is actually incorrect and can be removed.
webkitgtk24x-gtk2 has been removed, but webkit doesn't compile anymore
these days, so we can save us maintaining this override. The “correct”
override would be webkitgtk (webkit is an alias form webkitgtk atm,
maybe we should introduce a libNixName thing in cabal2nix for this?)
if webkit compiled with modern dependencies…
Stops webkitgtk24x-gtk* bindings from being emitted.
hashable 1.3.0 is broken on GHC 9.2.1. This enables building
unordered-containers.
…report

haskell: add link to Hydra build report for haskell-updates branch to PR message
haskell.packages.ghc921: use hashable_1_3_3_0
This commit has been generated by maintainers/scripts/haskell/mark-broken.sh
sternenseemann and others added 2 commits September 29, 2021 17:46
splitmix already has a commit that fixes the version bounds for GHC
9.2.1 but has not had a release since then.
@sternenseemann sternenseemann merged commit 53432e9 into master Sep 29, 2021
nomeata added a commit to nomeata/ic-hs that referenced this pull request Sep 30, 2021
with NixOS/nixpkgs#138596 merged into `master`
we can track that again, which is cleaner. This is a follow-up to
dfinity#37
marcin-dziadus pushed a commit to dfinity/ic-hs that referenced this pull request Sep 30, 2021
with NixOS/nixpkgs#138596 merged into `master`
we can track that again, which is cleaner. This is a follow-up to
#37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.