Merged
Conversation
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
Both taffybar and ap-normalize where bumped to a version newer than the last hackage pin which we have caught up with now, so we can clean up those.
The commits we revert still do the trick, but we need to revert one additional commit now which increases the lower version bound for relude.
haskell-ci just builds (again?) without any necessary changes
Inherit nvfetcher and uusi jobs from top-level for extra visibility.
Seems like the monoid-extras situation wasn't as bad as I thought and some new releases in the meantime make every diagrams package we had working previously work again. * haskellPackages.monoid-extras: 0.5.1 -> 0.6 * haskellPackages.diagrams-lib: remove now unnecessary patch * haskellPackages.namespace: jailbreak to build with new monoid-extras
They are not an exposed part of haskellPackages per se, so we shouldn't list them in nix-env. Additionally this should prevent the failed lldb build from cluttering our jobset output.
Member
Author
This reverts commit 52d6981. Unfortunately there is no way to update to monoid-extras 0.6 yet without marking some packages as broken. The issue is that not all diagrams* packages have had an update adding support for GHC 9.x yet (which would also include monoid-extras 0.6 support). The only alternative to pinning diagrams* and monoid-extras would be to have mismatched versions between them which always causes issues with haskellPackages.diagrams. Note that this commit re-introduces some build failures which are to be fixed in a follow-up commit.
While diagrams-lib 1.4.4 doesn't per se require us to update any diagrams lib to 1.5.0 it would require monoid-extras 0.6 which would force us to update diagrams-core to 1.5.0, thus breaking haskellPackages.diagrams. Since we can just keep the patch we fetch and downgrade to 1.4.3, we can continue sitting out the slow update cycle of the diagrams universe.
Upstream seems to have fixed the issue in the meantime -- without merging Malte's PR, however.
Member
Author
|
Our “CI” aggregate jobs are all green now (or at least they will be as soon as
|
Allow setting the HACKAGE2NIX environment variable to change the hackage2nix the script uses to an absolute path to a local build. Useful to test local changes in a realistic environment.
haskellPackages.cabal2nix-unstable: Use justStaticExecutables
They require a local redis daemon running.
Co-authored-by: sterni <sternenseemann@systemli.org>
This commit has been generated by maintainers/scripts/haskell/mark-broken.sh
This commit has been generated by maintainers/scripts/haskell/mark-broken.sh
Member
Author
|
19951 packages working after this cycle (not quite back to pre random 1.2.0 times…). |
7 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This Merge
This PR is the regular merge of the
haskell-updatesbranch intomaster.This branch is being continually built and tested by hydra at https://hydra.nixos.org/jobset/nixpkgs/haskell-updates.
I will aim to merge this PR by 2021-06-11. If I can merge it earlier, there might be successor PRs in that time window. As part of our rotation @maralorn will continue these merges from 2021-06-12 to 2021-06-26.
haskellPackages Workflow Summary
Our workflow is currently described in
pkgs/development/haskell-modules/HACKING.md.The short version is this:
haskell-updates(normally at the beginning of a merge window).haskell-updatesintomasterevery two weeks.mergeablejob is succeeding on hydra.This is the follow-up to #123682. I have the following additional plans to work towards improvements of mostly our GHC derivation, but they are not a hard requirement for merging this PR:
tests.writers.x86_64-darwinto work againgeneric-builder.nixx86_64-darwinandaarch64-linuxbuilds by updatingunsupported-platforms