Skip to content

haskellPackages: update stackage and hackage#185755

Merged
sternenseemann merged 30 commits intomasterfrom
haskell-updates
Aug 19, 2022
Merged

haskellPackages: update stackage and hackage#185755
sternenseemann merged 30 commits intomasterfrom
haskell-updates

Conversation

@cdepillabout
Copy link
Member

@cdepillabout cdepillabout commented Aug 9, 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 #185574. Come to #haskell:nixos.org if you have any questions.

@cdepillabout
haskellPackages: stackage LTS 19.17 -> LTS 19.18
b933add 
This commit has been generated by maintainers/scripts/haskell/update-stackage.sh
@cdepillabout
all-cabal-hashes: 2022-08-07T14:05:30Z -> 2022-08-09T06:14:32Z
898ef5e 
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
@cdepillabout
haskellPackages: regenerate package set based on current config
1b711bc 
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 Aug 9, 2022
@cdepillabout
Copy link
Member Author

cdepillabout commented Aug 10, 2022 •
edited
Loading

@Kiwi It looks like brick has updated to version 1.0, which causes matterhorn to break again. In 323f8b5 I removed the matterhorn and brick overrides in order to start trying to get rid of eval errors.

If you wanted to fix this, I suggest first reverting my commit here and building on that revert. Unless there are patches floating around for matterhorn + brick-1.0, it might just be easiest to generate brick-0.70 and brick-skylight in extra-packages in pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml, and then use them with matterhorn. That will keep us from having to update these overrides everytime a new version of brick is released.

@ofborg ofborg bot added 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: 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 Aug 10, 2022
@sternenseemann
Copy link
Member

sternenseemann commented Aug 13, 2022

@Kiwi It looks like brick has updated to version 1.0, which causes matterhorn to break again. In 323f8b5 I removed the matterhorn and brick overrides in order to start trying to get rid of eval errors.

If you wanted to fix this, I suggest first reverting my commit here and building on that revert. Unless there are patches floating around for matterhorn + brick-1.0, it might just be easiest to generate brick-0.70 and brick-skylight in extra-packages in pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml, and then use them with matterhorn. That will keep us from having to update these overrides everytime a new version of brick is released.

Fixed the problem in d8bddf3.

maralorn and others added 2 commits August 13, 2022 20:55
@maralorn @sternenseemann
haskell.compilers.ghc941: 9.4.0.20220721 -> 9.4.1
44c848b 
Co-authored-by: sternenseemann <sternenseemann@systemli.org>
@sternenseemann
haskell.compiler.ghc941: bootstrap using (binary) GHC 8.10.7
d0706da 
This shortens the bootstrap chain for 9.4.1 and should be kinder on
rebuilds. It requires some messing around in the configure file, since
it is not officially supported by upstream (but known to work). For now
it saves us the hassle of adding another bindist to nixpkgs. When we
support hadrian, we'll be able to use the already packaged 9.2.2
bindist.
@ofborg ofborg bot requested review from expipiplus1 and guibou August 13, 2022 19:04
@ofborg ofborg bot added the 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. label Aug 13, 2022
github-actions bot and others added 5 commits August 14, 2022 00:14
@github-actions
Merge master into haskell-updates
9ba6250
@sternenseemann
haskell.compiler.ghc941: bootstrap using GHC 9.0.2 on arm
ddada35 
text.cabal has the following snippet mandating this:

    -- GHC 8.10 has linking issues (probably TH-related) on ARM.
    if (arch(aarch64) || arch(arm)) && impl(ghc == 8.10.*)
      build-depends: base < 0

Since we're now testing 9.0.2 for bootstrapping on Hydra, we can also
use the proper GHC version for powerpc64le.
@github-actions
Merge master into haskell-updates
071fb34
@cdepillabout
haskellPackages: mark builds failing on hydra as broken
1f54656 
This commit has been generated by maintainers/scripts/haskell/mark-broken.sh
@cdepillabout
ihaskell: don't build on hydra
7fdb280 
ihaskell has an indirect dependency on the Python package mistune, which
is currently marked as insecure.
@sternenseemann
Copy link
Member

sternenseemann commented Aug 15, 2022

@ofborg eval

@cdepillabout
Copy link
Member Author

cdepillabout commented Aug 16, 2022 •
edited by sternenseemann
Loading

Ugh, NixOS XMonad tests appear to be now failing @NeQuissimus @ivanbrennan @peti:

https://github.com/cdepillabout/nix-haskell-updates-status/tree/815e45c0677d665f25af1799dbd412fd3f781a35

Edit (sternenseemann): Was a flaky failure: https://hydra.nixos.org/eval/1776359?filter=nixosTests.xmonad.

@cdepillabout
Copy link
Member Author

cdepillabout commented Aug 18, 2022 •
edited
Loading

@fpletz @kragniz It looks like there is an error on master when building hedgewars. It doesn't appear haskell-related: https://hydra.nixos.org/build/187770554/nixlog/4.

I marked it broken in 60f7d27 and f303875.

@ofborg ofborg bot requested review from fpletz and kragniz August 18, 2022 04:32
smatting and others added 5 commits August 18, 2022 17:02
@smatting @flokli
haskell-language-server: fix with ghc-lib >= 9.0 and ghc <= 8.10.7
dc59428 
This cherry-picks the relevant changes from
haskell/haskell-language-server#2854 into the
8.10.x version of hls-hlint-plugin, as suggested in
#168064 (comment)

Co-Authored-By: Florian Klink <flokli@flokli.de>
@cdepillabout
Merge pull request #187284 from wireapp/hls-hlint-plugin-workaround
f5cc833 
haskell-language-server: fix with ghc-lib >= 9.0 and ghc <= 8.10.7
@github-actions
Merge master into haskell-updates
1d12f3c
@cdepillabout
hedgewars: don't build on hydra
f303875
@cdepillabout
haskellPackages: mark builds failing on hydra as broken
97c5787 
This commit has been generated by maintainers/scripts/haskell/mark-broken.sh
@sternenseemann sternenseemann merged commit bd80584 into master Aug 19, 2022
@cdepillabout cdepillabout mentioned this pull request Aug 20, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@sternenseemann sternenseemann Awaiting requested review from sternenseemann

@maralorn maralorn Awaiting requested review from maralorn

@expipiplus1 expipiplus1 Awaiting requested review from expipiplus1

@guibou guibou Awaiting requested review from guibou

@fpletz fpletz Awaiting requested review from fpletz

@kragniz kragniz Awaiting requested review from kragniz

Assignees

No one assigned

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-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. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@cdepillabout @sternenseemann @phijor @maralorn @smatting