[25.11] haskellPackages: stackage LTS 24.16 -> LTS 24.19

[wolfgangwalther]

Manual backport of the relevant commits (minus merge commits) in #460624.

[github-actions]

This report is automatically generated by the PR / Check / cherry-pick CI workflow.

Some of the commits in this PR require the author's and reviewer's attention.

Sometimes it is not possible to cherry-pick exactly the same patch.
This most frequently happens when resolving merge conflicts.
The range-diff will help to review the resolution of conflicts.

If you need to merge this PR despite the warnings, please dismiss this review shortly before merging.

Warning

Difference between 366c561 and original 5a80601 may warrant inspection.

Show diff

@@ Commit message
 
     This eliminates the need for 2f1f72d5a2ea8d96f5ba200567815cb6d43d79f3.
 
+    (cherry picked from commit 5a80601f9795a42d12c6358a3fa10c025df79046)
+
  ## pkgs/data/misc/hackage/pin.json ##
 @@
  {
@@ pkgs/data/misc/hackage/pin.json
 +  "msg": "Update from Hackage at 2025-11-11T08:13:55Z"
  }
 
- ## pkgs/development/haskell-modules/cabal2nix-unstable/cabal2nix.nix ##
-@@
- }:
- mkDerivation {
-   pname = "cabal2nix";
--  version = "2.20.1-unstable-2025-10-31";
-+  version = "2.20.1-unstable-2025-11-11";
-   src = fetchzip {
--    url = "https://github.com/NixOS/cabal2nix/archive/e89ec9afd5d6fd8a86e8514fb4406b2adf0783ab.tar.gz";
--    sha256 = "06mdyjy5yds5g51mby4n1jz3r32a24lnba61l0vjm707nzp31r9z";
-+    url = "https://github.com/NixOS/cabal2nix/archive/a152152295a9fa6698583e84a2b8c7eee1446296.tar.gz";
-+    sha256 = "1jpgzyc360g5snvc5ji6wqfvbsc7siwxvhrwafzzfg762niq0c49";
-   };
-   postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot";
-   isLibrary = true;
-
- ## pkgs/development/haskell-modules/cabal2nix-unstable/distribution-nixpkgs.nix ##
-@@
- }:
- mkDerivation {
-   pname = "distribution-nixpkgs";
--  version = "1.7.1.1-unstable-2025-10-31";
-+  version = "1.7.1.1-unstable-2025-11-11";
-   src = fetchzip {
--    url = "https://github.com/NixOS/cabal2nix/archive/e89ec9afd5d6fd8a86e8514fb4406b2adf0783ab.tar.gz";
--    sha256 = "06mdyjy5yds5g51mby4n1jz3r32a24lnba61l0vjm707nzp31r9z";
-+    url = "https://github.com/NixOS/cabal2nix/archive/a152152295a9fa6698583e84a2b8c7eee1446296.tar.gz";
-+    sha256 = "1jpgzyc360g5snvc5ji6wqfvbsc7siwxvhrwafzzfg762niq0c49";
-   };
-   postUnpack = "sourceRoot+=/distribution-nixpkgs; echo source root reset to $sourceRoot";
-   enableSeparateDataOutput = true;
-
- ## pkgs/development/haskell-modules/cabal2nix-unstable/hackage-db.nix ##
-@@
- }:
- mkDerivation {
-   pname = "hackage-db";
--  version = "2.1.3-unstable-2025-10-31";
-+  version = "2.1.3-unstable-2025-11-11";
-   src = fetchzip {
--    url = "https://github.com/NixOS/cabal2nix/archive/e89ec9afd5d6fd8a86e8514fb4406b2adf0783ab.tar.gz";
--    sha256 = "06mdyjy5yds5g51mby4n1jz3r32a24lnba61l0vjm707nzp31r9z";
-+    url = "https://github.com/NixOS/cabal2nix/archive/a152152295a9fa6698583e84a2b8c7eee1446296.tar.gz";
-+    sha256 = "1jpgzyc360g5snvc5ji6wqfvbsc7siwxvhrwafzzfg762niq0c49";
-   };
-   postUnpack = "sourceRoot+=/hackage-db; echo source root reset to $sourceRoot";
-   isLibrary = true;
-
- ## pkgs/development/haskell-modules/cabal2nix-unstable/language-nix.nix ##
-@@
- }:
- mkDerivation {
-   pname = "language-nix";
--  version = "2.3.0-unstable-2025-10-31";
-+  version = "2.3.0-unstable-2025-11-11";
-   src = fetchzip {
--    url = "https://github.com/NixOS/cabal2nix/archive/e89ec9afd5d6fd8a86e8514fb4406b2adf0783ab.tar.gz";
--    sha256 = "06mdyjy5yds5g51mby4n1jz3r32a24lnba61l0vjm707nzp31r9z";
-+    url = "https://github.com/NixOS/cabal2nix/archive/a152152295a9fa6698583e84a2b8c7eee1446296.tar.gz";
-+    sha256 = "1jpgzyc360g5snvc5ji6wqfvbsc7siwxvhrwafzzfg762niq0c49";
-   };
-   postUnpack = "sourceRoot+=/language-nix; echo source root reset to $sourceRoot";
-   libraryHaskellDepends = [
-
  ## pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml ##
 @@
 -# Stackage LTS 24.16
@@ pkgs/development/haskell-modules/hackage-packages.nix: self: {
          hashable
          hashtables
          hedgehog
-@@ pkgs/development/haskell-modules/hackage-packages.nix: self: {
-       hspec,
-       hspec-discover,
-       optparse-applicative,
--      poppler-cpp,
-+      poppler,
-       range,
-       text,
-     }:
-@@ pkgs/development/haskell-modules/hackage-packages.nix: self: {
-         bytestring
-         text
-       ];
--      libraryPkgconfigDepends = [ poppler-cpp ];
-+      libraryPkgconfigDepends = [ poppler ];
-       executableHaskellDepends = [
-         aeson
-         ansi-wl-pprint
-@@ pkgs/development/haskell-modules/hackage-packages.nix: self: {
-       mainProgram = "pdftotext.hs";
-       maintainers = [ lib.maintainers.mpscholten ];
-     }
--  ) { poppler-cpp = null; };
-+  ) { inherit (pkgs) poppler; };
- 
-   pdynload = callPackage (
-     {
 @@ pkgs/development/haskell-modules/hackage-packages.nix: self: {
        hspec-discover,
        megaparsec,

Hint: The full diffs are also available in the runner logs with slightly better highlighting.

[wolfgangwalther]

not sure why there is a diff here, I can't remember resolving conflicts there. We might need to backport another commit about cabal2nix-unstable somewhere? not sure.

[sternenseemann]

@wolfgangwalther looks like #460629 which went to staging-next

[wolfgangwalther]

Right. I think the order of commits was different, so that's why there is a diff now. This commit is already in staging-25.11, I believe. So I can't apply it again, so all good.

See my comment above.