Merge haskell-updates PR #466258 into staging

Author: sternenseemann

pkgs/data/misc/hackage/pin.json

@@ -1,6 +1,6 @@
 {
-  "commit": "24e42920d74ce9ac5c0c05264079d55cec49e82b",
-  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/24e42920d74ce9ac5c0c05264079d55cec49e82b.tar.gz",
-  "sha256": "1kmf1wg09gsw06525mc0y91x9jy81amhd1sd3b7gl1swnj3dzqqf",
-  "msg": "Update from Hackage at 2025-11-24T11:39:51Z"
+  "commit": "6038c71e482385265b435e5f69ed6231dfea5753",
+  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/6038c71e482385265b435e5f69ed6231dfea5753.tar.gz",
+  "sha256": "0g315gi54sx2hj4qdhaz8ql1yy2zbf2wk87yhhqmgvyslhvmlw24",
+  "msg": "Update from Hackage at 2025-12-14T11:19:11Z"
 }

pkgs/development/compilers/ghc/common-hadrian.nix

@@ -340,6 +340,10 @@ let
     ]
     ++ lib.optionals targetPlatform.useAndroidPrebuilt [
       "*.*.ghc.c.opts += -optc-std=gnu99"
+    ]
+    # Inform GHC that we can't load dynamic libraries which forces iserv-proxy to load static libraries.
+    ++ lib.optionals targetPlatform.isStatic [
+      "*.ghc.cabal.configure.opts += --flags=-dynamic-system-linker"
     ];
 
   # Splicer will pull out correct variations

pkgs/development/haskell-modules/configuration-common.nix

@@ -257,6 +257,10 @@ with haskellLib;
   ### END HASKELL-LANGUAGE-SERVER SECTION ###
   ###########################################
 
+  # network < 3.2.8
+  # bound only required when running under WINE: https://github.com/haskell/network/issues/604
+  iserv-proxy = doJailbreak super.iserv-proxy;
+
   # Test ldap server test/ldap.js is missing from sdist
   # https://github.com/supki/ldap-client/issues/18
   ldap-client-og = dontCheck super.ldap-client-og;
@@ -3274,12 +3278,6 @@ with haskellLib;
   # 2025-5-15: Too strict bounds on base <4.19, see: https://github.com/zachjs/sv2v/issues/317
   sv2v = doJailbreak super.sv2v;
 
-  # 2025-09-20: New revision already on hackage.
-  nvfetcher = lib.pipe super.nvfetcher [
-    (warnAfterVersion "0.7.0.0")
-    doJailbreak
-  ];
-
   # 2025-06-25: Upper bounds of transformers and bytestring too strict,
   # as haskore 0.2.0.8 was released in 2016 and is quite outdated.
   # Tests fail with:

pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix

@@ -201,6 +201,7 @@ in
   # A given major version of ghc-exactprint only supports one version of GHC.
   ghc-exactprint = addBuildDepend self.extra super.ghc-exactprint_1_7_1_0;
 
+  ghc-lib = doDistribute self.ghc-lib_9_8_5_20250214;
   ghc-lib-parser = doDistribute self.ghc-lib-parser_9_8_5_20250214;
   ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_8_0_2;
   haddock-library = doJailbreak super.haddock-library;

pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix

@@ -106,6 +106,7 @@ in
   ghc-exactprint = doDistribute super.ghc-exactprint_1_8_0_0;
 
   haddock-library = doJailbreak super.haddock-library;
+  ghc-lib = doDistribute self.ghc-lib_9_8_5_20250214;
   ghc-lib-parser = doDistribute self.ghc-lib-parser_9_8_5_20250214;
   ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_8_0_2;
   inherit

pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml

@@ -43,6 +43,8 @@ default-package-overrides:
   # We currently use pandoc-crossref with a patch to revert it to pandoc == 3.7.*,
   # this no longer works with later versions.
   - pandoc-crossref == 0.3.21
+  # 2025-12-19: Needs to match Stackage version of rhine
+  - rhine-bayes < 1.6
 # keep-sorted end
 
 # keep-sorted start skip_lines=1 case=no numeric=yes
@@ -69,6 +71,7 @@ extra-packages:
   - ghc-exactprint == 1.9.*             # 2024-08-27: needed for GHC == 9.10
   - ghc-exactprint == 1.12.*            # 2025-10-15: needed for GHC == 9.12
   - ghc-lib == 9.6.*                    # 2022-02-17: preserve for GHC 9.4
+  - ghc-lib == 9.8.*                    # 2025-12-11: preserve for GHC 9.6, 9.8
   - ghc-lib == 9.10.*                   # 2024-12-30: preserve for GHC 9.10/ghc-tags 1.9
   - ghc-lib-parser == 9.6.*             # 2024-05-19: preserve for GHC 9.4
   - ghc-lib-parser == 9.8.*            # 2024-12-26: preserve for GHC 9.6, 9.8

pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml

@@ -1,4 +1,4 @@
-# Stackage LTS 24.21
+# Stackage LTS 24.23
 # This file is auto-generated by
 # maintainers/scripts/haskell/update-stackage.sh
 default-package-overrides:
@@ -15,7 +15,7 @@ default-package-overrides:
   - ad-delcont ==0.5.0.0
   - adjunctions ==4.4.3
   - adler32 ==0.1.2.0
-  - advent-of-code-api ==0.2.9.1
+  - advent-of-code-api ==0.2.11.0
   - aern2-mp ==0.2.16.1
   - aern2-real ==0.2.16.1
   - aeson ==2.2.3.0
@@ -52,7 +52,7 @@ default-package-overrides:
   - almost-fix ==0.0.2
   - alsa-core ==0.5.0.1
   - alsa-mixer ==0.3.0.1
-  - alsa-pcm ==0.6.1.1
+  - alsa-pcm ==0.6.1.2
   - alsa-seq ==0.6.0.10
   - alternative-vector ==0.0.0
   - alternators ==1.0.0.0
@@ -629,7 +629,7 @@ default-package-overrides:
   - diagrams-contrib ==1.4.6
   - diagrams-core ==1.5.1.1
   - diagrams-gtk ==1.4
-  - diagrams-lib ==1.5.0.1
+  - diagrams-lib ==1.5.1
   - diagrams-postscript ==1.5.3
   - diagrams-rasterific ==1.5
   - diagrams-solve ==0.1.3.1
@@ -665,7 +665,7 @@ default-package-overrides:
   - distribution-opensuse ==1.1.4
   - distributive ==0.6.2.1
   - djinn-lib ==0.0.1.4
-  - djot ==0.1.2.3
+  - djot ==0.1.2.4
   - dl-fedora ==2.0.1
   - dlist ==1.0
   - dlist-instances ==0.1.1.1
@@ -1158,7 +1158,7 @@ default-package-overrides:
   - gogol-youtube-reporting ==1.0.0
   - goldplate ==0.2.2.1
   - google-isbn ==1.0.3
-  - google-oauth2-jwt ==0.3.3.1
+  - google-oauth2-jwt ==0.3.3.2
   - gopher-proxy ==0.1.1.3
   - gpolyline ==0.1.0.1
   - graph-core ==0.3.0.0
@@ -1501,7 +1501,7 @@ default-package-overrides:
   - int-supply ==1.0.0
   - integer-conversion ==0.1.1
   - integer-logarithms ==1.0.4
-  - integer-roots ==1.0.3.0
+  - integer-roots ==1.0.4.0
   - integration ==0.2.1
   - intermediate-structures ==0.1.2.0
   - intern ==0.9.6
@@ -1603,7 +1603,7 @@ default-package-overrides:
   - lame ==0.2.2
   - language-avro ==0.1.4.0
   - language-bash ==0.11.1
-  - language-c ==0.10.0
+  - language-c ==0.10.1
   - language-c-quote ==0.13.0.2
   - language-c99 ==0.2.0
   - language-c99-simple ==0.3.0
@@ -2149,7 +2149,7 @@ default-package-overrides:
   - persistent-redis ==2.13.0.2
   - persistent-sqlite ==2.13.3.1
   - persistent-template ==2.12.0.0
-  - persistent-test ==2.13.2.0
+  - persistent-test ==2.13.2.1
   - persistent-typed-db ==0.1.0.7
   - pg-harness-client ==0.6.0
   - pg-transact ==0.3.2.0
@@ -2288,7 +2288,7 @@ default-package-overrides:
   - pusher-http-haskell ==2.1.0.21
   - pvar ==1.0.0.0
   - pwstore-fast ==2.4.4
-  - PyF ==0.11.4.0
+  - PyF ==0.11.5.0
   - qchas ==1.1.0.1
   - quaalude ==0.0.0.1
   - quadratic-irrational ==0.1.2
@@ -2874,7 +2874,7 @@ default-package-overrides:
   - tensort ==1.1.0.0
   - termbox ==2.0.0.2
   - termbox-banana ==2.0.0.1
-  - termbox-bindings-c ==0.1.0.2
+  - termbox-bindings-c ==0.1.0.3
   - termbox-bindings-hs ==1.0.0.1
   - termbox-tea ==1.0.0.1
   - terminal ==0.2.0.0
@@ -3250,7 +3250,7 @@ default-package-overrides:
   - wl-pprint ==1.2.1
   - wl-pprint-annotated ==0.1.0.1
   - wl-pprint-text ==1.2.0.2
-  - wled-json ==0.1.0.1
+  - wled-json ==0.1.0.2
   - word-compat ==0.0.6
   - word-trie ==0.3.0
   - word-wrap ==0.5
