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 #262645

Merged
merged 75 commits into from
Nov 10, 2023
Merged

Conversation

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

ncfavier and others added 4 commits October 15, 2023 15:00
This commit has been generated by maintainers/scripts/haskell/update-stackage.sh
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
maralorn and others added 7 commits October 22, 2023 02:57
haskell.compiler.ghc*Binary: fix globbing
The original change missed that we used to erroneously provide LLVM on
aarch64-linux, but not on aarch64-darwin which was later fixed
in #246045. Since the change was tested on aarch64-linux prior to this,
tls ended up being broken on both aarch64-linux and aarch64-darwin.

This commit resolves the situation by introducing a helper function to
achieve the effect of passing -fllvm while ensuring LLVM is provided.

Resolves #260013.
@ncfavier ncfavier mentioned this pull request Oct 22, 2023
@vcunat
Copy link
Member

vcunat commented Oct 23, 2023

I assume it's OK for me to cancel non-current builds in the corresponding Hydra jobset, e.g. now it was several thousand.

@ofborg ofborg bot added 8.has: clean-up 8.has: package (new) This PR adds a new package labels Oct 24, 2023
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-linux: 501+ labels Oct 24, 2023
sternenseemann and others added 7 commits November 5, 2023 16:48
This is verified using testers.hasPkgConfigModules which leads to a
slight refactor of the expression.
This is verified using testers.hasPkgConfigModules which leads to a
slight refactor of the expression.
This is verified using testers.hasPkgConfigModules which leads to a
slight refactor of the expression.
This is verified using testers.hasPkgConfigModules which leads to a
slight refactor of the expression.
@maralorn
Copy link
Member Author

maralorn commented Nov 9, 2023

I think the monad-bayes situation is the only thing which needs fixing. This PR has been open quite a while.

I don’t think waiting for the upstream fix to be merged and then bumping hackage is a good option, because the branch is otherwise ready to merge. Let’s either apply the patch or disable the checks now and rip them out in the next iteration.

@turion
Copy link
Contributor

turion commented Nov 9, 2023

Fine with me if a link to the upstream fix is mentioned: tweag/monad-bayes#326

@ncfavier
Copy link
Member

ncfavier commented Nov 9, 2023

Applying the monad-bayes patch isn't enough because the files are still missing from the Hackage tarball, so I've disabled the tests.

@cdepillabout
Copy link
Member

cdepillabout commented Nov 10, 2023

@thielema

I have released a work-around in the Haskell bindings to Hackage. The tests of coinor-clp should work, again.

I didn't update our haskellPackages.coinor-clp version in this PR (and it doesn't look like there was a commit fixing it), but it is now compiling correctly.

My guess is that the underlying COIN-OR/Clp C++ library was updated fixing the problem?

(Gotta love when QuickCheck in Haskell is able to find problems in the underlying C/C++ libraries 😄 )

This commit has been generated by maintainers/scripts/haskell/mark-broken.sh based on
*evaluation [1801560](https://hydra.nixos.org/eval/1801560) of nixpkgs commit [f10a9c9](https://github.com/NixOS/nixpkgs/commits/f10a9c90947faa4a399e6c98c9fa0ee5c4ae51c5) as of 2023-11-10 04:13 UTC*
from the haskell-updates jobset on hydra under https://hydra.nixos.org/jobset/nixpkgs/haskell-updates
taskell depends on an old version of brick that no longer compiles
@cdepillabout cdepillabout merged commit b756c48 into master Nov 10, 2023
4 checks passed
vcunat referenced this pull request Nov 11, 2023
…+abi issue

...into staging-next
We have lots of binaries in cache.nixos.org for this combination already.
@thielema
Copy link
Contributor

thielema commented Nov 14, 2023 via email

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: agda "A dependently typed programming language / interactive theorem prover" 6.topic: haskell 8.has: clean-up 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+ 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.