Skip to content

haskellPackages: Stackage 23.17 -> 23.19#401105

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

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

Conversation

@sternenseemann
Copy link
Member

@sternenseemann sternenseemann commented Apr 23, 2025

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
sternenseemann and others added 5 commits April 23, 2025 15:23
@sternenseemann
git-annex: update sha256 for 10.20250416
45230a2
@wolfgangwalther
haskell.packages.ghc9122.interpolate: disable tests due to GHC bug
861a530
@wolfgangwalther
haskell.packages.ghc9122.hpack: 0.37.0 -> 0.38.0
c3857c6 
Comes with a jailbreak for Cabal 3.14.
@wolfgangwalther
haskellPackages.cabal2nix-unstable: 2025-04-22 -> 2025-04-23
a7ab1a4
@wolfgangwalther
postgrest: 12.2.7 -> 12.2.11
117c6e3 
Release notes:
https://github.com/PostgREST/postgrest/releases/tag/v12.2.11
https://github.com/PostgREST/postgrest/releases/tag/v12.2.10
https://github.com/PostgREST/postgrest/releases/tag/v12.2.9
https://github.com/PostgREST/postgrest/releases/tag/v12.2.8
@wolfgangwalther
Copy link
Contributor

wolfgangwalther commented Apr 23, 2025

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

@maralorn
Copy link
Member

maralorn commented Apr 23, 2025

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

@github-actions github-actions bot added the 6.topic: dotnet Language: .NET label May 2, 2025
wolfgangwalther and others added 7 commits May 2, 2025 08:27
@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
@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 6.topic: emacs Text editor 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: continuous integration Affects continuous integration (CI) in Nixpkgs, including Ofborg and GitHub Actions backport release-24.11 labels May 2, 2025
@sternenseemann sternenseemann marked this pull request as ready for review May 2, 2025 09:51
@sternenseemann
Copy link
Member Author

sternenseemann commented May 2, 2025

Ready to merge, I think, anything else?

@github-project-automation github-project-automation bot moved this from New to 🔖 Awaits the merge in CUDA Team May 2, 2025
@github-project-automation github-project-automation bot moved this to In Progress in Stdenv May 2, 2025
@sternenseemann sternenseemann merged commit eeb3a20 into staging May 2, 2025
37 of 39 checks passed
@github-project-automation github-project-automation bot moved this from 🔖 Awaits the merge to ✅ Done in CUDA Team May 2, 2025
@github-project-automation github-project-automation bot moved this from In Progress to Done in Stdenv May 2, 2025
@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented May 2, 2025

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
Copy link
Member Author

sternenseemann commented May 2, 2025

Shouldn't that bug be fixed by now?

@wolfgangwalther
Copy link
Contributor

wolfgangwalther commented May 2, 2025

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.

@wolfgangwalther wolfgangwalther added the 4.workflow: package set update Development branch for package set updates (haskell/python) label May 4, 2025
@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