@@ -3275,8 +3275,8 @@ default-package-overrides:
   - xlsx ==1.1.4
   - xml ==1.3.14
   - xml-basic ==0.1.3.3
-  - xml-conduit ==1.10.0.1
-  - xml-hamlet ==0.5.0.2
+  - xml-conduit ==1.10.1.0
+  - xml-hamlet ==0.5.0.3
   - xml-helpers ==1.0.0
   - xml-html-qq ==0.1.0.1
   - xml-indexed-cursor ==0.1.1.0

pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml

@@ -4,7 +4,6 @@
 # depend on a dependency marked as broken.
 dont-distribute-packages:
 
- - 4Blocks
  - a50
  - abcBridge
  - AbortT-monadstf
@@ -162,6 +161,7 @@ dont-distribute-packages:
  - aura
  - authoring
  - AutoForms
+ - automaton_1_6
  - autonix-deps-kf5
  - avers
  - avers-api
@@ -903,6 +903,7 @@ dont-distribute-packages:
  - eventful-sql-common
  - eventful-sqlite
  - eventful-test-helpers
+ - eventlog-live-otelcol
  - EventSocket
  - eventsource-geteventstore-store
  - eventsource-store-specs
@@ -1214,6 +1215,7 @@ dont-distribute-packages:
  - grapefruit-records
  - grapefruit-ui
  - grapefruit-ui-gtk
+ - grapesy
  - grapesy-etcd
  - graph-rewriting-cl
  - graph-rewriting-gl
@@ -1362,6 +1364,8 @@ dont-distribute-packages:
  - haskell-ftp
  - haskell-lsp
  - haskell-lsp-client
+ - haskell-opentimestamps
+ - haskell-opentimestamps-client
  - haskell-pdf-presenter
  - haskell-platform-test
  - haskell-reflect
@@ -1526,7 +1530,6 @@ dont-distribute-packages:
  - hgeometry-ipe
  - hgeometry-svg
  - hgithub
- - hgraph
  - hiccup
  - hie-core
  - hierarchical-clustering-diagrams
@@ -1711,7 +1714,6 @@ dont-distribute-packages:
  - hsyslog-tcp
  - HTab
  - html-kure
- - html2hamlet
  - htoml-parse
  - htsn-import
  - http-client-auth
@@ -2015,7 +2017,6 @@ dont-distribute-packages:
  - LambdaShell
  - lambdaya-bus
  - lambdiff
- - lame-tester
  - landlock
  - lang
  - language-ats
@@ -2075,7 +2076,6 @@ dont-distribute-packages:
  - libmolude
  - libraft
  - librarian
- - librato
  - libxml-enumerator
  - lifted-base-tf
  - lightning-haskell
@@ -2573,7 +2573,6 @@ dont-distribute-packages:
  - partage
  - partial-semigroup-test
  - passman-cli
- - pathfindingcore
  - patterns
  - paypal-rest-client
  - pcap-enumerator
@@ -2606,7 +2605,7 @@ dont-distribute-packages:
  - persistent-hssqlppp
  - persistent-iproute
  - persistent-map
- - persistent-postgresql_2_14_0_0
+ - persistent-postgresql_2_14_2_0
  - persistent-protobuf
  - persona-idp
  - peyotls
@@ -2811,6 +2810,7 @@ dont-distribute-packages:
  - queryparser-presto
  - queryparser-vertica
  - queuelike
+ - quic-simple
  - quick-process
  - quickcheck-poly
  - quickcheck-regex
@@ -3728,6 +3728,7 @@ dont-distribute-packages:
  - warp-grpc
  - warp-quic
  - warped
+ - warpZ-tls
  - WashNGo
  - WaveFront
  - wavesurfer
@@ -3917,3 +3918,4 @@ dont-distribute-packages:
  - zoovisitor
  - zuramaru
  - zwirn
+ - _4Blocks

pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml

@@ -2142,6 +2142,21 @@ builtins.intersectAttrs super {
 
   botan-bindings = super.botan-bindings.override { botan = pkgs.botan3; };
 
+  # Avoids a cycle by disabling use of the external interpreter for the packages that are dependencies of iserv-proxy.
+  # These in particular can't rely on template haskell for cross-compilation anyway as they can't rely on iserv-proxy.
+  inherit
+    (
+      let
+        noExternalInterpreter = overrideCabal {
+          enableExternalInterpreter = false;
+        };
+      in
+      lib.mapAttrs (_: noExternalInterpreter) { inherit (super) iserv-proxy network; }
+    )
+    iserv-proxy
+    network
+    ;
+
   # Workaround for flaky test: https://github.com/basvandijk/threads/issues/10
   threads = appendPatch ./patches/threads-flaky-test.patch super.threads;
 }