haskellPackages: update stackage and hackage#307204
Merged
Conversation
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
We'll want to (slowly) unify the source used by the different
derivations we use to build GHC. As a first step, use the same base
source for building GHC and all hadrian related packages. This is
achieved by wrapping the fetcher result in `srcOnly` to apply GHC
patches immediately.
To modify the patches (and source) used by GHC we now have a changed
overriding interface for >= 9.6:
```
oldGhc.override {
ghcSrc = oldGhc.src.overrideAttrs (oldAttrs: {
src = …;
patches = …;
});
}
```
This makes the hadrian expressions much simpler as we no longer need to thread through extra arguments for special workarounds. common-hadrian.nix decides in one place which patches we need and directly applies them to the source used to build everything.
Member
Author
Without the change eval fails as:
$ nix build --no-link -f. haskell.packages.ghcjs.stm
error:
… in the left operand of the update (//) operator
at pkgs/development/haskell-modules/lib/compose.nix:40:7:
39| mkDerivation = drv: (args.mkDerivation drv).override f;
40| })) // {
| ^
41| overrideScope = scope: overrideCabal f (drv.overrideScope scope);
error: attribute 'stm_2_5_3_0' missing
at pkgs/development/haskell-modules/configuration-ghcjs.nix:29:21:
28| # ghcjs/ghcjs#676
29| stm = doJailbreak self.stm_2_5_3_0;
| ^
30| exceptions = dontCheck self.exceptions_0_10_7;
Did you mean stm_2_5_3_1?
haskellPackages.linux-namespaces: fix build in ghc < 9.6
haskellPackages.proto-lens-arbitrary: unmark broken
Fixed against GHC 9.8 in November: well-typed/cborg@f910b12
haskellPackages.cbor-tool: Unbroken
This should give us back our maintained job in nixpkgs:haskell-updates. I've chosen to limit the workaround to 9.6 since that's what we really care about (for other versions we don't guarantee anything) and this way users can use e.g. 9.4 if they need lambdabot on aarch64-linux. It would theoretically be prudent to add a similar thing for 9.8 and 9.10, but it's probably too likely to bitrot.
spago: 0.20.9 -> 0.21.0
…eval haskell.packages.ghcjs.stm: fix eval
haskellPackages.proto3-wire: unbreak
haskellPackages: fix build of SOP libraries
haskellPackages.hnix: build on 9.8
haskellPackages.nix-thunk: fix build and deps
haskellPackages.aeson-gadt-th: fix build
This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh
This commit has been generated by maintainers/scripts/haskell/mark-broken.sh based on *evaluation [1806304](https://hydra.nixos.org/eval/1806304) of nixpkgs commit [e49079e](https://github.com/NixOS/nixpkgs/commits/e49079e5ca37db4f827dce83f8315e93dfc6371d) as of 2024-05-15 07:51 UTC* from the haskell-updates jobset on hydra under https://hydra.nixos.org/jobset/nixpkgs/haskell-updates
ncfavier
reviewed
May 15, 2024
Comment on lines
737
to
+740
| - changelog-d # failure in job https://hydra.nixos.org/build/253689337 at 2024-03-31 | ||
| - changelog-d # failure in job https://hydra.nixos.org/build/255671571 at 2024-04-16 | ||
| - changelog-d # failure in job https://hydra.nixos.org/build/257082502 at 2024-04-27 | ||
| - changelog-d # failure in job https://hydra.nixos.org/build/259607598 at 2024-05-15 |
Member
There was a problem hiding this comment.
Oh, it's defined in non-hackage-packages.nix, so doesn't actually get marked broken.
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
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. 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-updatesPRs 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:
haskell-updates(normally at the beginning of a merge window).haskell-updatesintomasterevery two weeks.mergeablejob is succeeding on hydra.maintainedpackage 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 #304640. Come to #haskell:nixos.org if you have any questions.