Skip to content

haskellPackages: update stackage and hackage#217111

Merged
sternenseemann merged 42 commits intomasterfrom
haskell-updates
Mar 1, 2023
Merged

haskellPackages: update stackage and hackage#217111
sternenseemann merged 42 commits intomasterfrom
haskell-updates

Conversation

@sternenseemann
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 ha
    s been pinged 7 days in advance. (If you care about a Haskell package, become a maintainer!)

This is the follow-up to #215925. 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
@github-actions github-actions bot added the 6.topic: haskell General-purpose, statically typed, purely functional programming language label Feb 19, 2023
@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: 1001-2500 This PR causes many rebuilds on Darwin and should most likely 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: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches. labels Feb 19, 2023
Both packages had a new release fixing the issues we found after the
last bump, so they are easily fixed.
@sternenseemann

This comment was marked as outdated.

Dmitry Bogatov and others added 5 commits February 19, 2023 12:15
Unbreak tdlib and its dependencies by same upstream (tdlib-types,
tdlib-gen, language-tl).

Co-authored-by: sternenseemann <sternenseemann@systemli.org>
Cabal 3.8 and friends support process 1.6.17.0 which has recently been
released on Hackage, so we can fix the evaluation errors this way.
aarch64-linux will continue failing unless we find another solution.
For x86_64-darwin we won't learn anything by it being a constaint star
in our build failure reports.
`ghc-pkg list` tells us everything hackage2nix needs to know. In the
past the core-packages list and compiler setting in hackage2nix was
maintained manually which inevitably leads to it being forgot once in a
while – this will then mess with flag resolution when generating the
package set in some cases. Luckily, we can just let a simple derivation
do this for us.

Resolves #202621.
@sternenseemann
Copy link
Member Author

@ofborg build haskellPackages.bytepatch

@ofborg ofborg bot added the 8.has: clean-up This PR removes packages or removes other cruft label Feb 22, 2023
mikesperber and others added 6 commits February 23, 2023 08:55
This just moves the package to the current head in the official repo,
which has since seen patches that unbreak the ghc-9 build and work
with our version of TensorFlow.
This reverts commit 32eecc6.

Reason for revert: This fix doesn't alleviate the problem in two ways:

1. It is in the aarch64-darwin section of configuration-darwin.nix,
   the problem appears on x86_64-darwin (bytepatch doesn't support
   aarch64).

2. When moving the override into the general *-darwin section, the
   problem with bytepatch is also unaffected, see my attempt in
   #217201.
…nsorflow

Unbreak snappy and tensorflow Haskell packages
This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh
There is a code generation bug in Cabal-3.6.3.0. For packages configured with
--enable-relocatable, Cabal would generate code that doesn't compile.

There isn't an upstream issue, but the issue is described in the commit that
fixed it:
haskell/cabal@6c79621

It was fixed in Cabal-3.8.*
Backport the fix to the Cabal library that ships with ghc-9.4.4

Cabal 3.8 ships with ghc-9.6, so when 9.6 is released this fix shouldn't be
necessary.
@ofborg ofborg bot requested review from expipiplus1 and guibou February 24, 2023 12:03
@ofborg ofborg bot added the 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. label Feb 24, 2023
@vcunat
Copy link
Member

vcunat commented Feb 25, 2023

I don't know the workflow of haskell updates, but could you add bump of haskell-gi to 0.26.3? On current staging-next branch it's needed to build haskellPackages.gi-harfbuz. I just tested manually

--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -129407,4 +129407,4 @@ self: {
        pname = "haskell-gi";
-       version = "0.26.2";
-       sha256 = "05r84czb05n69g7p7jazljh95yzdh2lpzgjjypgpg75mh83igr2w";
+       version = "0.26.3";
+       sha256 = "sha256-jsAb3JCSHCmi2dp9bpi/J3NRO/EQFB8ar4GpxAuBGOo=";
        setupHaskellDepends = [ base Cabal cabal-doctest ];

@vcunat
Copy link
Member

vcunat commented Feb 26, 2023

So, now that diff is in nixpkgs master as 1af0d67 – I thought that unbreaking until the next regeneration is an improvement.

As staging-next merged, you'll see rebuild of everything, BTW.

@vcunat vcunat mentioned this pull request Feb 26, 2023
6 tasks
sternenseemann and others added 12 commits February 26, 2023 20:45
This achieves the same as 1af0d67, but
prevents it being rolled back by package set regeneration.
maintainers/scripts/haskell/hydra-report: Add comments with error causes to broken list
This commit has been generated by maintainers/scripts/haskell/mark-broken.sh based on
*evaluation [1791397](https://hydra.nixos.org/eval/1791397) of nixpkgs commit [81d5cb1](https://github.com/NixOS/nixpkgs/commits/81d5cb1550ef0a58c5ee529c743065cc93a7fb64) as of 2023-02-28 23:50 UTC*
from the haskell-updates jobset on hydra under https://hydra.nixos.org/jobset/nixpkgs/haskell-updates
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

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+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely 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: 2501-5000 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

Development

Successfully merging this pull request may close these issues.

8 participants