Skip to content

haskellPackages: Stackage 23.17 -> 23.19 - #401105

Merged
sternenseemann merged 53 commits into
stagingfrom
haskell-updates
May 2, 2025
Merged

haskellPackages: Stackage 23.17 -> 23.19#401105
sternenseemann merged 53 commits into
stagingfrom
haskell-updates

Conversation

@sternenseemann

@sternenseemann sternenseemann commented Apr 23, 2025

Copy link
Copy Markdown
Member

This Merge

This PR is the regular merge of the `haskell-updates` branch into `staging`.

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

nixpkgs-ci Bot and others added 7 commits April 23, 2025 00:19
@nixpkgs-ci
Merge 2966238 into haskell-updates
96d3005
@sternenseemann
haskellPackages: stackage LTS 23.17 -> LTS 23.19
77dd48e 
This commit has been generated by maintainers/scripts/haskell/update-stackage.sh
@sternenseemann
all-cabal-hashes: 2025-03-30T11:13:14Z -> 2025-04-21T04:38:52Z
b3b6955 
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
@sternenseemann
haskellPackages: regenerate package set based on current config
6de45ff 
This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh
@sternenseemann
haskellPackages: Cabal* 3.14.1.* -> 3.14.2.0
88de1ef
@sternenseemann
haskellPackages.network-control: use version from stackage
d4dcbad 
which now matches the version we want!
@sternenseemann
stack: pin hpack to == 0.38.0 for 3.5.1
7de8521
@github-actions github-actions Bot added 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: haskell General-purpose, statically typed, purely functional programming language 6.topic: kernel The Linux kernel 8.has: changelog This PR adds or changes release notes 8.has: module (update) This PR changes an existing module in `nixos/` 6.topic: vim Advanced text editor 6.topic: stdenv Standard environment 6.topic: nodejs Node.js is a free, open-source, cross-platform JavaScript runtime environment 6.topic: coq A formal proof management system 6.topic: docker tools Open-source software for deploying and running of containerized applications 6.topic: flakes The experimental Nix feature 8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` labels Apr 23, 2025
@github-actions github-actions Bot added the 8.has: documentation This PR adds or changes documentation label Apr 23, 2025
@wolfgangwalther

wolfgangwalther commented Apr 23, 2025

Copy link
Copy Markdown
Contributor

It's unclear to me where the changes that cause the conflicts are coming from.

@maralorn

maralorn commented Apr 23, 2025

Copy link
Copy Markdown
Member

Maybe those are genuine conflicts between master and staging? But normally the merge job should prevent those from reaching our branch, right?

@sternenseemann

sternenseemann commented May 1, 2025

Copy link
Copy Markdown
Member Author

Wondering if it's worth fixing quic and friends. Does anything use that? Needs tls >= 2.1 which is going to be a big pain before Stackage LTS 24 probably. Downgrading it also doesn't quite feel right as there are a lot of bug fixes in each release…

@wolfgangwalther

wolfgangwalther commented May 1, 2025

Copy link
Copy Markdown
Contributor

Wondering if it's worth fixing quic and friends. Does anything use that? Needs tls >= 2.1 which is going to be a big pain before Stackage LTS 24 probably. Downgrading it also doesn't quite feel right as there are a lot of bug fixes in each release…

I asked myself the same question already. We would need to downgrade to quic-2.7 it seems - and the latest is quic 2.11. I'd say if somebody needs it in the meantime, they could explicitly opt-in to downgrading with an override instead. So let's mark it as broken?

wolfgangwalther and others added 16 commits May 1, 2025 22:35
@wolfgangwalther
haskellPackages.postgresql-libpq-configure: unbreak
290cac9 
We split pg_config from libpq, so need to provide it manually for those
packages that can't make use of pkgconfig.
@wolfgangwalther
haskellPackages.HDBC-postgresql: unbreak
0de580a 
We split pg_config from libpq a while ago, so need to provide it
manually for those packages that can't use pkgconfig.
@sternenseemann
haskellPackages.jsonpatch: disable broken test suite
ca10fea
@sternenseemann
haskellPackages.what4_1_7: also apply overrides
993ded7
@sternenseemann
haskellPackages.crucible*: use what4 >= 1.7
1f27ec8 
Explicitly requested by crucible-llvm.
@sternenseemann
haskellPackages.crucible-llvm: provide test dependency z3
bb5df8d
@sternenseemann
haskellPackages.crux: provide simple-get-opt < 0.5
eae7f8f
@maralorn
haskellPackages.{postgresql-libpq-configure,HDBC-postgresql}: unbreak (…
738b518 
…#403431)
@nixpkgs-ci
Merge b5dd9ef into haskell-updates
70786be
@wolfgangwalther
haskellPackages: unbreak various packages
1eab52f 
This is the result of running the unbreak.nu script.
@wolfgangwalther
haskellPackages.postgrest: 12.2.11 -> 12.2.12
54c671d 
Release notes:
https://github.com/PostgREST/postgrest/releases/tag/v12.2.12
@wolfgangwalther
haskellPackages: misc fixes (#403419)
273b559
@wolfgangwalther
haskellPackages.postgrest: 12.2.11 -> 12.2.12 (#403553)
687b189
@wolfgangwalther
[haskell-updates] haskellPackages.crux: unbreak (#403343)
3937cbe
@sternenseemann
haskellPackages: mark builds failing on hydra as broken
bc05eaf 
This commit has been generated by maintainers/scripts/haskell/mark-broken.sh based on
*evaluation [1814999](https://hydra.nixos.org/eval/1814999) of nixpkgs commit [3937cbe](https://github.com/NixOS/nixpkgs/commits/3937cbe4d3846be40349599504cef1765d8e4d59) as of 2025-05-02 08:45 UTC*
from the haskell-updates jobset on hydra under https://hydra.nixos.org/jobset/nixpkgs/haskell-updates
@sternenseemann
Merge commit 97e6d41 into haskell-updates
fd0d17d
@sternenseemann

sternenseemann commented May 2, 2025

Copy link
Copy Markdown
Member Author

Ready to merge, I think, anything else?

wolfgangwalther
wolfgangwalther reviewed May 2, 2025
View reviewed changes
Comment thread pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@nixpkgs-ci

nixpkgs-ci Bot commented May 2, 2025

Copy link
Copy Markdown
Contributor

Backport failed because this pull request contains merge commits. You can either backport this pull request manually, or configure the action to skip merge commits.

@sternenseemann

sternenseemann commented May 2, 2025

Copy link
Copy Markdown
Member Author

Shouldn't that bug be fixed by now?

@wolfgangwalther

wolfgangwalther commented May 2, 2025

Copy link
Copy Markdown
Contributor

No, but I have a PR open to disable labeling for staging-next and haskell-updates PRs at #402332. I don't think any of the labels make sense here.

@sternenseemann sternenseemann mentioned this pull request May 5, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@wolfgangwalther wolfgangwalther wolfgangwalther approved these changes

Assignees

No one assigned

Labels

4.workflow: package set update Development branch for package set updates (haskell/python) 6.topic: continuous integration Affects continuous integration (CI) in Nixpkgs, including Ofborg and GitHub Actions 6.topic: dotnet Language: .NET 6.topic: emacs Text editor 6.topic: games Gaming on NixOS 6.topic: haskell General-purpose, statically typed, purely functional programming language 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: ocaml OCaml is a general-purpose, high-level, multi-paradigm programming language. 6.topic: php PHP is a general-purpose scripting language geared towards web development. 6.topic: python Python is a high-level, general-purpose programming language. 8.has: documentation This PR adds or changes documentation 8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` 8.has: module (update) This PR changes an existing module in `nixos/`

Projects

CUDA Team
Status: ✅ Done
Stdenv
Status: Done

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@sternenseemann @wolfgangwalther @maralorn @marcin-serwin @dragospe @alexfmpe