Skip to content

haskellPackages: update stackage and hackage#182400

Merged
sternenseemann merged 21 commits intomasterfrom
haskell-updates
Jul 26, 2022
Merged

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

Conversation

@maralorn
Copy link
Copy Markdown
Member

@maralorn maralorn commented Jul 21, 2022

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

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

maralorn added 3 commits July 22, 2022 01:00
@maralorn
haskellPackages: stackage LTS 19.15 -> LTS 19.16
642279a 
This commit has been generated by maintainers/scripts/haskell/update-stackage.sh
@maralorn
all-cabal-hashes: 2022-07-18T21:55:34Z -> 2022-07-21T21:13:45Z
8aeb1d8 
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
@maralorn
haskellPackages: regenerate package set based on current config
28e9634 
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 Jul 21, 2022
@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: 501-1000 This PR causes many rebuilds on Darwin and should normally 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: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches. labels Jul 24, 2022
github-actions bot and others added 7 commits July 25, 2022 00:14
@github-actions
Merge master into haskell-updates
2fd68ed
@maralorn
haskellPackages.hls-ormolu-plugin: Disable flaky test
759fed3
@sternenseemann
haskellPackages.terminfo: not a core pkg if cross compiling
f39aee2 
GHC's cross build flavours disable the terminfo package, so it will
never be included if we are cross-compiling – setting it to null thus
breaks all builds depending on the package.

To fix this problem, we use the versioned attribute generated by
hackage2nix, just like we do for xhtml.

Closes #182785.
@github-actions
Merge master into haskell-updates
f637ad4
@maralorn
haskellPackages.regex-tdfa: Disable disfunctional tests for older ghcs
0620844
@maralorn
Merge pull request #182873 from sternenseemann/terminfo-cross
dd6432a 
haskellPackages.terminfo: not a core pkg if cross compiling
@sternenseemann
haskellPackages.Spock-core: build with correct reroute version
57055b6 
Spock-core 0.14.0.1 now only supports reroute >= 0.7 because it exports
the new AltVar type (in an [PVP violation]).

We can luckily accomodate Spock-core, since all other [reverse deps] of
reroute are marked broken in nixpkgs at the moment.

[PVP violation]: agrafix/Spock#180 (comment)
[reverse deps]: https://packdeps.haskellers.com/reverse/reroute
@sternenseemann
Copy link
Copy Markdown
Member

sternenseemann commented Jul 26, 2022

@robx hasql-dynamic-statements broke again, is this a pure constraints issue? Do we just need to downgrade hasql-dynamic-statements?

@sternenseemann
haskellPackages.{superbuffer,list-t,stm-containers}: reenable tests
ae78f71 
HTF has been fixed a while ago actually, so these test suites can be
built and executed again. For stm-containers, a bounds issue persists,
though.
@robx
Copy link
Copy Markdown
Contributor

robx commented Jul 26, 2022 •
edited
Loading

@robx hasql-dynamic-statements broke again, is this a pure constraints issue? Do we just need to downgrade hasql-dynamic-statements?

It looks like we just got new hasql releases. hasql-1.6 and hasql-dynamic-statements-0.3.1.2 were uploaded to hackage on 2022-07-20, and the latter requires the former. From the error it looks like nixpkgs kept the old hasql version while pulling in the new hasql-dynamic-statements?

EDIT: Ah I suppose the problem is that hasql is in stackage LTS, which holds it back at 1.5, while hasql-dynamic-statements isn't in stackage LTS (probably due to the same issues that caused it to be broken in nixpkgs before). Not sure what's the best way forward here, I guess we could just wait for hasql-dynamic-statements to make it into stackage LTS again?

@sternenseemann
haskellPackages.hasql-dynamic-statements: downgrade to 0.3.1.1
ff7abea 
We still ship hasql 1.5 due to stackage which is not compatible with
0.3.1.2.
@sternenseemann
Copy link
Copy Markdown
Member

sternenseemann commented Jul 26, 2022

@robx Thanks for your diagnosis, I've addressed the problem in ff7abea – we can just downgrade hasql-dynamic-statements until we switch Stackage version (hasql 1.6 will never make it into LTS 19 sadly).

@sternenseemann
haskellPackages: mark builds failing on hydra as broken
ef9826a 
This commit has been generated by maintainers/scripts/haskell/mark-broken.sh
@sternenseemann
Merge remote-tracking branch 'origin/master' into haskell-updates
2764f11
@sternenseemann
haskellPackages.conduit-aeson: unbreak
f28e830 
* Work around broken Setup.hs which fails to parse

* Disable doctest-parallel suite

* Group doctest-parallel overrides and link the upstream issue for the
  failure; basically it does not work unless you are using cabal v2
  commands.
@sternenseemann sternenseemann merged commit 656cd22 into master Jul 26, 2022
@sternenseemann sternenseemann mentioned this pull request Jul 26, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@cdepillabout cdepillabout Awaiting requested review from cdepillabout

@sternenseemann sternenseemann Awaiting requested review from sternenseemann

Assignees

No one assigned

Labels

6.topic: haskell General-purpose, statically typed, purely functional programming language 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 501-1000 This PR causes many rebuilds on Darwin and should normally 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: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@maralorn @sternenseemann @robx @lf-