From 5a2cfde3417666ef74bff4bae8d24095a90bc1df Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 21 Sep 2025 12:39:55 +0200 Subject: [PATCH 01/84] haskellPackages.dunai: drop obsolete workaround The issue has been resolved upstream as reported by krank. --- pkgs/development/haskell-modules/configuration-common.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 6da545b0bc181..da352cd09449d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -52,9 +52,6 @@ with haskellLib; })) ]; - # https://github.com/ivanperez-keera/dunai/issues/427 - dunai = addBuildDepend self.list-transformer (enableCabalFlag "list-transformer" super.dunai); - # Make sure that Cabal_* can be built as-is Cabal_3_10_3_0 = doDistribute ( super.Cabal_3_10_3_0.override { From 6592fefbed94d36f3f57c216b5bbdfd4750874cd Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 21 Sep 2025 12:42:41 +0200 Subject: [PATCH 02/84] haskellPackages.HsSyck: remove obsolete workaround The issue has been resolved upstream as reported by krank. --- pkgs/development/haskell-modules/configuration-common.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index da352cd09449d..25b9f4e7cc925 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -385,11 +385,6 @@ with haskellLib; HsOpenSSL = appendConfigureFlags [ "--ghc-option=-optc=-Wno-error=incompatible-pointer-types" ] super.HsOpenSSL; - # Work around compilation failures with gcc >= 14 - # https://github.com/audreyt/hssyck/issues/5 - HsSyck = appendConfigureFlags [ - "--ghc-option=-optc=-Wno-error=implicit-function-declaration" - ] super.HsSyck; # https://github.com/rethab/bindings-dsl/issues/46 bindings-libcddb = appendConfigureFlags [ "--ghc-option=-optc=-Wno-error=incompatible-pointer-types" From 014307e99cf6b5f7fa1373caee54d992732ce812 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 21 Sep 2025 12:44:13 +0200 Subject: [PATCH 03/84] haskellPackages.lvar: drop obsolete override The issue has been resolved upstream as reported by krank. --- pkgs/development/haskell-modules/configuration-common.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 25b9f4e7cc925..7f0a21756c226 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -450,9 +450,6 @@ with haskellLib; # store. Testing is done upstream. arion-compose = dontCheck super.arion-compose; - # 2023-07-17: Outdated base bound https://github.com/srid/lvar/issues/5 - lvar = doJailbreak super.lvar; - # Don't call setEnv in parallel in the test suite (which leads to flaky failures) env-extra = appendPatches From aa39e978b72048f937bc6b2a2a3ea001995feaa6 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 21 Sep 2025 13:27:26 +0200 Subject: [PATCH 04/84] haskellPackages.glualint: drop obsolete override The issue has been resolved in the last two releases, however glualint is still transitively broken by . --- pkgs/development/haskell-modules/configuration-common.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 7f0a21756c226..deaf3665a9f82 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -635,10 +635,6 @@ with haskellLib; # check requires mysql server mysql-simple = dontCheck super.mysql-simple; - # Test data missing - # https://github.com/FPtje/GLuaFixer/issues/165 - glualint = dontCheck super.glualint; - # Hackage tarball only includes what is supported by `cabal install git-annex`, # but we want e.g. completions as well. See # https://web.archive.org/web/20160724083703/https://git-annex.branchable.com/bugs/bash_completion_file_is_missing_in_the_6.20160527_tarball_on_hackage/ From e03351feb220db4a6cabb8653ca03adae3492c24 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 21 Sep 2025 14:09:43 +0200 Subject: [PATCH 05/84] haskellPackages.aeson-schema: drop obsolete override aeson-schema has been marked broken due to unrelated issues: https://github.com/ocramz/aeson-schema/issues/26 --- pkgs/development/haskell-modules/configuration-common.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index deaf3665a9f82..6610e0601ee96 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -930,7 +930,6 @@ with haskellLib; # Disable test suites to fix the build. acme-year = dontCheck super.acme-year; # http://hydra.cryp.to/build/497858/log/raw aeson-lens = dontCheck super.aeson-lens; # http://hydra.cryp.to/build/496769/log/raw - aeson-schema = dontCheck super.aeson-schema; # https://github.com/timjb/aeson-schema/issues/9 angel = dontCheck super.angel; apache-md5 = dontCheck super.apache-md5; # http://hydra.cryp.to/build/498709/nixlog/1/raw app-settings = dontCheck super.app-settings; # http://hydra.cryp.to/build/497327/log/raw From ce72c7443285ce5774e59471ade81d5ac47503a8 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 21 Sep 2025 16:59:24 +0200 Subject: [PATCH 06/84] haskell.compiler: remove references xattr missing flag issues darwin.xattr used to be a fork of python3.pkgs.xattr. bafc6ff88df03e765a35efd140e switched darwin.xattr to Apple's new C implementation of the tool. When I originally packaged darwin.xattr (283d622397539f196416657d), I linked tickets on the original tool's issue tracker suggesting to add support for flags added by Apple in their fork. This has since happened, so we could possibly switch to python3.pkgs.xattr. However, I think it's no longer a good idea: - Bootstrapping-wise a C tool is considerably simpler. - GHC upstream tests against Apple's xattr(1) implementation in their CI. Especially now, since they no longer share a direct ancestry, it seems unwise to assume the tools will behave the same. --- pkgs/top-level/haskell-packages.nix | 30 ----------------------------- 1 file changed, 30 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 89b54879e69b6..b013eaefd123b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -90,9 +90,6 @@ in # https://gitlab.haskell.org/ghc/ghc/-/issues/21914 bb.packages.ghc902Binary; inherit (buildPackages.python3Packages) sphinx; - # Need to use apple's patched xattr until - # https://github.com/xattr/xattr/issues/44 and - # https://github.com/xattr/xattr/issues/55 are solved. inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; inherit buildTargetLlvmPackages llvmPackages; }; @@ -100,18 +97,12 @@ in ghc963 = callPackage ../development/compilers/ghc/9.6.3.nix { bootPkgs = bb.packages.ghc924Binary; inherit (buildPackages.python3Packages) sphinx; - # Need to use apple's patched xattr until - # https://github.com/xattr/xattr/issues/44 and - # https://github.com/xattr/xattr/issues/55 are solved. inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; inherit buildTargetLlvmPackages llvmPackages; }; ghc967 = callPackage ../development/compilers/ghc/9.6.7.nix { bootPkgs = bb.packages.ghc924Binary; inherit (buildPackages.python3Packages) sphinx; - # Need to use apple's patched xattr until - # https://github.com/xattr/xattr/issues/44 and - # https://github.com/xattr/xattr/issues/55 are solved. inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; inherit buildTargetLlvmPackages llvmPackages; }; @@ -123,9 +114,6 @@ in else bb.packages.ghc963Binary; inherit (buildPackages.python3Packages) sphinx; - # Need to use apple's patched xattr until - # https://github.com/xattr/xattr/issues/44 and - # https://github.com/xattr/xattr/issues/55 are solved. inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; inherit buildTargetLlvmPackages llvmPackages; }; @@ -142,9 +130,6 @@ in else bb.packages.ghc963Binary; inherit (buildPackages.python3Packages) sphinx; - # Need to use apple's patched xattr until - # https://github.com/xattr/xattr/issues/44 and - # https://github.com/xattr/xattr/issues/55 are solved. inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; inherit buildTargetLlvmPackages llvmPackages; }; @@ -160,9 +145,6 @@ in else bb.packages.ghc963Binary; inherit (buildPackages.python3Packages) sphinx; - # Need to use apple's patched xattr until - # https://github.com/xattr/xattr/issues/44 and - # https://github.com/xattr/xattr/issues/55 are solved. inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; inherit buildTargetLlvmPackages llvmPackages; }; @@ -178,9 +160,6 @@ in else bb.packages.ghc963Binary; inherit (buildPackages.python3Packages) sphinx; - # Need to use apple's patched xattr until - # https://github.com/xattr/xattr/issues/44 and - # https://github.com/xattr/xattr/issues/55 are solved. inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; # 2023-01-15: Support range >= 11 && < 16 buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15; @@ -192,9 +171,6 @@ in # No suitable bindist packaged yet bb.packages.ghc9103; inherit (buildPackages.python3Packages) sphinx; - # Need to use apple's patched xattr until - # https://github.com/xattr/xattr/issues/44 and - # https://github.com/xattr/xattr/issues/55 are solved. inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; inherit buildTargetLlvmPackages llvmPackages; }; @@ -203,9 +179,6 @@ in # No suitable bindist packaged yet bb.packages.ghc9103; inherit (buildPackages.python3Packages) sphinx; - # Need to use apple's patched xattr until - # https://github.com/xattr/xattr/issues/44 and - # https://github.com/xattr/xattr/issues/55 are solved. inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; inherit buildTargetLlvmPackages llvmPackages; }; @@ -213,9 +186,6 @@ in ghcHEAD = callPackage ../development/compilers/ghc/head.nix { bootPkgs = bb.packages.ghc984Binary; inherit (buildPackages.python3Packages) sphinx; - # Need to use apple's patched xattr until - # https://github.com/xattr/xattr/issues/44 and - # https://github.com/xattr/xattr/issues/55 are solved. inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; inherit buildTargetLlvmPackages llvmPackages; }; From 98830a9ae96ab1c30640b8523700e2edc57989ca Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 21 Sep 2025 22:21:07 +0200 Subject: [PATCH 07/84] haskellPackages: stackage LTS 24.10 -> LTS 24.11 all-cabal-hashes: 2025-09-14T21:34:10Z -> 2025-09-21T18:48:01Z (generated by maintainers/scripts/haskell/update-package-set.sh) --- pkgs/data/misc/hackage/pin.json | 8 +- .../configuration-hackage2nix/stackage.yaml | 28 +- .../haskell-modules/hackage-packages.nix | 1593 +++++++++++++---- 3 files changed, 1298 insertions(+), 331 deletions(-) diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index 3f9a293f08ae2..997651b5d6d41 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "c074fec58a2c83bfb17c273302005fe2625207f1", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/c074fec58a2c83bfb17c273302005fe2625207f1.tar.gz", - "sha256": "1my6xrg3m694fr3k5386yx5wqd2j0wdxfx6g3scnh5af0sx2hx0w", - "msg": "Update from Hackage at 2025-09-14T21:34:10Z" + "commit": "683b72ab493ca513a0e057cf2851e4d6c48b3aa4", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/683b72ab493ca513a0e057cf2851e4d6c48b3aa4.tar.gz", + "sha256": "12d274dhy0ph7cvbags91pjk0i2mk2x36q84b0988sz1jjl9kz92", + "msg": "Update from Hackage at 2025-09-21T18:48:01Z" } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index 8732dc0f3ce88..8a3df620c3318 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 24.10 +# Stackage LTS 24.11 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -22,7 +22,7 @@ default-package-overrides: - aeson-attoparsec ==0.0.0 - aeson-better-errors ==0.9.1.3 - aeson-casing ==0.2.0.0 - - aeson-combinators ==0.1.2.1 + - aeson-combinators ==0.1.2.2 - aeson-diff ==1.1.0.13 - aeson-gadt-th ==0.2.5.4 - aeson-generic-compat ==0.0.2.0 @@ -224,8 +224,8 @@ default-package-overrides: - blaze-textual ==0.2.3.1 - bloodhound ==0.23.0.1 - bloomfilter ==2.0.1.2 - - bluefin ==0.0.16.0 - - bluefin-internal ==0.1.0.0 + - bluefin ==0.0.17.0 + - bluefin-internal ==0.1.1.0 - bm ==0.2.0.0 - bmp ==1.2.6.4 - bnb-staking-csvs ==0.2.2.0 @@ -489,7 +489,7 @@ default-package-overrides: - countdown-numbers-game ==0.0.0.1 - country ==0.2.5.0 - covariance ==0.2.0.1 - - cpphs ==1.20.9.1 + - cpphs ==1.20.10 - cpu ==0.1.2 - cpuinfo ==0.1.0.3 - cql ==4.0.4 @@ -1367,13 +1367,13 @@ default-package-overrides: - hsndfile-vector ==0.5.2 - HsOpenSSL ==0.11.7.9 - HsOpenSSL-x509-system ==0.1.0.4 - - hspec ==2.11.12 - - hspec-api ==2.11.12 + - hspec ==2.11.13 + - hspec-api ==2.11.13 - hspec-attoparsec ==0.1.0.2 - hspec-checkers ==0.1.0.2 - hspec-contrib ==0.5.2 - - hspec-core ==2.11.12 - - hspec-discover ==2.11.12 + - hspec-core ==2.11.13 + - hspec-discover ==2.11.13 - hspec-expectations ==0.8.4 - hspec-expectations-json ==1.0.2.1 - hspec-expectations-lifted ==0.10.0 @@ -1384,7 +1384,7 @@ default-package-overrides: - hspec-junit-formatter ==1.1.2.1 - hspec-leancheck ==0.0.6 - hspec-megaparsec ==2.2.1 - - hspec-meta ==2.11.12 + - hspec-meta ==2.11.13 - hspec-need-env ==0.1.0.12 - hspec-parsec ==0 - hspec-smallcheck ==0.5.3 @@ -2195,7 +2195,7 @@ default-package-overrides: - poly ==0.5.1.0 - poly-arity ==0.1.0 - polynomials-bernstein ==1.1.2 - - polyparse ==1.13 + - polyparse ==1.13.1 - polysemy ==1.9.2.0 - polysemy-fs ==0.1.0.0 - polysemy-plugin ==0.4.5.3 @@ -2441,7 +2441,7 @@ default-package-overrides: - rhythmic-sequences ==0.8.0.0 - riak-protobuf ==0.25.0.0 - richenv ==0.1.0.3 - - rio ==0.1.22.0 + - rio ==0.1.23.0 - rio-orphans ==0.1.2.0 - rio-prettyprint ==0.1.8.0 - rng-utils ==0.3.1 @@ -2597,7 +2597,7 @@ default-package-overrides: - shellify ==0.14.0.2 - shellmet ==0.0.5.0 - shelltestrunner ==1.10 - - shellwords ==0.1.4.4 + - shellwords ==0.1.4.6 - shelly ==1.12.1.1 - should-not-typecheck ==2.1.0 - show-combinators ==0.2.0.0 @@ -2783,7 +2783,7 @@ default-package-overrides: - swizzle-modify ==0.1.0.0 - swizzle-set ==0.2.0.0 - syb ==0.7.2.4 - - sydtest ==0.20.0.0 + - sydtest ==0.20.0.1 - sydtest-aeson ==0.2.0.1 - sydtest-amqp ==0.1.0.0 - sydtest-autodocodec ==0.0.0.0 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 6c207cb876cda..fda29889ccffb 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2422,12 +2422,16 @@ self: { }: mkDerivation { pname = "AvlTree"; - version = "4.2"; - sha256 = "0bw6856h75wks0mfvvqqm5i31sici1hacyl5zfj225jf9gn5q7dx"; + version = "4.3"; + sha256 = "1l4dg904lc4b659dc0flipbj73h6g8kh8g1yjgx077w992z4j8rr"; libraryHaskellDepends = [ base COrdering ]; + testHaskellDepends = [ + base + COrdering + ]; description = "Balanced binary trees using the AVL algorithm"; license = lib.licenses.bsd3; } @@ -45204,6 +45208,8 @@ self: { pname = "Unique"; version = "0.4.8.0"; sha256 = "1wv9dskvs2im5a97h3xm161sbqcbw81d7knk81y876ghqqf3hr56"; + revision = "1"; + editedCabalFile = "0cxifpgiq110618hzas1yz3g7ngcliw1skb9nahw3arsz3c3zifj"; libraryHaskellDepends = [ base containers @@ -48863,6 +48869,37 @@ self: { } ) { }; + Ztrategic = callPackage ( + { + mkDerivation, + base, + monadplus, + mtl, + random, + syb, + syz, + transformers, + ZipperAG, + }: + mkDerivation { + pname = "Ztrategic"; + version = "0.1.0"; + sha256 = "0720gmpijd89sma3699cqc2mwj60bz6gidrgfsnm0zw67saqcq1f"; + libraryHaskellDepends = [ + base + monadplus + mtl + random + syb + syz + transformers + ZipperAG + ]; + description = "Zipper-based library for strategic programming and attribute grammars"; + license = lib.licenses.mit; + } + ) { }; + Zwaluw = callPackage ( { mkDerivation, base }: mkDerivation { @@ -52729,8 +52766,8 @@ self: { }: mkDerivation { pname = "adblock2privoxy"; - version = "2.3.0"; - sha256 = "0aaz9kxvsyiwn0infzf9qlvq7wlrsamg4brr11332aljg8phnsmx"; + version = "2.3.1"; + sha256 = "1gnh8w56qkp1bsrdiydsyig6s4vzhg5zgw68hnl4s9fq99016qca"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -53897,8 +53934,8 @@ self: { }: mkDerivation { pname = "aeson-combinators"; - version = "0.1.2.1"; - sha256 = "10r3k8hi0rcvpi2868m4282zrnn57q7gj25ldhkja7mvz199wddz"; + version = "0.1.2.2"; + sha256 = "1lpkkjq411xkccrnkfnvg297s46myfpzncm1i89lb213a1agn3br"; libraryHaskellDepends = [ aeson attoparsec-aeson @@ -56879,6 +56916,68 @@ self: { } ) { }; + age = callPackage ( + { + mkDerivation, + attoparsec, + base, + base16, + base64, + bech32, + binary, + bytestring, + conduit, + conduit-extra, + crypton, + directory, + hedgehog, + memory, + mmorph, + mono-traversable, + mtl, + text, + transformers, + }: + mkDerivation { + pname = "age"; + version = "0.0.1.0"; + sha256 = "0zlx7q72yzk9zjks7720w0qvkdgib810c70v13pyldkgq7qjgim2"; + libraryHaskellDepends = [ + attoparsec + base + base64 + bech32 + binary + bytestring + conduit + conduit-extra + crypton + memory + mono-traversable + mtl + text + transformers + ]; + testHaskellDepends = [ + attoparsec + base + base16 + bytestring + conduit + conduit-extra + crypton + directory + hedgehog + memory + mmorph + mtl + text + ]; + description = "Actually Good Encryption"; + license = lib.licenses.mit; + } + ) { }; + agentx = callPackage ( { mkDerivation, @@ -81623,6 +81722,8 @@ self: { pname = "arbtt"; version = "0.12.0.3"; sha256 = "1wgc17fwnsqff8amwvv6jymhwjqrw653simv6gyxx89s1cla954d"; + revision = "1"; + editedCabalFile = "1kbma0ssjg8pd1rk9vi2bi7gy0fkfqpd6syh9271z350avgiwhf9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -88768,8 +88869,8 @@ self: { }: mkDerivation { pname = "attoparsec-isotropic"; - version = "0.14.5"; - sha256 = "1bvxy2gydz3kv0fbhp77bwk75l73kz7qc4aa7wlldga90f8y3vhj"; + version = "0.14.6"; + sha256 = "0jaw0qqaqkgysaqppg0a89ydrv6cvci7c0synckpbjwbr222zvvm"; libraryHaskellDepends = [ array base @@ -99784,6 +99885,7 @@ self: { large-generics, large-records, microlens, + optics-core, record-hasfield, sqlite-simple, tasty, @@ -99793,8 +99895,8 @@ self: { }: mkDerivation { pname = "beam-large-records"; - version = "0.1.2"; - sha256 = "193r7r9rnbqn3k8kq6s80dq8spvgbbnm9kn80xa7irp0qb2q25p6"; + version = "0.1.3"; + sha256 = "1bzxdzqh12m3l4q3whcpc3ig22z6jvqphfw28mscyam4vj9zwm21"; libraryHaskellDepends = [ base beam-core @@ -99808,7 +99910,7 @@ self: { ghc-prim large-generics large-records - microlens + optics-core record-hasfield sqlite-simple tasty @@ -108032,6 +108134,28 @@ self: { } ) { }; + bitmasks = callPackage ( + { + mkDerivation, + base, + hspec, + QuickCheck, + }: + mkDerivation { + pname = "bitmasks"; + version = "0"; + sha256 = "0wanpwhi4d5lpsa6rrgw45i7hcy0xgrjlqbf3ij0vic601a19gny"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base + hspec + QuickCheck + ]; + description = "Bitmasks for efficient storing of boolean flags"; + license = lib.licenses.bsd3; + } + ) { }; + bits = callPackage ( { mkDerivation, @@ -111778,19 +111902,6 @@ self: { }; bluefin = callPackage ( - { mkDerivation, bluefin-internal }: - mkDerivation { - pname = "bluefin"; - version = "0.0.16.0"; - sha256 = "12mvcawmm1b2n429lml86jqmnsha74nd6v45gd8sk288h9p4g3ks"; - libraryHaskellDepends = [ bluefin-internal ]; - description = "The Bluefin effect system"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.maralorn ]; - } - ) { }; - - bluefin_0_0_17_0 = callPackage ( { mkDerivation, bluefin-internal }: mkDerivation { pname = "bluefin"; @@ -111801,7 +111912,6 @@ self: { libraryHaskellDepends = [ bluefin-internal ]; description = "The Bluefin effect system"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.maralorn ]; } ) { }; @@ -111818,8 +111928,8 @@ self: { }: mkDerivation { pname = "bluefin-algae"; - version = "0.1.0.1"; - sha256 = "1mf7sfa6fj18sdbi78imxr7p90m4aqsi22c4pk1g7spb1wgp9aw5"; + version = "0.1.0.2"; + sha256 = "02g513vqn052qd41zm9brw8lf1ic4135mi8kr3s4w0721vm4nkhh"; libraryHaskellDepends = [ base bluefin @@ -111829,9 +111939,13 @@ self: { base bluefin tasty - tasty-bench tasty-hunit ]; + benchmarkHaskellDepends = [ + base + bluefin + tasty-bench + ]; description = "Algebraic effects and named handlers in Bluefin"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -111859,34 +111973,6 @@ self: { ) { }; bluefin-internal = callPackage ( - { - mkDerivation, - async, - base, - monad-control, - transformers, - transformers-base, - unliftio-core, - }: - mkDerivation { - pname = "bluefin-internal"; - version = "0.1.0.0"; - sha256 = "1106fij37sq7xnmb1zrvls94frqs9ard2nggiphmc2lpkcg71whz"; - libraryHaskellDepends = [ - async - base - monad-control - transformers - transformers-base - unliftio-core - ]; - testHaskellDepends = [ base ]; - description = "The Bluefin effect system, internals"; - license = lib.licenses.mit; - } - ) { }; - - bluefin-internal_0_1_1_0 = callPackage ( { mkDerivation, async, @@ -111911,7 +111997,6 @@ self: { testHaskellDepends = [ base ]; description = "The Bluefin effect system, internals"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -114179,8 +114264,8 @@ self: { }: mkDerivation { pname = "botan-bindings"; - version = "0.0.1.0"; - sha256 = "0svb55s3y93lj1nk1574dpvinzw1fcy306gl6dcxxszxfm9ndng9"; + version = "0.1.0.0"; + sha256 = "1lajqsnf6v03qh3xnksbxh2h2sz4hkrvqw2jy94swyy8abd8qbqs"; libraryHaskellDepends = [ base bytestring @@ -114207,8 +114292,8 @@ self: { }: mkDerivation { pname = "botan-low"; - version = "0.0.1.0"; - sha256 = "0bm4dilvy1hdpf9flx7686djp0bjs2v7zi9iq937a6f20vqqwzvd"; + version = "0.0.2.0"; + sha256 = "16sha2cd03n7g3lykvcsfmxadyv3iyq9898sv9xjvcndfii3wg25"; libraryHaskellDepends = [ base botan-bindings @@ -125122,6 +125207,8 @@ self: { pname = "cabal-rpm"; version = "2.3.0"; sha256 = "1scgf9npfjynj5b730zjk0yzyq74v2dghs0pwp2zg4kl0hxp6sw0"; + revision = "1"; + editedCabalFile = "1ji882k0kkpxzlw7c3f6b48k2wzzyy8yv5baadmy4j7npqxfsxqy"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -164684,40 +164771,6 @@ self: { ) { }; cpphs = callPackage ( - { - mkDerivation, - base, - directory, - polyparse, - time, - }: - mkDerivation { - pname = "cpphs"; - version = "1.20.9.1"; - sha256 = "17wi7fma2qaqdm1hwgaam3fd140v9bpa8ky0wg708h1pqc5v2nbz"; - revision = "2"; - editedCabalFile = "0vxav36p0kplp4dpd17i4cfzrsl3r437d840xwv83lf1bqp7mrxc"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base - directory - polyparse - time - ]; - executableHaskellDepends = [ - base - directory - polyparse - time - ]; - description = "A liberalised re-implementation of cpp, the C pre-processor"; - license = "LGPL"; - mainProgram = "cpphs"; - } - ) { }; - - cpphs_1_20_10 = callPackage ( { mkDerivation, base, @@ -164745,7 +164798,6 @@ self: { ]; description = "A liberalised re-implementation of cpp, the C pre-processor"; license = "LGPL"; - hydraPlatforms = lib.platforms.none; mainProgram = "cpphs"; } ) { }; @@ -180547,7 +180599,7 @@ self: { } ) { }; - dataframe_0_3_0_4 = callPackage ( + dataframe_0_3_1_2 = callPackage ( { mkDerivation, array, @@ -180558,7 +180610,6 @@ self: { containers, criterion, directory, - filepath, granite, hashable, HUnit, @@ -180566,7 +180617,6 @@ self: { random, random-shuffle, snappy-hs, - statistics, template-haskell, text, time, @@ -180576,8 +180626,8 @@ self: { }: mkDerivation { pname = "dataframe"; - version = "0.3.0.4"; - sha256 = "1s18jscs5x4m274v18zgbv0cx4m5x4jda1imacjd56jg7h0vd6sk"; + version = "0.3.1.2"; + sha256 = "1i7psdv11kcscdn7gj8qavmqhbdac2c9b0rkr89qdsqcsq933y5y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -180588,11 +180638,11 @@ self: { bytestring-lexing containers directory - filepath granite hashable + process + random snappy-hs - statistics template-haskell text time @@ -180601,55 +180651,25 @@ self: { zstd ]; executableHaskellDepends = [ - array - attoparsec base - bytestring - bytestring-lexing - containers - directory - granite - hashable random - snappy-hs - statistics - template-haskell text time vector - vector-algorithms - zstd ]; testHaskellDepends = [ - array - attoparsec base - bytestring - bytestring-lexing - containers - directory - granite - hashable HUnit random random-shuffle - snappy-hs - statistics - template-haskell text time vector - vector-algorithms - zstd ]; benchmarkHaskellDepends = [ base criterion process - random - text - time - vector ]; description = "A fast, safe, and intuitive DataFrame library"; license = lib.licenses.gpl3Plus; @@ -190033,8 +190053,8 @@ self: { }: mkDerivation { pname = "dhscanner-ast"; - version = "1.1.1"; - sha256 = "1bg93w9897ijh28gb13y41slwq5fxr6s9p3q13m8hzv9rva7zzhm"; + version = "1.1.2"; + sha256 = "0a98wz9b1d4qpl6d06s48djkgrccgriqd29sz8zk3fcrz0b24r5a"; libraryHaskellDepends = [ aeson base @@ -190064,8 +190084,8 @@ self: { }: mkDerivation { pname = "dhscanner-bitcode"; - version = "1.0.7"; - sha256 = "0z0hqn3f3p5wyk1l93rc14992snbxm2jsda624ix9p2jqj4b104j"; + version = "1.0.9"; + sha256 = "0fzi9hsjm3i8vgx0dc5bi6pa148i6144llgs1ss7fvkzi76pfxxm"; libraryHaskellDepends = [ aeson base @@ -191348,6 +191368,8 @@ self: { pname = "diagrams-pandoc"; version = "0.4.1"; sha256 = "1gil467zp3n6wymiw4d492izf1hhac01j4nafmahjh4ybvi840xr"; + revision = "1"; + editedCabalFile = "1pk9asxd89098hrqdvavk7hrqca9msmfvmk2ncs6kj6n5xifybgd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -191458,16 +191480,13 @@ self: { process, split, texrunner, - time, vector, zlib, }: mkDerivation { pname = "diagrams-pgf"; - version = "1.5"; - sha256 = "13zm00ayyk6gvlh4l2wdmrdqic386v69i3krylgvrajhdsd050al"; - revision = "1"; - editedCabalFile = "0vzi1dim76arwjrh9yqb9l2004ffsir8rws4vx26is5wzxsqf8y1"; + version = "1.5.0.1"; + sha256 = "0xx4zcqks3n67ffxvvq6vjw0iv2xnc5i2yjbvqmxjkkak4kxif2g"; libraryHaskellDepends = [ base bytestring @@ -191485,7 +191504,6 @@ self: { process split texrunner - time vector zlib ]; @@ -220386,6 +220404,134 @@ self: { } ) { }; + eventlog-live = callPackage ( + { + mkDerivation, + base, + bytestring, + dlist, + ghc-events, + hashable, + machines, + network, + optparse-applicative, + text, + transformers, + unliftio-core, + unordered-containers, + }: + mkDerivation { + pname = "eventlog-live"; + version = "0.1.0.0"; + sha256 = "0k4z9pddiwwcjsbg27xmwm2lqbn3py4lym87pcy6x5lv2jzl7rmh"; + libraryHaskellDepends = [ + base + bytestring + dlist + ghc-events + hashable + machines + network + optparse-applicative + text + transformers + unliftio-core + unordered-containers + ]; + doHaddock = false; + description = "Live processing of eventlog data"; + license = lib.licenses.agpl3Only; + } + ) { }; + + eventlog-live-influxdb = callPackage ( + { + mkDerivation, + base, + clock, + containers, + dlist, + eventlog-live, + ghc-events, + influxdb, + lens-family, + machines, + optparse-applicative, + text, + }: + mkDerivation { + pname = "eventlog-live-influxdb"; + version = "0.1.0.0"; + sha256 = "12vj02vksilcwzy283vmc7ikq19zjplikwakrz47b63qh8iy1shn"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base + clock + containers + dlist + eventlog-live + ghc-events + influxdb + lens-family + machines + optparse-applicative + text + ]; + description = "Stream eventlog data into InfluxDB"; + license = lib.licenses.agpl3Only; + mainProgram = "eventlog-live-influxdb"; + } + ) { }; + + eventlog-live-otelcol = callPackage ( + { + mkDerivation, + base, + bytestring, + dlist, + eventlog-live, + ghc-events, + grapesy, + hashable, + hs-opentelemetry-otlp, + lens-family, + machines, + optparse-applicative, + proto-lens, + random, + text, + unordered-containers, + }: + mkDerivation { + pname = "eventlog-live-otelcol"; + version = "0.1.0.0"; + sha256 = "19y4jz949z069n45cmhjmqdfs7iw1wpkiyxkrcq6f0cjwcc95j5k"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base + bytestring + dlist + eventlog-live + ghc-events + grapesy + hashable + hs-opentelemetry-otlp + lens-family + machines + optparse-applicative + proto-lens + random + text + unordered-containers + ]; + description = "Stream eventlog data to the OpenTelemetry Collector"; + license = lib.licenses.agpl3Only; + mainProgram = "eventlog-live-otelcol"; + } + ) { }; + eventlog-socket = callPackage ( { mkDerivation, base }: mkDerivation { @@ -223009,6 +223155,8 @@ self: { pname = "exon"; version = "1.7.2.0"; sha256 = "120cd6n7sqpakyk91izjblk92vc9bzr1a3bcskzkpky512mw47wm"; + revision = "1"; + editedCabalFile = "118n5y2bbbz2lyvnywipzmhdckv83g4lpzakcv15kd3h9hrlpa31"; libraryHaskellDepends = [ base ghc @@ -242394,8 +242542,8 @@ self: { }: mkDerivation { pname = "freckle-prelude"; - version = "0.0.3.0"; - sha256 = "0xnxrh3cniwlcjdjlxg1acdhfd51lpx2q112qhgynnfar866zbdc"; + version = "0.0.4.0"; + sha256 = "11qhlk66435qw2qkdmansd6x416ibck4xhd5298jciy53snhbhz8"; libraryHaskellDepends = [ base containers @@ -260073,8 +260221,8 @@ self: { }: mkDerivation { pname = "ghc-tcplugin-api"; - version = "0.17.2.0"; - sha256 = "01p6x6jppap6q82x8m5jw3rbzn60gqmap23x6lxq9jbn6am44vhv"; + version = "0.18.0.0"; + sha256 = "0zy4cxqwsaqv4y2czidi7052yznp78h3c5hyrkk9rwxn43ixx4bm"; libraryHaskellDepends = [ array base @@ -279836,13 +279984,12 @@ self: { hspec, hspec-discover, QuickCheck, - random, text, }: mkDerivation { pname = "granite"; - version = "0.3.0.0"; - sha256 = "0dax05bqkvfa6wj2v7xdqrm3k6jr9qjyax93xasbybsh2zh352dr"; + version = "0.3.0.1"; + sha256 = "1dpmyk89pzi2rfc1m0vxw9i0609fjhv9asbx1qzn5j1vpk79jkv2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -279851,7 +279998,6 @@ self: { ]; executableHaskellDepends = [ base - random text ]; testHaskellDepends = [ @@ -301329,8 +301475,8 @@ self: { }: mkDerivation { pname = "haskell-debugger"; - version = "0.7.0.0"; - sha256 = "18hx1jb6w8yzxh410fsi2lv7xv37gm2k9i7yfchhiqccgbr5zp2j"; + version = "0.8.0.0"; + sha256 = "0fniq0yr7fj7rznplhv6sxc2rlcmrjrvmpmz5a0838nmdgd24xbm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -310204,6 +310350,91 @@ self: { } ) { }; + hasql_1_9_3_2 = callPackage ( + { + mkDerivation, + aeson, + attoparsec, + base, + bytestring, + bytestring-strict-builder, + containers, + contravariant, + contravariant-extras, + criterion, + dlist, + hashable, + hspec, + hspec-discover, + iproute, + mtl, + postgresql-binary, + postgresql-libpq, + profunctors, + QuickCheck, + quickcheck-instances, + rerebase, + scientific, + testcontainers-postgresql, + text, + text-builder, + time, + transformers, + unordered-containers, + uuid, + vector, + witherable, + }: + mkDerivation { + pname = "hasql"; + version = "1.9.3.2"; + sha256 = "1qaiawgz9qrkw11p6z6spqsvwmcq6s4xjkl54cn3vpwqzyvfcacf"; + libraryHaskellDepends = [ + aeson + attoparsec + base + bytestring + bytestring-strict-builder + containers + contravariant + dlist + hashable + iproute + mtl + postgresql-binary + postgresql-libpq + profunctors + scientific + testcontainers-postgresql + text + text-builder + time + transformers + unordered-containers + uuid + vector + witherable + ]; + testHaskellDepends = [ + contravariant-extras + hspec + QuickCheck + quickcheck-instances + rerebase + testcontainers-postgresql + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + criterion + rerebase + ]; + doHaddock = false; + description = "Fast PostgreSQL driver with a flexible mapping API"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + } + ) { }; + hasql-backend = callPackage ( { mkDerivation, @@ -316807,8 +317038,8 @@ self: { { mkDerivation, base }: mkDerivation { pname = "heck"; - version = "0.2025.5.22"; - sha256 = "01lxh37sw8sjcmss34nh97im4l3vpdxy1wp7qxgdwynzgz6lf4s9"; + version = "1.0.0.0"; + sha256 = "1j318pv3afazvl7m65w2gbmhcddnyn3gxf25k36wkd6rlclzbnrh"; libraryHaskellDepends = [ base ]; description = "Abstract unit test interface"; license = lib.licenses.bsd0; @@ -327492,6 +327723,29 @@ self: { } ) { }; + hint-nix = callPackage ( + { + mkDerivation, + base, + hint, + include-env, + relude, + }: + mkDerivation { + pname = "hint-nix"; + version = "0.1.0.1"; + sha256 = "1wdbv1s3abza4min2h9q70q8ndjwwvn5w1rlzvd8d6p402diszf4"; + libraryHaskellDepends = [ + base + hint + include-env + relude + ]; + description = "Helper for using hint with Nix package databases"; + license = lib.licenses.agpl3Plus; + } + ) { }; + hint-server = callPackage ( { mkDerivation, @@ -329534,6 +329788,48 @@ self: { } ) { }; + hkgr_0_5 = callPackage ( + { + mkDerivation, + base, + bytestring, + directory, + extra, + filepath, + simple-cabal, + simple-cmd, + simple-cmd-args, + simple-prompt, + typed-process, + xdg-basedir, + }: + mkDerivation { + pname = "hkgr"; + version = "0.5"; + sha256 = "070np9w0dafzlq7mkh11qkm8jr4k9dj927gbhz9vg8xn2p81fxb7"; + isLibrary = false; + isExecutable = true; + enableSeparateDataOutput = true; + executableHaskellDepends = [ + base + bytestring + directory + extra + filepath + simple-cabal + simple-cmd + simple-cmd-args + simple-prompt + typed-process + xdg-basedir + ]; + description = "Simple Hackage release workflow for package maintainers"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + mainProgram = "hkgr"; + } + ) { }; + hkt = callPackage ( { mkDerivation, @@ -329912,7 +330208,7 @@ self: { } ) { }; - hledger_1_50 = callPackage ( + hledger_1_50_1 = callPackage ( { mkDerivation, aeson, @@ -329960,8 +330256,8 @@ self: { }: mkDerivation { pname = "hledger"; - version = "1.50"; - sha256 = "140yg0nds681dk2g4lyldvjlwcb3v8lg2dd82vi7zp5i9af2v9k8"; + version = "1.50.1"; + sha256 = "1l15kdq074v88qk7h08rahw7pihs3sk417r6cr50jk9bbdiamz4y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -330326,8 +330622,8 @@ self: { pname = "hledger-iadd"; version = "1.3.21"; sha256 = "00x0vbfp08kqs1nbknndk9h56hcidf6xnrk0ldz45dvjrmgcv3w2"; - revision = "10"; - editedCabalFile = "0138k01cba9xd3sab6kjh59rfxn96w2h21gjl579xqq76yvbibni"; + revision = "11"; + editedCabalFile = "16v21gwa4zkwjmg5ys4zchajv5k0dbk22vvr9hwfdwb7g21h3dvf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -330392,6 +330688,102 @@ self: { } ) { }; + hledger-iadd_1_3_22 = callPackage ( + { + mkDerivation, + base, + brick, + containers, + directory, + free, + hledger-lib, + hspec, + hspec-discover, + megaparsec, + microlens, + microlens-mtl, + microlens-th, + optparse-applicative, + QuickCheck, + quickcheck-instances, + text, + text-zipper, + time, + transformers, + unordered-containers, + vector, + vty, + xdg-basedir, + }: + mkDerivation { + pname = "hledger-iadd"; + version = "1.3.22"; + sha256 = "077v7jgqhmpkg8m68bg4qi0jxl4zkg17aqk5n58ni3s2h71lkwlv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base + brick + containers + directory + free + hledger-lib + megaparsec + microlens + microlens-mtl + microlens-th + optparse-applicative + text + text-zipper + time + transformers + unordered-containers + vector + vty + xdg-basedir + ]; + executableHaskellDepends = [ + base + brick + directory + free + hledger-lib + megaparsec + microlens + microlens-mtl + microlens-th + optparse-applicative + text + text-zipper + time + transformers + unordered-containers + vector + vty + xdg-basedir + ]; + testHaskellDepends = [ + base + free + hledger-lib + hspec + megaparsec + QuickCheck + quickcheck-instances + text + text-zipper + time + transformers + vector + ]; + testToolDepends = [ hspec-discover ]; + description = "A terminal UI as drop-in replacement for hledger add"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "hledger-iadd"; + } + ) { }; + hledger-interest = callPackage ( { mkDerivation, @@ -330623,7 +331015,7 @@ self: { } ) { }; - hledger-lib_1_50 = callPackage ( + hledger-lib_1_50_1 = callPackage ( { mkDerivation, aeson, @@ -330678,8 +331070,8 @@ self: { }: mkDerivation { pname = "hledger-lib"; - version = "1.50"; - sha256 = "1fk579j56wbxxk3bz4m9hwfkdb02mz374y72bplbrf3y40cd2a48"; + version = "1.50.1"; + sha256 = "0fqx9bb5mvx0c7b577jl3ypl63rwizsjs7g24x5vv0f99slwrqs2"; libraryHaskellDepends = [ aeson aeson-pretty @@ -330989,7 +331381,7 @@ self: { } ) { }; - hledger-ui_1_50 = callPackage ( + hledger-ui_1_50_1 = callPackage ( { mkDerivation, ansi-terminal, @@ -331014,6 +331406,7 @@ self: { process, safe, split, + stm, text, text-zipper, time, @@ -331025,8 +331418,8 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "1.50"; - sha256 = "15kn2yy44jpn0ag6248z0cmp3rkbdcxbbr02am41jlg6igv9kqkq"; + version = "1.50.1"; + sha256 = "016az8nimfvdwfxk27r6kw2px601axir9ixza4rv12pf05gaidxh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -331052,6 +331445,7 @@ self: { process safe split + stm text text-zipper time @@ -331225,7 +331619,7 @@ self: { } ) { }; - hledger-web_1_50 = callPackage ( + hledger-web_1_50_1 = callPackage ( { mkDerivation, aeson, @@ -331280,8 +331674,8 @@ self: { }: mkDerivation { pname = "hledger-web"; - version = "1.50"; - sha256 = "04zmvlyij95v31v6p9124jicpgv7mbz2141j60ci18ci17r48fd8"; + version = "1.50.1"; + sha256 = "1rfj8mkrf56hx26n9j1l6na684a9x2rlqafxjfaknkyfb6hdldyj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -334784,8 +335178,8 @@ self: { }: mkDerivation { pname = "hmp3-ng"; - version = "2.16.2"; - sha256 = "0n46rjl52vcwmliqaisi6jw9b4phwdcy5b60sq71k76zfhhffybn"; + version = "2.17.0"; + sha256 = "131mwn1vcyd2q73cj00vx8silhnacb9nbiba20c6i95kgsblnm0s"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -335491,8 +335885,8 @@ self: { }: mkDerivation { pname = "hnix-store-db"; - version = "0.1.0.0"; - sha256 = "1g3wpmjnbzhllw5q85zp1ckkqhlhhmpbm9lq1bd8ax8vq8kzx97v"; + version = "0.1.0.1"; + sha256 = "1m6b601cs47rr0v2vbgskhb27i03fp90i914q1wiicf2jlwlk88j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -343763,8 +344157,8 @@ self: { }: mkDerivation { pname = "hs-asapo"; - version = "0.9.1"; - sha256 = "0rmmmxfpx2s69jca5rd7jnxb075qjx6b6s97vnsd1gvgcjwal2li"; + version = "0.9.2"; + sha256 = "1adggnrf6i0vm7gq343ja6cvcll1mz4cq0ljlhda1y1c9iqpwhc9"; setupHaskellDepends = [ base cabal-doctest @@ -350807,7 +351201,7 @@ self: { } ) { }; - hsinstall_2_9 = callPackage ( + hsinstall_2_10 = callPackage ( { mkDerivation, base, @@ -350817,16 +351211,16 @@ self: { filepath, formatting, heredoc, - optparse-applicative, - prettyprinter, + optparse-applicative-dex, process, safe-exceptions, + text, transformers, }: mkDerivation { pname = "hsinstall"; - version = "2.9"; - sha256 = "0lnby8681spli3qr43mybhcj6l2klfphfzja2gnapqwcm7d894r1"; + version = "2.10"; + sha256 = "088xdvjkbdazsfm3gvlpalyxqgy8kwa5rfz3m0f9m394c8kf2yvi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -350842,10 +351236,10 @@ self: { filepath formatting heredoc - optparse-applicative - prettyprinter + optparse-applicative-dex process safe-exceptions + text transformers ]; description = "Install Haskell software"; @@ -352932,8 +353326,8 @@ self: { }: mkDerivation { pname = "hspec"; - version = "2.11.12"; - sha256 = "1zdgkn0gkcphcsfqcqwcfqiqvkz12ljks46v3czpaysndz8icfip"; + version = "2.11.13"; + sha256 = "10f4gbr74zwnnw6vfc2wynsmf1ag7kgncvkby6zir8ydzl96407i"; libraryHaskellDepends = [ base hspec-core @@ -352984,8 +353378,8 @@ self: { }: mkDerivation { pname = "hspec-api"; - version = "2.11.12"; - sha256 = "1xn2b2hafyq6qm3zaia9nw27ir4cg8v2qn499bz2zwnp2vkjra07"; + version = "2.11.13"; + sha256 = "1dsq2f2lrx74n3algmwnmrqf9mz52w4h5zj7lp9ssrsdca2g1f8g"; libraryHaskellDepends = [ base hspec-core @@ -353146,10 +353540,8 @@ self: { }: mkDerivation { pname = "hspec-core"; - version = "2.11.12"; - sha256 = "030400w95775jrivbi7n1nnx6j5z717rqd3986ggklb8h9hjalfc"; - revision = "1"; - editedCabalFile = "0yq9nnawcgbgxiz4ymfa8k66jrvgrhmv8j7g880x8k6q8q4ncqlq"; + version = "2.11.13"; + sha256 = "098bcwld4qh2gzsdk992brkxc8bjsm9wsrz13jm0amiwj1i6qay8"; libraryHaskellDepends = [ ansi-terminal array @@ -353259,8 +353651,8 @@ self: { }: mkDerivation { pname = "hspec-discover"; - version = "2.11.12"; - sha256 = "044vgsy45ff00h9z2k3jgn2m37npcjiacc4cifahrjlmwa7a7ylp"; + version = "2.11.13"; + sha256 = "0vqji1g6g9714s73acx20v5m58rgw5xpmivav7x1k2ljmj9aryfh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -353590,6 +353982,8 @@ self: { pname = "hspec-golden"; version = "0.2.2.0"; sha256 = "1wpn9ll8x3gr0y86f5s9266x94jlc6hh778vc0npdynabipirwbs"; + revision = "1"; + editedCabalFile = "07n1fyqq1caaky2bn5d410srg6bfcmyxlcxr5vpsjhxcmbic1dca"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -353969,10 +354363,8 @@ self: { }: mkDerivation { pname = "hspec-meta"; - version = "2.11.12"; - sha256 = "1612pg5gihqjxrzqqvbbgckaqiwq3rmz3rg07lrjhzklg975nj69"; - revision = "2"; - editedCabalFile = "1jrk14s51psb0zjici56220iyb98i3q06sd3rsyx594s3cddgn5d"; + version = "2.11.13"; + sha256 = "02bhmhgrnzmwx1yd897yprwal590sim2kkaxdgbhijmpkzn6y2ds"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -355351,8 +355743,8 @@ self: { }: mkDerivation { pname = "hsqml"; - version = "0.3.6.1"; - sha256 = "0wvnxc3kad9ja4s16n9nj6nqknckal93ifbprq6nwd0x5i6zvknm"; + version = "0.3.7.0"; + sha256 = "1r4mf15gnfghmjdpkxn33ibc1diyfpzdfj54i4h10sjfnx6xg895"; setupHaskellDepends = [ base Cabal @@ -355363,9 +355755,7 @@ self: { base bytestring containers - directory filepath - QuickCheck tagged text transformers @@ -373147,6 +373537,7 @@ self: { { mkDerivation, aeson, + attoparsec-aeson, base, bytestring, HsOpenSSL, @@ -373154,23 +373545,26 @@ self: { http-streams, io-streams, neat-interpolation, + network-uri, retry, + safe-exceptions, text, }: mkDerivation { pname = "ihp-openai"; - version = "1.3.0"; - sha256 = "1736f8w1696d5db9shdhqxq1gdng1gh1mijn2rnynrh8lsnndwa4"; - revision = "1"; - editedCabalFile = "03g2mz1vfxcfv02675nh33643k4baw2chx1vc9ij6p76868l1nk7"; + version = "1.4.0"; + sha256 = "0npcnqdfmqv979gfn7iyl5p76hkggblc9n82z056wppj0i9q0i86"; libraryHaskellDepends = [ aeson + attoparsec-aeson base bytestring HsOpenSSL http-streams io-streams + network-uri retry + safe-exceptions text ]; testHaskellDepends = [ @@ -393940,8 +394334,8 @@ self: { }: mkDerivation { pname = "jukebox"; - version = "0.5.8"; - sha256 = "1pb7z95cmqaxbmba2grrbf8dm56821y40v12l4402milnahzl3k9"; + version = "0.5.9"; + sha256 = "0nnlqivvsp158wdmbz1xazl1bjyd2g3w41q43plmn8igsifnv6xa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -408892,12 +409286,13 @@ self: { containers, generic-deriving, ghc, - ghc-prim, + ghc-internal, large-generics, mtl, newtype, + optics-core, + optics-th, primitive, - record-dot-preprocessor, record-hasfield, syb, tasty, @@ -408907,16 +409302,16 @@ self: { }: mkDerivation { pname = "large-records"; - version = "0.4.3"; - sha256 = "0byhs4dr86l0shqhhj3nnwcfqb8a08363w212gjqnm3kbvh18nsy"; + version = "0.4.4"; + sha256 = "15mk1n86y6lx7ycjraz4lzwqn7rb52qikmgwqd68sq9znfq802rj"; libraryHaskellDepends = [ base containers ghc large-generics mtl + optics-core primitive - record-dot-preprocessor record-hasfield syb template-haskell @@ -408925,11 +409320,12 @@ self: { testHaskellDepends = [ base generic-deriving - ghc-prim + ghc-internal large-generics mtl newtype - record-dot-preprocessor + optics-core + optics-th record-hasfield tasty tasty-hunit @@ -422253,8 +422649,8 @@ self: { pname = "list-shuffle"; version = "1.0.0.1"; sha256 = "1qcgkkhwnbrl729va8zgv5k6b4lpfy15bbkqnnx0nqz0d91xiqcr"; - revision = "3"; - editedCabalFile = "0hk8js5b59xr23fq58f9zp179cjcysnwaadsagz05jk3877vqzsw"; + revision = "4"; + editedCabalFile = "14r8qf3nm81qm4ycfpxrh513j9i1x8q78brrclxfpixh3prb5bm2"; libraryHaskellDepends = [ base primitive @@ -423039,8 +423435,8 @@ self: { { mkDerivation, base }: mkDerivation { pname = "literally"; - version = "0.2025.9.10"; - sha256 = "14g4m2qkaq6aanan8wrxawd44c8b6br0kcmhwrwk6k531564bjng"; + version = "1.0.0.0"; + sha256 = "0ckprvl1f1iy3960d8wgal3pl54i5b47qlsimgr6i2r6vlqciv0y"; libraryHaskellDepends = [ base ]; description = "Type-safe conversion of type literals into runtime values"; license = lib.licenses.bsd0; @@ -438947,6 +439343,8 @@ self: { pname = "matrix-client"; version = "0.1.6.1"; sha256 = "0nr1nk6mxvrs0dspy315pviid7db7ry889y9gsg1i3a0pn3dna08"; + revision = "1"; + editedCabalFile = "1n6zv3chb8x5aya14qpcbyssr16labwypbbxfh0zp7kcfmy9acf8"; libraryHaskellDepends = [ aeson aeson-casing @@ -466009,6 +466407,63 @@ self: { } ) { }; + musig2 = callPackage ( + { + mkDerivation, + base, + base16-bytestring, + binary, + bytestring, + containers, + criterion, + deepseq, + entropy, + ppad-secp256k1, + ppad-sha256, + tasty, + tasty-hunit, + tasty-quickcheck, + }: + mkDerivation { + pname = "musig2"; + version = "0.1.0"; + sha256 = "02398ib1jxb41ksxf1mxzqfbj53dz1gfz87a05fym3jywf2yf2ml"; + libraryHaskellDepends = [ + base + base16-bytestring + binary + bytestring + containers + entropy + ppad-secp256k1 + ppad-sha256 + ]; + testHaskellDepends = [ + base + base16-bytestring + binary + bytestring + containers + entropy + ppad-secp256k1 + ppad-sha256 + tasty + tasty-hunit + tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base + base16-bytestring + bytestring + criterion + deepseq + ppad-secp256k1 + ]; + description = "MuSig2 library"; + license = lib.licenses.mit; + } + ) { }; + mustache = callPackage ( { mkDerivation, @@ -470263,6 +470718,102 @@ self: { } ) { }; + nbparts = callPackage ( + { + mkDerivation, + aeson, + aeson-pretty, + base, + base64-bytestring, + bytestring, + commonmark, + containers, + crypton, + directory, + filepath, + hedgehog, + hspec, + hspec-discover, + hspec-hedgehog, + ipynb, + libyaml, + megaparsec, + memory, + mime-types, + mtl, + optparse-applicative, + parsec, + req, + scientific, + temporary, + text, + transformers, + vector, + yaml, + }: + mkDerivation { + pname = "nbparts"; + version = "0.1.1.0"; + sha256 = "18nmi2z41d1smxia0fyyii855phwmc3ac3bpd3hlixp8fnpr66g1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson + aeson-pretty + base + base64-bytestring + bytestring + commonmark + containers + crypton + directory + filepath + ipynb + libyaml + megaparsec + memory + mime-types + mtl + parsec + text + transformers + yaml + ]; + executableHaskellDepends = [ + base + mtl + optparse-applicative + text + ]; + testHaskellDepends = [ + aeson + base + bytestring + commonmark + containers + directory + filepath + hedgehog + hspec + hspec-hedgehog + ipynb + mime-types + mtl + parsec + req + scientific + temporary + text + vector + yaml + ]; + testToolDepends = [ hspec-discover ]; + description = "Unpack a Jupyter notebook into its sources, metadata and outputs"; + license = lib.licenses.asl20; + mainProgram = "nbparts"; + } + ) { }; + nbt = callPackage ( { mkDerivation, @@ -483641,6 +484192,8 @@ self: { pname = "nvfetcher"; version = "0.7.0.0"; sha256 = "0idcca3g1rfm8rc7zy68pdbhv4s0npdzdb47ixj0hk2pr8rg51ak"; + revision = "1"; + editedCabalFile = "0pkcsb97x64fnrrs93l73k1yydrnswh8drwdab90c4ac9wjjxvk8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -489648,6 +490201,7 @@ self: { http-api-data, http-client, http-client-tls, + http-types, servant, servant-client, servant-multipart-api, @@ -489660,8 +490214,8 @@ self: { }: mkDerivation { pname = "openai"; - version = "1.1.1"; - sha256 = "18ny5r06nfs7px4bgr9k930w1v5ksbzc1vslx75y4bb1lndg3ipd"; + version = "1.2.0"; + sha256 = "1aglz81qz2438gg2rhgi2bbxx9inbljkp795iqimgcg40z48jzy9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -489673,6 +490227,7 @@ self: { http-api-data http-client http-client-tls + http-types servant servant-client servant-multipart-api @@ -492974,6 +493529,58 @@ self: { } ) { }; + opt-env-conf_0_10_0_0 = callPackage ( + { + mkDerivation, + aeson, + autodocodec, + autodocodec-nix, + autodocodec-schema, + autodocodec-yaml, + base, + containers, + hashable, + mtl, + path, + path-io, + safe-coloured-text, + safe-coloured-text-layout, + safe-coloured-text-terminfo, + selective, + text, + validity, + validity-containers, + }: + mkDerivation { + pname = "opt-env-conf"; + version = "0.10.0.0"; + sha256 = "0vkvl0jpw83ipy2rzia6x3h8ng4s2ixdp1h8jl3syvqjb151s2b7"; + libraryHaskellDepends = [ + aeson + autodocodec + autodocodec-nix + autodocodec-schema + autodocodec-yaml + base + containers + hashable + mtl + path + path-io + safe-coloured-text + safe-coloured-text-layout + safe-coloured-text-terminfo + selective + text + validity + validity-containers + ]; + description = "Settings parsing for Haskell: command-line arguments, environment variables, and configuration values"; + license = lib.licenses.lgpl3Only; + hydraPlatforms = lib.platforms.none; + } + ) { }; + opt-env-conf-test = callPackage ( { mkDerivation, @@ -499414,6 +500021,8 @@ self: { pname = "pandoc-crossref"; version = "0.3.21"; sha256 = "1srfkh987jx3ha8p5yrvy4pxkkypcajb4wvzbnf8sbd4wc2vichh"; + revision = "1"; + editedCabalFile = "195b06n5kjqzjhsh7hxhzxpadf0s52d5daxh0jry3wzf0vgzkw4p"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -522499,6 +523108,8 @@ self: { pname = "plots"; version = "0.1.1.5"; sha256 = "0dgjg1idfhmnzdy7c2my1ri98psbm8jq67ssnb2iss4ay9fs13fw"; + revision = "1"; + editedCabalFile = "0fp1i55arir0p9gvxgadq29v06p4qkqbrf14qd4nnfjry5i8pgqg"; libraryHaskellDepends = [ adjunctions base @@ -523026,8 +523637,8 @@ self: { }: mkDerivation { pname = "pms-domain-model"; - version = "0.1.0.0"; - sha256 = "0y6xi7mqrvl1fp87nxyrx7jfbh8rwmgm5wmcvw9am7mqc7kz2scy"; + version = "0.1.1.0"; + sha256 = "1syw48m2szvj6z5j2yn5g694gnjhsrvh8n1c22ifj91v1n85sqah"; libraryHaskellDepends = [ aeson async @@ -525404,29 +526015,6 @@ self: { ) { }; polyparse = callPackage ( - { - mkDerivation, - base, - bytestring, - text, - }: - mkDerivation { - pname = "polyparse"; - version = "1.13"; - sha256 = "0yvhg718dlksiw3v27m2d8m1sn4r4f5s0p56zq3lynhy1sc74k0w"; - revision = "9"; - editedCabalFile = "0abzqic0askffn6nmh1f08d9rd9fykdlcdd9gj1c7p1ykp9zlq29"; - libraryHaskellDepends = [ - base - bytestring - text - ]; - description = "A variety of alternative parser combinator libraries"; - license = "LGPL"; - } - ) { }; - - polyparse_1_13_1 = callPackage ( { mkDerivation, base, @@ -525444,7 +526032,6 @@ self: { ]; description = "A variety of alternative parser combinator libraries"; license = "LGPL"; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -531289,13 +531876,14 @@ self: { postgresql-libpq, postgresql-simple, scientific, + template-haskell, text, time, }: mkDerivation { pname = "postgresql-simple-interval"; - version = "1.0.0.0"; - sha256 = "01d550bhmbpy3bsz37m21hpgpg9x2v72qhv6fa2p0m6p61p1hadx"; + version = "1.0.1.0"; + sha256 = "1qwcywyiw9y5bnvzb0ji32q3yh5fs5nxiw17gr4q4yk0wi01rw92"; libraryHaskellDepends = [ attoparsec base @@ -531303,6 +531891,7 @@ self: { persistent postgresql-simple scientific + template-haskell text time ]; @@ -544508,8 +545097,8 @@ self: { }: mkDerivation { pname = "pty-mcp-server"; - version = "0.1.2.0"; - sha256 = "17mczija7br6l2c4x8svjn60si6hxlv6iy5zwf1l42y2sv5y9hh9"; + version = "0.1.3.0"; + sha256 = "0440npilxvpkny8m37500ggrdc438hn94qvzrr70ip2pqsr2wdwl"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -550064,8 +550653,8 @@ self: { pname = "queues"; version = "1.0.0"; sha256 = "0mnn6lgd7101lrmwqy4lf04ncq8ci2kfxydm1rlh879gjvzz3lsr"; - revision = "5"; - editedCabalFile = "00qbr5h2k6hkykfsw6qqqz8krfd06hvridpzijyvdskg97pggjv5"; + revision = "6"; + editedCabalFile = "0hbjkkcg8g4mfngpik5fz720k3nsqk7abykikslniqv3g348wh2q"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base @@ -574868,8 +575457,8 @@ self: { }: mkDerivation { pname = "rio"; - version = "0.1.22.0"; - sha256 = "0rpc4f2yvw0y6mqz9ykm3778j6srya7ssww691kpf9nb8vddgjb6"; + version = "0.1.23.0"; + sha256 = "089bj6wqh872iy64ivk2wq9g4zb1748kj1wrgk2aa1j5pfbh1cic"; libraryHaskellDepends = [ base bytestring @@ -576186,6 +576775,76 @@ self: { } ) { }; + robin-hood-profit = callPackage ( + { + mkDerivation, + attoparsec-isotropic, + base, + bytestring, + containers, + Decimal, + directory, + exceptions, + filepath, + generic-lens, + lens, + mtl, + optparse-applicative, + relude, + semigroups, + tasty, + tasty-discover, + tasty-hunit, + tasty-quickcheck, + template-haskell, + text, + time, + trace-embrace, + }: + mkDerivation { + pname = "robin-hood-profit"; + version = "0.0.2"; + sha256 = "164qaimp3q6jbdzm4mfq1ynj5bhh5qpzgd04qqmhn4frd5vndi9x"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec-isotropic + base + bytestring + containers + Decimal + directory + exceptions + filepath + generic-lens + lens + mtl + optparse-applicative + relude + semigroups + template-haskell + text + time + trace-embrace + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + attoparsec-isotropic + base + relude + tasty + tasty-discover + tasty-hunit + tasty-quickcheck + text + ]; + testToolDepends = [ tasty-discover ]; + description = "Calculate per instrument profit from Robin-Hood activity report"; + license = lib.licenses.bsd3; + mainProgram = "rhprofit"; + } + ) { }; + roboservant = callPackage ( { mkDerivation, @@ -576221,8 +576880,8 @@ self: { }: mkDerivation { pname = "roboservant"; - version = "0.1.0.3"; - sha256 = "1qcxhmppvpbibzq6mmqzz891pmi9c6cjjvxjyn8vlhvydgklh6x4"; + version = "0.1.0.4"; + sha256 = "06lna80a0y9bzbbqa32jjrjf7nkgwzdg68ilmr9gf9ss7a8yvljl"; libraryHaskellDepends = [ base bytestring @@ -576316,6 +576975,7 @@ self: { directory, heredoc, hspec, + hspec-discover, old-locale, QuickCheck, time, @@ -576323,8 +576983,8 @@ self: { }: mkDerivation { pname = "robots-txt"; - version = "0.4.1.8"; - sha256 = "0f6s07zdzjjhx4vk2khrh6y2mhfgjxlg3y3l07riiy171qzp9gkd"; + version = "0.4.1.9"; + sha256 = "0fv6wfp3p6p31v6v18p75k7n7fsj11p0kir3f55c4zbcw20fmf1w"; libraryHaskellDepends = [ attoparsec base @@ -576342,6 +577002,7 @@ self: { QuickCheck transformers ]; + testToolDepends = [ hspec-discover ]; description = "Parser for robots.txt"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -583824,8 +584485,8 @@ self: { }: mkDerivation { pname = "sandwich-contexts-kubernetes"; - version = "0.1.1.1"; - sha256 = "186xbfpx2fgvckzmagmxw3cyp6k1avk3jvdii9857i3xwccinc1s"; + version = "0.1.2.0"; + sha256 = "19nvallfy3cqwapdsgxp6pwnxrqycb10awlgac9hx5l6m3qmp7w5"; libraryHaskellDepends = [ aeson base @@ -584229,14 +584890,13 @@ self: { } ) { }; - sandwich-webdriver_0_4_0_1 = callPackage ( + sandwich-webdriver_0_4_0_2 = callPackage ( { mkDerivation, aeson, base, bytestring, containers, - data-default, directory, exceptions, filepath, @@ -584245,11 +584905,8 @@ self: { http-conduit, http-types, microlens, - microlens-aeson, - monad-control, monad-logger, mtl, - network, process, random, regex-tdfa, @@ -584266,19 +584923,17 @@ self: { unliftio, unliftio-core, unordered-containers, - vector, webdriver, }: mkDerivation { pname = "sandwich-webdriver"; - version = "0.4.0.1"; - sha256 = "1q2ipwvyn4l9zch5h6cgbvgcjbrywpc5zrz2y9bdlbhdpdk9a2iv"; + version = "0.4.0.2"; + sha256 = "1ixcq0vffy4awfv5dimkdq9yzkrbnjm046vsls6pvy1b5dlp9nb6"; libraryHaskellDepends = [ aeson base bytestring containers - data-default directory exceptions filepath @@ -584287,11 +584942,8 @@ self: { http-conduit http-types microlens - microlens-aeson - monad-control monad-logger mtl - network process random regex-tdfa @@ -584308,7 +584960,6 @@ self: { unliftio unliftio-core unordered-containers - vector webdriver ]; testHaskellDepends = [ @@ -584316,7 +584967,6 @@ self: { base bytestring containers - data-default directory exceptions filepath @@ -584325,11 +584975,8 @@ self: { http-conduit http-types microlens - microlens-aeson - monad-control monad-logger mtl - network process random regex-tdfa @@ -584346,7 +584993,6 @@ self: { unliftio unliftio-core unordered-containers - vector webdriver ]; description = "Sandwich integration with Selenium WebDriver"; @@ -584878,7 +585524,7 @@ self: { } ) { }; - saturn_1_1_0_0 = callPackage ( + saturn_1_1_0_1 = callPackage ( { mkDerivation, base, @@ -584893,8 +585539,8 @@ self: { }: mkDerivation { pname = "saturn"; - version = "1.1.0.0"; - sha256 = "0qwv38aas0lv01bgbdrl60bikkpx7wm1zij7jyyb07y4615ssrjx"; + version = "1.1.0.1"; + sha256 = "0dxk2qs8af1x1riy92hcmqm2aid83v7rg3pn7kk8i35w3czza33l"; libraryHaskellDepends = [ base containers @@ -585281,6 +585927,81 @@ self: { } ) { }; + sbp_6_3_0 = callPackage ( + { + mkDerivation, + aeson, + aeson-pretty, + array, + base, + base64-bytestring, + basic-prelude, + binary, + binary-conduit, + bytestring, + cmdargs, + conduit, + conduit-extra, + data-binary-ieee754, + lens, + lens-aeson, + monad-loops, + resourcet, + tasty, + tasty-hunit, + template-haskell, + text, + time, + yaml, + }: + mkDerivation { + pname = "sbp"; + version = "6.3.0"; + sha256 = "0s8v31ivnsxm0wnxzbx4s1c0z5hfndkpq91fnfg0zq6bmlwc504w"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson + array + base + base64-bytestring + basic-prelude + binary + bytestring + data-binary-ieee754 + lens + lens-aeson + monad-loops + template-haskell + text + ]; + executableHaskellDepends = [ + aeson + aeson-pretty + base + basic-prelude + binary-conduit + bytestring + cmdargs + conduit + conduit-extra + lens + resourcet + time + yaml + ]; + testHaskellDepends = [ + base + basic-prelude + tasty + tasty-hunit + ]; + description = "SwiftNav's SBP Library"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + } + ) { }; + sbp2udp = callPackage ( { mkDerivation, @@ -607037,8 +607758,8 @@ self: { }: mkDerivation { pname = "shellwords"; - version = "0.1.4.4"; - sha256 = "1609i2s68hx3h9zbjyfwdj286w1acrd8z9m7g7f9slbdk9ps3hn5"; + version = "0.1.4.6"; + sha256 = "00jadd023d3c03d9l69i2dif8zw7x9pdjfxwr2923sv7pc03pqd8"; libraryHaskellDepends = [ base megaparsec @@ -609038,6 +609759,7 @@ self: { case-insensitive, crypton, exceptions, + heck, http-types, memory, tasty, @@ -609048,14 +609770,15 @@ self: { }: mkDerivation { pname = "signet"; - version = "0.2025.5.21"; - sha256 = "01rrc4l5a4vl2mmymckdl5shicgx7n909nzdqn8xnk8626whc93p"; + version = "1.0.0.0"; + sha256 = "1wpjsxknlbd2wxiv93mjypcw4s0cryyc4pavgl6dfygwrbb83z8r"; libraryHaskellDepends = [ base bytestring case-insensitive crypton exceptions + heck http-types memory text @@ -609063,6 +609786,7 @@ self: { ]; testHaskellDepends = [ base + heck tasty tasty-hunit transformers @@ -609808,6 +610532,34 @@ self: { } ) { }; + simple-cabal_0_2_0 = callPackage ( + { + mkDerivation, + base, + bytestring, + Cabal, + directory, + filepath, + safe, + }: + mkDerivation { + pname = "simple-cabal"; + version = "0.2.0"; + sha256 = "1mrsa53sacjji56xj3wkp2yd0skblrxnqzq7myy60a7nk6brb30g"; + libraryHaskellDepends = [ + base + bytestring + Cabal + directory + filepath + safe + ]; + description = "Cabal compatibility wrapper library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + simple-cairo = callPackage ( { mkDerivation, @@ -628935,6 +629687,7 @@ self: { generics-sop, hspec, postgresql-syntax, + scientific, squeal-postgresql, template-haskell, text, @@ -628943,14 +629696,15 @@ self: { }: mkDerivation { pname = "squeal-postgresql-qq"; - version = "0.1.3.0"; - sha256 = "04kfccn22ik76fgr9bhlk9rh0ldyk010icr1rbzqs6mj3iddyd3w"; + version = "0.1.4.0"; + sha256 = "11mzdng0828r5l00zxk7w9s24f3h666n5sin79rzhdraisqfv35j"; libraryHaskellDepends = [ aeson base bytestring generics-sop postgresql-syntax + scientific squeal-postgresql template-haskell text @@ -628964,6 +629718,7 @@ self: { generics-sop hspec postgresql-syntax + scientific squeal-postgresql template-haskell text @@ -648013,8 +648768,8 @@ self: { }: mkDerivation { pname = "sydtest"; - version = "0.20.0.0"; - sha256 = "0f1ipp6wqykkyiibn1prx61ysvydf4bybiqg5mlzgi5h1cnqh22i"; + version = "0.20.0.1"; + sha256 = "1jnks9znjr4ar6x4a6965w6yijcd80ci6z5qwln4v98ls1a81x19"; libraryHaskellDepends = [ async autodocodec @@ -648048,7 +648803,7 @@ self: { } ) { }; - sydtest_0_20_0_1 = callPackage ( + sydtest_0_21_0_0 = callPackage ( { mkDerivation, async, @@ -648080,8 +648835,8 @@ self: { }: mkDerivation { pname = "sydtest"; - version = "0.20.0.1"; - sha256 = "1jnks9znjr4ar6x4a6965w6yijcd80ci6z5qwln4v98ls1a81x19"; + version = "0.21.0.0"; + sha256 = "07rxvpjvp8q0jfr6brljz5jpmsxv64755dhlklb4jxmcqf9f75n4"; libraryHaskellDepends = [ async autodocodec @@ -652087,8 +652842,8 @@ self: { pname = "system-linux-proc"; version = "0.1.1.1"; sha256 = "12nvsvmchhsqs5f3x2075v8v68inb1xz8dbv1q5x48big1bf4vv5"; - revision = "3"; - editedCabalFile = "0mkjwv2yw130rpmxby32hqrj26q268wiyfv6f71q09wp1axl6qfc"; + revision = "4"; + editedCabalFile = "0q77ybg2x81k9vvmyiwxqgal4s3kai6b93gdirak7ypf5fbb62q5"; libraryHaskellDepends = [ attoparsec base @@ -658037,8 +658792,8 @@ self: { pname = "tasty-inspection-testing"; version = "0.2.1"; sha256 = "0wl2xlnbmqdkwhi4ic6a4q4lxf9qg433lidi8d0hlp3ykrjpbcay"; - revision = "2"; - editedCabalFile = "0z9al0hyq381fw146agbpz7rf24rwms1w91m7s0k1w3xbfw16l9n"; + revision = "3"; + editedCabalFile = "1gvwk8q20bbjny660qqp43y4ng5m56hk40mpvl8hi94wdw39pr6v"; libraryHaskellDepends = [ base ghc @@ -664799,8 +665554,8 @@ self: { }: mkDerivation { pname = "testcontainers-postgresql"; - version = "0.0.1.1"; - sha256 = "0zycclxn0wnnj0qhhxixlljl0jirsfd00wihhlx6azpy0h6qc8lw"; + version = "0.0.4"; + sha256 = "09pa6w7kksxn0dpg99m2f3lhplm1316g782i8gfjxwig84r7z0av"; libraryHaskellDepends = [ base testcontainers @@ -690935,8 +691690,8 @@ self: { }: mkDerivation { pname = "typesafe-precure"; - version = "0.12.0.1"; - sha256 = "1cl6dq9mdm3caw3zzwpw7vcyv41apk0d0fxrxrm7d0vp4wvjckff"; + version = "0.12.1.1"; + sha256 = "0gba5l5l4cixyfpxkiy4hyz4zbrq7rxf2cfsj1123ycsa7j4j0ph"; libraryHaskellDepends = [ aeson aeson-pretty @@ -694180,7 +694935,7 @@ self: { } ) { }; - unicode-data_0_7_0 = callPackage ( + unicode-data_0_8_0 = callPackage ( { mkDerivation, base, @@ -694191,8 +694946,8 @@ self: { }: mkDerivation { pname = "unicode-data"; - version = "0.7.0"; - sha256 = "1l21qmhg9pgfnfxi8bsdvbb5zq9izz23caz44s32r9xmd7mdxqc0"; + version = "0.8.0"; + sha256 = "02qgvnv6izs3nq8a14nw86pbgazqvjj22rsvvzklck56rmm7paby"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base @@ -694222,8 +694977,8 @@ self: { }: mkDerivation { pname = "unicode-data-names"; - version = "0.5.0"; - sha256 = "0hyx4lwz9y2nzk2jmrjcway02wbgam8yrsgggn28p8aabn452kp4"; + version = "0.6.0"; + sha256 = "0dr2wb100km8v683aw8ylwc2npj4bl7adsmknrdb0z3nz7xi0j0k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -694279,8 +695034,8 @@ self: { }: mkDerivation { pname = "unicode-data-scripts"; - version = "0.5.0"; - sha256 = "0s01wjps018i67xgrkrvzw6ncmvsa3hpbl7qs75pvfskhjh9bjvq"; + version = "0.6.0"; + sha256 = "0g6a7smdzjp6rxqv86nvh9bp7qihg5a9a9agw14jhg6zvs8kpgy0"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base @@ -694309,8 +695064,8 @@ self: { }: mkDerivation { pname = "unicode-data-security"; - version = "0.5.0"; - sha256 = "199gk9444wbr1balpl1nzl0ivbpx5md9qhd9gf4jrjkb2nkk1hi6"; + version = "0.6.0"; + sha256 = "16kkvmjqigzgwhw7x0kx9p38m1m9bhm0nc47rm8564czx2bxw7lh"; libraryHaskellDepends = [ base unicode-data @@ -703191,6 +703946,19 @@ self: { } ) { }; + varargs = callPackage ( + { mkDerivation, base }: + mkDerivation { + pname = "varargs"; + version = "0.1.0.1"; + sha256 = "1yxcj287m5jgg80qazw1mlik78vm61jybam7v3pljf9i7a2p2z5m"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "Utilities for working with variadic functions using type-level lists"; + license = lib.licenses.bsd3; + } + ) { }; + variable-media-field = callPackage ( { mkDerivation, @@ -708955,6 +709723,8 @@ self: { pname = "vty"; version = "6.4"; sha256 = "0iha15inmig2j2f4kljwb2jhbqa8vsh2aa8l7y5fsanjiciscrbi"; + revision = "1"; + editedCabalFile = "16pxidb8lw4yxy0y9q470vxnagynqzf0l8a0hvjiw98xkvli54xd"; libraryHaskellDepends = [ base binary @@ -715230,6 +716000,39 @@ self: { } ) { }; + warp-tls-simple = callPackage ( + { + mkDerivation, + base, + directory, + filepath, + optparse-applicative, + process, + wai, + warp, + warp-tls, + which, + }: + mkDerivation { + pname = "warp-tls-simple"; + version = "0.1.1.0"; + sha256 = "1xrzkhcc1qdgccf5dncchv81ms944sz9yi9kz0badw8wjrz6kg4p"; + libraryHaskellDepends = [ + base + directory + filepath + optparse-applicative + process + wai + warp + warp-tls + which + ]; + description = "Simple TLS configuration for Warp"; + license = lib.licenses.mit; + } + ) { }; + warp-tls-uid = callPackage ( { mkDerivation, @@ -717854,6 +718657,28 @@ self: { } ) { }; + webcolor-labels = callPackage ( + { + mkDerivation, + base, + tasty, + tasty-hunit, + }: + mkDerivation { + pname = "webcolor-labels"; + version = "0.1.0.0"; + sha256 = "0s4l8w1fba2fk3ym112j2d9x6z86qhkfbcb75kjvwl0qndr69y32"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base + tasty + tasty-hunit + ]; + description = "Plug-n-play #hex-syntax for your colors"; + license = lib.licenses.mpl20; + } + ) { }; + webcrank = callPackage ( { mkDerivation, @@ -718064,7 +718889,7 @@ self: { } ) { }; - webdriver_0_13_0_0 = callPackage ( + webdriver_0_14_0_0 = callPackage ( { mkDerivation, aeson, @@ -718106,8 +718931,10 @@ self: { }: mkDerivation { pname = "webdriver"; - version = "0.13.0.0"; - sha256 = "192dm2bwhdfrmfkimblm43gvh3vnnk6p68kw5cfpar00mli08mbi"; + version = "0.14.0.0"; + sha256 = "0sqphl21ma7n6fk40wyh8b79xrz1aznpnpmgds6277ini1lvn3q8"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ aeson attoparsec @@ -718123,6 +718950,7 @@ self: { http-types microlens-th monad-logger + mtl network network-uri random @@ -718139,6 +718967,20 @@ self: { websockets zip-archive ]; + executableHaskellDepends = [ + aeson + base + bytestring + exceptions + http-client + http-types + monad-logger + mtl + string-interpolate + text + unliftio + unliftio-core + ]; testHaskellDepends = [ aeson base @@ -718169,6 +719011,7 @@ self: { description = "a Haskell client for the Selenium WebDriver protocol"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + mainProgram = "demo"; } ) { }; @@ -721594,6 +722437,8 @@ self: { pname = "wide-word"; version = "0.1.8.1"; sha256 = "0jisg5y3rxcqwd3kgdvcmz5awwcgzdhdkl768llhh388kp64mjcy"; + revision = "1"; + editedCabalFile = "164049ll7rxddxsw5ly8jcbhfmb7gywwrspw63cfwng20hsfqc0y"; libraryHaskellDepends = [ base binary @@ -729205,6 +730050,128 @@ self: { } ) { }; + xlsx_1_2_0 = callPackage ( + { + mkDerivation, + attoparsec, + base, + base64-bytestring, + binary-search, + bytestring, + conduit, + containers, + criterion, + data-default, + deepseq, + Diff, + directory, + dlist, + errors, + exceptions, + extra, + filepath, + groom, + hexpat, + lens, + monad-control, + mtl, + network-uri, + old-locale, + raw-strings-qq, + safe, + smallcheck, + tasty, + tasty-hunit, + tasty-smallcheck, + text, + time, + transformers, + transformers-base, + vector, + xeno, + xml-conduit, + xml-types, + zip, + zip-archive, + zip-stream, + zlib, + }: + mkDerivation { + pname = "xlsx"; + version = "1.2.0"; + sha256 = "0sd9y6xqd17qxlf5hgaws39xfzhaxxj4yxbnh296lfk2pampyrvl"; + libraryHaskellDepends = [ + attoparsec + base + base64-bytestring + binary-search + bytestring + conduit + containers + data-default + deepseq + dlist + errors + exceptions + extra + filepath + hexpat + lens + monad-control + mtl + network-uri + old-locale + safe + text + time + transformers + transformers-base + vector + xeno + xml-conduit + xml-types + zip + zip-archive + zip-stream + zlib + ]; + testHaskellDepends = [ + base + bytestring + conduit + containers + deepseq + Diff + directory + filepath + groom + lens + mtl + raw-strings-qq + smallcheck + tasty + tasty-hunit + tasty-smallcheck + text + time + vector + xml-conduit + zip + ]; + benchmarkHaskellDepends = [ + base + bytestring + conduit + criterion + deepseq + lens + ]; + description = "Simple and incomplete Excel file parser/writer"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + } + ) { }; + xlsx-tabular = callPackage ( { mkDerivation, @@ -734955,8 +735922,8 @@ self: { }: mkDerivation { pname = "yamlscript"; - version = "0.2.3.0"; - sha256 = "09ccfdmhpi0ycsmrxnjcr4rgz4b13sgw76ys6979syfqjqmznr5b"; + version = "0.2.4.0"; + sha256 = "19d6zwnw3rf2lq4l834fyllylz3pjrr2l3l15y7w81m3pw0zs0a4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ From b44638878db25140a11fea6641245b246966ea05 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 22 Sep 2025 02:24:58 +0200 Subject: [PATCH 08/84] haskellPackages.math-functions: drop obsolete workaround on darwin Upstream issue has been resolved. --- pkgs/development/haskell-modules/configuration-darwin.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index 5967401419b17..d77a6dc74a067 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -36,10 +36,6 @@ self: super: double-conversion = addExtraLibrary pkgs.libcxx super.double-conversion; - # "erf table" test fails on Darwin - # https://github.com/bos/math-functions/issues/63 - math-functions = dontCheck super.math-functions; - # darwin doesn't have sub-second resolution # https://github.com/hspec/mockery/issues/11 mockery = overrideCabal (drv: { From c4b2ed56e944ba0da882d394c5b91cf7a63759e4 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 22 Sep 2025 02:40:35 +0200 Subject: [PATCH 09/84] haskell.compiler.ghc9{4,63}: let krank ignore issue ref in patch This is a historical issue that we no longer need workarounds for with recent GHC versions. --- pkgs/development/compilers/ghc/docs-sphinx-7.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ghc/docs-sphinx-7.patch b/pkgs/development/compilers/ghc/docs-sphinx-7.patch index 49fa45d1b9a23..d1321c4214920 100644 --- a/pkgs/development/compilers/ghc/docs-sphinx-7.patch +++ b/pkgs/development/compilers/ghc/docs-sphinx-7.patch @@ -1,6 +1,6 @@ Fix build of docs after sphinx update. https://github.com/sphinx-doc/sphinx/pull/11381 -https://gitlab.haskell.org/ghc/ghc/-/issues/24129 +https://gitlab.haskell.org/ghc/ghc/-/issues/24129 krank:ignore-line --- a/docs/users_guide/rtd-theme/layout.html +++ b/docs/users_guide/rtd-theme/layout.html @@ -67 +67 @@ From 41bd77e63e74de24b352b178a1e7565c733025a1 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 22 Sep 2025 15:12:24 +0200 Subject: [PATCH 10/84] haskellPackages: fix transitive broken --- .../configuration-hackage2nix/transitive-broken.yaml | 7 +++++-- pkgs/development/haskell-modules/hackage-packages.nix | 3 +++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 78e83a5ddae66..e5bdcb6107cd1 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -50,6 +50,7 @@ dont-distribute-packages: - afv - agda-server - agda-snippets-hakyll + - age - agentx - aip - airgql @@ -896,6 +897,7 @@ dont-distribute-packages: - eventful-sql-common - eventful-sqlite - eventful-test-helpers + - eventlog-live-otelcol - EventSocket - eventsource-geteventstore-store - eventsource-store-specs @@ -2371,6 +2373,7 @@ dont-distribute-packages: - music-suite - musicbrainz-email - musicxml2 + - musig2 - mutable-iter - MutationOrder - mute-unmute @@ -3043,7 +3046,7 @@ dont-distribute-packages: - sandwich-contexts-kubernetes - sandwich-contexts-minio - sandwich-webdriver - - sandwich-webdriver_0_4_0_1 + - sandwich-webdriver_0_4_0_2 - sarsi - sasl - sat-micro-hs @@ -3761,7 +3764,7 @@ dont-distribute-packages: - WebCont - webcrank-wai - webdriver-w3c - - webdriver_0_13_0_0 + - webdriver_0_14_0_0 - webify - webserver - websnap diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index fda29889ccffb..cead2483d157b 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -56975,6 +56975,7 @@ self: { ]; description = "Actually Good Encryption"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -220528,6 +220529,7 @@ self: { ]; description = "Stream eventlog data to the OpenTelemetry Collector"; license = lib.licenses.agpl3Only; + hydraPlatforms = lib.platforms.none; mainProgram = "eventlog-live-otelcol"; } ) { }; @@ -466461,6 +466463,7 @@ self: { ]; description = "MuSig2 library"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; } ) { }; From 153d929057d47648b688bbfa76a3bab63bf15f01 Mon Sep 17 00:00:00 2001 From: Marc Scholten Date: Sun, 21 Sep 2025 20:45:55 +0200 Subject: [PATCH 11/84] haskellPackages.ihp-openai: unbreak --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 2 files changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index eb87a82364bb5..1dca02112466b 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -3267,7 +3267,6 @@ broken-packages: - ihaskell-parsec # failure in job https://hydra.nixos.org/build/233244271 at 2023-09-02 - ihaskell-plot # failure in job https://hydra.nixos.org/build/233255936 at 2023-09-02 - ihaskell-widgets # failure in job https://hydra.nixos.org/build/265955663 at 2024-07-14 - - ihp-openai # failure in job https://hydra.nixos.org/build/307610988 at 2025-09-19 - illuminate # failure in job https://hydra.nixos.org/build/233219478 at 2023-09-02 - image-type # failure in job https://hydra.nixos.org/build/233251466 at 2023-09-02 - imagemagick # failure in job https://hydra.nixos.org/build/233598237 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index cead2483d157b..acdd5305ae846 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -373578,8 +373578,6 @@ self: { ]; description = "Call GPT4 from your Haskell apps"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; From 579cafc7a4881aa830d297e237edecb5d1b697a3 Mon Sep 17 00:00:00 2001 From: Marc Scholten Date: Sun, 21 Sep 2025 20:46:21 +0200 Subject: [PATCH 12/84] haskellPackages.ihp-openai: add maintainer mpscholten --- .../haskell-modules/configuration-hackage2nix/main.yaml | 1 + pkgs/development/haskell-modules/hackage-packages.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 4dfef1e27b2e4..f0c49c4681f64 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -376,6 +376,7 @@ package-maintainers: - amazonka - libssh2 - sitemap + - ihp-openai ncfavier: - Agda - irc-client diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index acdd5305ae846..ea66cea140808 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -373578,6 +373578,7 @@ self: { ]; description = "Call GPT4 from your Haskell apps"; license = lib.licenses.mit; + maintainers = [ lib.maintainers.mpscholten ]; } ) { }; From 0538dd63b869e9c8179c330558e32307653387ee Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 22 Sep 2025 02:50:38 +0200 Subject: [PATCH 13/84] haskellPackages.cryptonite:let krank ignore issue reference in patch The upstream issue reports closed state because the repository is abandoned. --- .../haskell-modules/patches/cryptonite-remove-argon2.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/patches/cryptonite-remove-argon2.patch b/pkgs/development/haskell-modules/patches/cryptonite-remove-argon2.patch index 1d571b61e532e..8b281cd1f6987 100644 --- a/pkgs/development/haskell-modules/patches/cryptonite-remove-argon2.patch +++ b/pkgs/development/haskell-modules/patches/cryptonite-remove-argon2.patch @@ -23,7 +23,7 @@ index 044ba00..31dc6f1 100644 hash :: (ByteArrayAccess password, ByteArrayAccess salt, ByteArray out) - => Options -+ => [Proxy "cryptonite:Crypto.KDF.Argon2.hash is known to be broken on this architecture. See https://github.com/haskell-crypto/cryptonite/issues/360"] ++ => [Proxy "cryptonite:Crypto.KDF.Argon2.hash is known to be broken on this architecture. See https://github.com/haskell-crypto/cryptonite/issues/360"] -- abandoned project, krank:ignore-line -> password -> salt -> Int @@ -50,7 +50,7 @@ index 044ba00..31dc6f1 100644 - where - saltLen = B.length salt - passwordLen = B.length password -+hash options password salt outLen = error "cryptonite:Crypto.KDF.Argon2.hash is known to be broken on this architecture. See https://github.com/haskell-crypto/cryptonite/issues/360" ++hash options password salt outLen = error "cryptonite:Crypto.KDF.Argon2.hash is known to be broken on this architecture. See https://github.com/haskell-crypto/cryptonite/issues/360" -- abandoned project, krank:ignore-line data Pass data Salt From 344c3ca02b8bf4a778fa784aa8c22fd2df55eb29 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 22 Sep 2025 16:38:34 +0200 Subject: [PATCH 14/84] haskell.compiler.ghc902Binary: let krank ignore informational issue ref --- pkgs/development/compilers/ghc/subopt.bash | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ghc/subopt.bash b/pkgs/development/compilers/ghc/subopt.bash index 1f3d3a3ebdcc5..0f3817fdeab18 100644 --- a/pkgs/development/compilers/ghc/subopt.bash +++ b/pkgs/development/compilers/ghc/subopt.bash @@ -14,8 +14,9 @@ # # No attempt is made to support custom LLVM optimization flags, or the # undocumented flag to disable TBAA, or avoid -# , as these are not -# required to bootstrap GHC and at worst will produce an error message. +# (krank:ignore-line), +# as these are not required to bootstrap GHC and at worst will produce an +# error message. # # It is called `subopt` to reflect the fact that it uses `opt(1)` as a # subprocess, and the fact that the GHC build system situation From a11b0c435e62a194f88f96224eaf230c2e2385bb Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 22 Sep 2025 16:28:35 +0200 Subject: [PATCH 15/84] haskell.packages.ghc902Binary.reflection: make krank ignore closed issues This workaround is for a GHC bug that has never gotten addressed in GHC 9.0.*. --- pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index a204f4d41fb34..96f528c83b69d 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -135,8 +135,9 @@ self: super: { ghc-lib = doDistribute self.ghc-lib_9_2_8_20230729; # Test suite sometimes segfaults with GHC 9.0.1 and 9.0.2 - # https://github.com/ekmett/reflection/issues/51 - # https://gitlab.haskell.org/ghc/ghc/-/issues/21141 + # due to a GHC bug that has been fixed for GHC >= 9.2.2 + # https://github.com/ekmett/reflection/issues/51 krank:ignore-line + # https://gitlab.haskell.org/ghc/ghc/-/issues/21141 krank:ignore-line reflection = dontCheck super.reflection; # Disable tests pending resolution of From 22d7eeead2d06db4596d20a898c2f5893a8cc332 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 22 Sep 2025 16:29:15 +0200 Subject: [PATCH 16/84] haskell.packages.ghc902Binary.retry: drop obsolete override The issues has been resolved in >= 0.9. Note that it's not possible to test this at the moment since retry (indirectly) depends on TemplateHaskell which doesn't work with our bindists. --- pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index 96f528c83b69d..1a967110b3be4 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -140,10 +140,6 @@ self: super: { # https://gitlab.haskell.org/ghc/ghc/-/issues/21141 krank:ignore-line reflection = dontCheck super.reflection; - # Disable tests pending resolution of - # https://github.com/Soostone/retry/issues/71 - retry = dontCheck super.retry; - ghc-api-compat = unmarkBroken super.ghc-api-compat; # 2021-09-18: cabal2nix does not detect the need for ghc-api-compat. From ffd683af2b3f098bf5a92df4408202cdc4f91c12 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 22 Sep 2025 16:31:28 +0200 Subject: [PATCH 17/84] haskell.packages.ghc902Binary.inline-c-cpp: remove broken/obsolete override This depends on a GHC patch which the only remaining GHC 9.0.*, ghc902Binary, doesn't have, being a bindist and all. --- .../development/haskell-modules/configuration-ghc-9.0.x.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index 1a967110b3be4..338f661232ebc 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -153,12 +153,6 @@ self: super: { # Tests require nothunks < 0.3 (conflicting with Stackage) for GHC < 9.8 aeson = dontCheck super.aeson; - # We use a GHC patch to support the fix for https://github.com/fpco/inline-c/issues/127 - # which means that the upstream cabal file isn't allowed to add the flag. - inline-c-cpp = - (if isDarwin then appendConfigureFlags [ "--ghc-option=-fcompact-unwind" ] else x: x) - super.inline-c-cpp; - # 2022-05-31: weeder 2.4.* requires GHC 9.2 weeder = doDistribute self.weeder_2_3_1; # Unnecessarily strict upper bound on lens From b9c061dc974513326839c6effebd93733988bd09 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 22 Sep 2025 20:08:28 +0200 Subject: [PATCH 18/84] haskell.packages.ghc92.language-javascript_0_7_0_0: drop obsolete override The issue with utf8-light appears to have been resolved and haskell.packages./ghc92/.language-javascript_0_7_0_0 is completely unused. --- pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index 8bc8c6b6d2a93..d6ecdb58ec661 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -105,11 +105,6 @@ self: super: { # Jailbreaks & Version Updates hashable-time = doJailbreak super.hashable-time; - # Depends on utf8-light which isn't maintained / doesn't support base >= 4.16 - # https://github.com/haskell-infra/hackage-trustees/issues/347 - # https://mail.haskell.org/pipermail/haskell-cafe/2022-October/135613.html - language-javascript_0_7_0_0 = dontCheck super.language-javascript_0_7_0_0; - # Needs to match ghc-lib version ghc-tags = doDistribute (doJailbreak self.ghc-tags_1_7); From e2bb0d4103fa75b8b5dc407a8599f6b01ef50292 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 22 Sep 2025 19:06:09 +0200 Subject: [PATCH 19/84] haskell.packages.ghc910.{hinotify,fsnotify}: drop obsolete dontChecks Upstream has since added proper 9.10 compatibility. --- pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix index 9bf63d98ac6bb..ea22d88a9e402 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix @@ -88,7 +88,5 @@ in # Test suite issues # call-stack = dontCheck super.call-stack; # https://github.com/sol/call-stack/issues/19 - fsnotify = dontCheck super.fsnotify; # https://github.com/haskell-fswatch/hfsnotify/issues/115 - hinotify = pkgs.haskell.lib.dontCheck super.hinotify; # https://github.com/kolmodin/hinotify/issues/38 monad-dijkstra = dontCheck super.monad-dijkstra; # needs hlint 3.10 } From 141143dab8dbcb09ef7bb90dc6ad406ca6209cc2 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 25 Sep 2025 16:46:05 +0200 Subject: [PATCH 20/84] haskellPackages: stackage LTS 24.11 -> LTS 24.12 all-cabal-hashes: 2025-09-21T18:48:01Z -> 2025-09-25T14:09:07Z (generated by maintainers/scripts/haskell/update-package-set.sh) --- pkgs/data/misc/hackage/pin.json | 8 +- .../configuration-hackage2nix/stackage.yaml | 7 +- .../haskell-modules/hackage-packages.nix | 1111 +++++++++++++---- 3 files changed, 875 insertions(+), 251 deletions(-) diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index 997651b5d6d41..629101d7b4158 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "683b72ab493ca513a0e057cf2851e4d6c48b3aa4", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/683b72ab493ca513a0e057cf2851e4d6c48b3aa4.tar.gz", - "sha256": "12d274dhy0ph7cvbags91pjk0i2mk2x36q84b0988sz1jjl9kz92", - "msg": "Update from Hackage at 2025-09-21T18:48:01Z" + "commit": "bea83e4ce667f3d0652a67d1f8e13f5c644d6551", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/bea83e4ce667f3d0652a67d1f8e13f5c644d6551.tar.gz", + "sha256": "10lfqcjrckxjb74xwcm73hphw1y53n080pwmjf7xzyga9hf594cn", + "msg": "Update from Hackage at 2025-09-25T14:09:07Z" } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index 8a3df620c3318..eaa5f7aed5206 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 24.11 +# Stackage LTS 24.12 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -582,7 +582,6 @@ default-package-overrides: - data-sketches ==0.3.1.0 - data-sketches-core ==0.1.0.0 - data-textual ==0.3.0.3 - - dataframe ==0.2.0.2 - dataurl ==0.1.0.0 - DAV ==1.3.4 - dbcleaner ==0.1.3 @@ -609,7 +608,7 @@ default-package-overrides: - depq ==0.4.2 - deque ==0.4.4.2 - derive-storable ==0.3.1.0 - - derive-topdown ==0.1.0.0 + - derive-topdown ==0.1.1.0 - deriveJsonNoPrefix ==0.1.0.1 - deriving-aeson ==0.2.10 - deriving-compat ==0.6.7 @@ -1174,7 +1173,7 @@ default-package-overrides: - greskell ==2.0.3.3 - greskell-core ==1.0.0.6 - greskell-websocket ==1.0.0.4 - - gridtables ==0.1.0.0 + - gridtables ==0.1.1.0 - grisette ==0.13.0.1 - groom ==0.1.2.1 - group-by-date ==0.1.0.5 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 48d422015484c..564cf1cda7410 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -35102,10 +35102,8 @@ self: { }: mkDerivation { pname = "PenroseKiteDart"; - version = "1.5"; - sha256 = "0p0nf91vy5akgpnv8bb0i7bv92y0z774yh5xxynkf5f4rn7bcqjg"; - revision = "2"; - editedCabalFile = "1xdnbssmm0h9dvqpxivs2i037r5sj7cn5pnqzsm1h9cainj2w9g9"; + version = "1.5.1"; + sha256 = "0812x3ddlqflkypzjid3b5n3pdb2wwmp0b24yfmi9z15v5dbf2hm"; libraryHaskellDepends = [ base containers @@ -47440,8 +47438,8 @@ self: { pname = "X"; version = "0.3.1.0"; sha256 = "10paczbaiwag50v8ay9pl0f6whqds6y0yy14z0h8s6j04p9zd50f"; - revision = "1"; - editedCabalFile = "1c24q6bh9zq1a9rm9wqi8kasfzcn3cvbzdcgya8clwh3k7xbsvmg"; + revision = "2"; + editedCabalFile = "00q4sl0c1yb1gi3ycz46c5h5yl8f8pg6q2wdxxlvpxsxpnxsjdqv"; libraryHaskellDepends = [ base bytestring @@ -53592,6 +53590,37 @@ self: { } ) { }; + aes-gcm = callPackage ( + { + mkDerivation, + base, + base16-bytestring, + bytestring, + libcrypto, + tasty, + tasty-hunit, + }: + mkDerivation { + pname = "aes-gcm"; + version = "0.0.0.0"; + sha256 = "1shzy466bqy4s15azn8b4ijqdy0drz0zi9f3rxxwdyc730mnikap"; + libraryHaskellDepends = [ + base + bytestring + ]; + libraryPkgconfigDepends = [ libcrypto ]; + testHaskellDepends = [ + base + base16-bytestring + bytestring + tasty + tasty-hunit + ]; + description = "AES Galois/Counter Mode (GCM) AEAD Cipher"; + license = lib.licenses.gpl2Plus; + } + ) { libcrypto = null; }; + aeson = callPackage ( { mkDerivation, @@ -54981,6 +55010,7 @@ self: { aeson, aeson-qq, attoparsec, + attoparsec-aeson, base, bytestring, case-insensitive, @@ -54988,6 +55018,7 @@ self: { either, haskell-src-meta, hspec, + hspec-discover, pretty, scientific, template-haskell, @@ -54997,11 +55028,12 @@ self: { }: mkDerivation { pname = "aeson-match-qq"; - version = "1.7.0"; - sha256 = "11cmqk6igrapi9ms211gbmfwkyczjrzpg900fxqypn18lj1k4y60"; + version = "1.8.0"; + sha256 = "1jzkxpy7qgln68sz5r9j5n963pnwxnclqav8qfc583yv9zszl0dp"; libraryHaskellDepends = [ aeson attoparsec + attoparsec-aeson base bytestring case-insensitive @@ -55022,6 +55054,7 @@ self: { hspec unordered-containers ]; + testToolDepends = [ hspec-discover ]; description = "Declarative JSON matchers"; license = lib.licenses.bsd2; hydraPlatforms = lib.platforms.none; @@ -91280,6 +91313,8 @@ self: { pname = "avl-static"; version = "0.1.0.0"; sha256 = "13rl5wrpmbb4c0zsaymivi4d9qg2wl4lfw4nvkd81naqm3vskc10"; + revision = "1"; + editedCabalFile = "1rwf1m5v9hy3vrfy3ibgvahcl5zpip65d6pidmwg954lclrbm1gh"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base @@ -96854,6 +96889,8 @@ self: { pname = "base-encoding"; version = "0.3.0.0"; sha256 = "1lcqg4wpbry3x165j8rsjbpj1mzd7bl0917hjv0jhvmh5z3wnas8"; + revision = "1"; + editedCabalFile = "0m935gpy93dqf2vks0jx7g444p8a6abrkxnhsh3dv7ywkf2b9ns5"; libraryHaskellDepends = [ base base16-bytestring @@ -99841,8 +99878,8 @@ self: { pname = "beam-core"; version = "0.10.4.0"; sha256 = "1zxqyxxyid186s86lfw0sq030jckh83j3rwj6ibx4wg3flslk515"; - revision = "1"; - editedCabalFile = "1zwvxqfrmwnvsdj959ir6pwy3bbssyzgngh23kz40965pazxg8g6"; + revision = "2"; + editedCabalFile = "0fmbypv1rpgfvfdpn1my8xvx3hwg67s1sijfm1xilra5f8b0xwrx"; libraryHaskellDepends = [ aeson base @@ -99955,8 +99992,8 @@ self: { pname = "beam-migrate"; version = "0.5.3.2"; sha256 = "05cz2gh9r00dr6knigq9v7zcdmpk2b19z0pg79wimkcxa2fblb5z"; - revision = "1"; - editedCabalFile = "0v1hx1pxwb7xxqdcdqyj8fv9liiz44ak2wmi7my267amxdx2n6h2"; + revision = "2"; + editedCabalFile = "0pd2fymz2rvdi5wn8drn9argizg79r9jf8rlszl81z682779vaw7"; libraryHaskellDepends = [ aeson base @@ -100170,8 +100207,8 @@ self: { pname = "beam-sqlite"; version = "0.5.4.1"; sha256 = "1f5yjsx7zfbfbxs3xd64rwn2m3vjffrbdn5xadhm1axhghi6srki"; - revision = "1"; - editedCabalFile = "0igd6nzypnnpswpybn87j7vzgy2cbgb4l19phimjdacgdjsvb4nf"; + revision = "2"; + editedCabalFile = "03j11sgmsaz80qvpb1r4j6zqdwya9gyi4rmlbhjl13wn3dzsf420"; libraryHaskellDepends = [ aeson attoparsec @@ -111063,8 +111100,8 @@ self: { }: mkDerivation { pname = "blockio-uring"; - version = "0.1.0.1"; - sha256 = "1vhzi5ad162vdnn13444rf729302zqb2ikfmlb4i6k27pp0z1w58"; + version = "0.1.0.2"; + sha256 = "1kal4vrygj12a53m9bavdbffsyqmh7m73vr62z2rz3y0yq3wxj3z"; libraryHaskellDepends = [ base primitive @@ -122899,8 +122936,8 @@ self: { }: mkDerivation { pname = "cabal-bounds"; - version = "2.6.0"; - sha256 = "0y4xj4irhppwsg3ljy6yzscfjdj7gh2prsiia51y8ma6gm87sjsy"; + version = "2.7.0"; + sha256 = "09xlw66h5k034gr9id4lj8i48r188k55cy8kml6f3q1a7cqcfsfd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -123162,8 +123199,8 @@ self: { }: mkDerivation { pname = "cabal-cargs"; - version = "1.7.0"; - sha256 = "17q51lg7vhdzvy9s8f3zplxa4mij2bjclzxry5f9d2pgiq4290p9"; + version = "1.8.0"; + sha256 = "0nm20jw8hy9gfv4813jfy7m13i9sa3dcs0633hminsk5xl5a1ff2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -164897,19 +164934,21 @@ self: { mkDerivation, base, containers, + deepseq, directory, parallel, }: mkDerivation { pname = "cpsa"; - version = "4.4.6"; - sha256 = "02x57fxwxcs16kn8dgr4pxjx0nrvvlwg3sm05hlipbycyaqwncmf"; + version = "4.4.7"; + sha256 = "131ri7wj5lsbsqm9rvcmrsdgb9mls24nf1rjcz9bylxxaizchm39"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ base containers + deepseq directory parallel ]; @@ -180515,92 +180554,6 @@ self: { ) { }; dataframe = callPackage ( - { - mkDerivation, - array, - attoparsec, - base, - bytestring, - containers, - criterion, - directory, - filepath, - hashable, - HUnit, - random, - random-shuffle, - snappy, - statistics, - text, - time, - vector, - vector-algorithms, - zstd, - }: - mkDerivation { - pname = "dataframe"; - version = "0.2.0.2"; - sha256 = "0h4p5lbcka15zn5iqzvjsq2bwc3c1ivia5jf6p2gns8d0di9swbd"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array - attoparsec - base - bytestring - containers - directory - filepath - hashable - snappy - statistics - text - time - vector - vector-algorithms - zstd - ]; - executableHaskellDepends = [ - array - attoparsec - base - bytestring - containers - directory - hashable - snappy - statistics - text - time - vector - vector-algorithms - zstd - ]; - testHaskellDepends = [ - base - HUnit - random - random-shuffle - text - time - vector - ]; - benchmarkHaskellDepends = [ - base - criterion - random - text - vector - ]; - description = "An intuitive, dynamically-typed DataFrame library"; - license = lib.licenses.gpl3Plus; - hydraPlatforms = lib.platforms.none; - mainProgram = "dataframe"; - broken = true; - } - ) { }; - - dataframe_0_3_1_2 = callPackage ( { mkDerivation, array, @@ -187073,7 +187026,9 @@ self: { mkDerivation, base, binary, + bytestring, containers, + ghc, haskell-src, HUnit, mtl, @@ -187086,8 +187041,8 @@ self: { }: mkDerivation { pname = "derive-topdown"; - version = "0.1.0.0"; - sha256 = "0pxv77r769wg61pp51ibvkd256f2cyrd9k5mrqz68dwi76xk54hr"; + version = "0.1.1.0"; + sha256 = "1ixgy4bmcmkp00cn28kikgkg9ln6pl5wyibrbk8hckf2wpamy0c3"; libraryHaskellDepends = [ base containers @@ -187102,7 +187057,9 @@ self: { testHaskellDepends = [ base binary + bytestring containers + ghc haskell-src HUnit mtl @@ -190118,8 +190075,8 @@ self: { }: mkDerivation { pname = "dhscanner-kbgen"; - version = "1.0.1"; - sha256 = "19iadc90zg2239h7kffkfgpy3kwdqac75f1r77adn5f9igyaj0pk"; + version = "1.0.3"; + sha256 = "0rqw9map9nvr1mzvvlkgvlcb0wg3byq2jh7vxa89h19hwy89f4vg"; libraryHaskellDepends = [ aeson base @@ -205526,6 +205483,25 @@ self: { } ) { }; + dynamic-array = callPackage ( + { + mkDerivation, + base, + primdata, + }: + mkDerivation { + pname = "dynamic-array"; + version = "0.1.3"; + sha256 = "1rd5yvj5hqvd24hwq2g7h3f6zkachkbk7zk0s03hrkim0i0839db"; + libraryHaskellDepends = [ + base + primdata + ]; + description = "Minimum-overhead mutable dynamic arrays"; + license = lib.licenses.mit; + } + ) { }; + dynamic-cabal = callPackage ( { mkDerivation, @@ -220417,14 +220393,15 @@ self: { network, optparse-applicative, text, - transformers, unliftio-core, unordered-containers, }: mkDerivation { pname = "eventlog-live"; - version = "0.1.0.0"; - sha256 = "0k4z9pddiwwcjsbg27xmwm2lqbn3py4lym87pcy6x5lv2jzl7rmh"; + version = "0.1.0.1"; + sha256 = "1fk8yssg0xd5zdxynajxgdsp5rzcain4b5jj3h7mnjfnd9y0j8mg"; + revision = "1"; + editedCabalFile = "03v6jr89wszgpywzhhzxjya3fhgiczzmfkmas8vxm6kzj0372mig"; libraryHaskellDepends = [ base bytestring @@ -220435,13 +220412,12 @@ self: { network optparse-applicative text - transformers unliftio-core unordered-containers ]; doHaddock = false; description = "Live processing of eventlog data"; - license = lib.licenses.agpl3Only; + license = lib.licenses.bsd3; } ) { }; @@ -220462,8 +220438,10 @@ self: { }: mkDerivation { pname = "eventlog-live-influxdb"; - version = "0.1.0.0"; - sha256 = "12vj02vksilcwzy283vmc7ikq19zjplikwakrz47b63qh8iy1shn"; + version = "0.1.0.1"; + sha256 = "152hkg9hz1dqi1lcbps4yhc6mr11mksn2fyn3hyb1q46vx8h9a0d"; + revision = "1"; + editedCabalFile = "1fk6v2y4rm6xj1403z240cqdy002m47cnb30iqplj0vcz418ccpp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -220480,7 +220458,7 @@ self: { text ]; description = "Stream eventlog data into InfluxDB"; - license = lib.licenses.agpl3Only; + license = lib.licenses.bsd3; mainProgram = "eventlog-live-influxdb"; } ) { }; @@ -220506,8 +220484,8 @@ self: { }: mkDerivation { pname = "eventlog-live-otelcol"; - version = "0.1.0.0"; - sha256 = "19y4jz949z069n45cmhjmqdfs7iw1wpkiyxkrcq6f0cjwcc95j5k"; + version = "0.1.0.4"; + sha256 = "0mpq5q95nfp38nm4aqkybqpk6ikdaf4c0kcp8kiw7sgbpf57fv62"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -220528,7 +220506,7 @@ self: { unordered-containers ]; description = "Stream eventlog data to the OpenTelemetry Collector"; - license = lib.licenses.agpl3Only; + license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "eventlog-live-otelcol"; } @@ -229414,6 +229392,62 @@ self: { } ) { }; + fedora-repoquery_0_8 = callPackage ( + { + mkDerivation, + base, + case-insensitive, + curl, + directory, + extra, + fedora-releases, + filepath, + Glob, + optparse-applicative, + regex-compat, + safe, + simple-cmd, + simple-cmd-args, + text, + time, + xdg-basedir, + }: + mkDerivation { + pname = "fedora-repoquery"; + version = "0.8"; + sha256 = "0fzydnlaalbnhkmdcsizrbwm7h3i44g29g2l514fw0lvc1s8ln9z"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base + case-insensitive + curl + directory + extra + fedora-releases + filepath + Glob + optparse-applicative + regex-compat + safe + simple-cmd + simple-cmd-args + text + time + xdg-basedir + ]; + testHaskellDepends = [ + base + simple-cmd + ]; + description = "Fedora release repos package query tool"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + mainProgram = "fedora-repoquery"; + broken = true; + } + ) { }; + fee-estimate = callPackage ( { mkDerivation, @@ -244300,8 +244334,8 @@ self: { }: mkDerivation { pname = "fresnel"; - version = "0.1.0.1"; - sha256 = "02d8d4m4msx7hxmp337zig07cvq7sci31f9x429w19bj43sp9j7g"; + version = "0.1.0.2"; + sha256 = "09jy2m20h0dazw6fakqh7kfwm7rwxhs7vfqr7plkx4229j9n9phx"; libraryHaskellDepends = [ base containers @@ -283090,10 +283124,8 @@ self: { }: mkDerivation { pname = "gridtables"; - version = "0.1.0.0"; - sha256 = "1smhbb2jxysbqhxww5rikjfnhsdbf0gq3kgnn6ikjzcrqwdk9b6n"; - revision = "1"; - editedCabalFile = "0ay4ywi8w5kk4blf8jqxhivzprp1ivpdlw6racr1692psyizmxi0"; + version = "0.1.1.0"; + sha256 = "0r2cnlkbw9b6m1x2im1jxdi191f354p47k98hkna7qi9azgnm8g8"; libraryHaskellDepends = [ array base @@ -290910,7 +290942,6 @@ self: { hspec-discover, HsYAML, HUnit, - ilist, language-docker, megaparsec, mtl, @@ -290932,8 +290963,8 @@ self: { }: mkDerivation { pname = "hadolint"; - version = "2.13.1"; - sha256 = "0c4wazp5xrnbhp8gxg8mjppdb9ys77zxywkqysw6h7vzd1rsk7bd"; + version = "2.14.0"; + sha256 = "1zsn381r71iysd85q1m6xngx0hs4a8nb9wwlx6g59dpx9aqs265g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -290953,7 +290984,6 @@ self: { foldl gitrev HsYAML - ilist language-docker megaparsec mtl @@ -317280,7 +317310,7 @@ self: { } ) { }; - hedgehog_1_6 = callPackage ( + hedgehog_1_7 = callPackage ( { mkDerivation, ansi-terminal, @@ -317313,8 +317343,8 @@ self: { }: mkDerivation { pname = "hedgehog"; - version = "1.6"; - sha256 = "0lrwwlcp3rihs9z239lf6pd0m2fmi8ww4vvrwiphkrcba4c91bgf"; + version = "1.7"; + sha256 = "0kjn3dxyhk55ayjd9m8acr8kxhbzc70piszkiy2gbnwqyyhbrqh9"; libraryHaskellDepends = [ ansi-terminal async @@ -317867,8 +317897,8 @@ self: { pname = "hedgehog-quickcheck"; version = "0.1.1"; sha256 = "1z2ja63wqz83qhwzh0zs98k502v8fjdpnsnhqk3srypx2nw5vdlp"; - revision = "9"; - editedCabalFile = "1grw0vh1n3nbhpypb4v4rhmidm5n2hjbr4wiyvwj79bl12bd1x49"; + revision = "10"; + editedCabalFile = "18vclwp2i5w0acgs4zjjw82sy0s8sky9baa168qvyj2c1rdhs48q"; libraryHaskellDepends = [ base hedgehog @@ -330549,8 +330579,8 @@ self: { }: mkDerivation { pname = "hledger-flow"; - version = "0.14.4"; - sha256 = "1qvh5vgnk6vrhhr1kjqsycz13acxa7ynpqnd1bmchfl4q3aga9gw"; + version = "0.16.1"; + sha256 = "0lf3ndx8p4f2mfq0d7hwansc2xvqazhn4ywr6q2z6ygki4jac99g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -355210,8 +355240,8 @@ self: { }: mkDerivation { pname = "hspec-yesod"; - version = "0.1.0"; - sha256 = "1ixra4fdfrihlnigqs63xwyrl7ab4kwl7klmhv6xfvprs798g4mb"; + version = "0.2.0"; + sha256 = "0gzs0019ny47jd7nmlv90d17myhnzdzl4bkspmwwailrmwc0ldxj"; libraryHaskellDepends = [ aeson attoparsec @@ -358938,6 +358968,45 @@ self: { } ) { }; + http-api-data-qq_0_1_0_1 = callPackage ( + { + mkDerivation, + base, + bytestring, + http-api-data, + http-client, + tasty, + tasty-hunit, + tasty-quickcheck, + template-haskell, + text, + }: + mkDerivation { + pname = "http-api-data-qq"; + version = "0.1.0.1"; + sha256 = "1dah5sgmqls4x17drs3x2sz7gxx8jlh86yjdsahkq5kjv2jshy1n"; + libraryHaskellDepends = [ + base + http-api-data + template-haskell + text + ]; + testHaskellDepends = [ + base + bytestring + http-api-data + http-client + tasty + tasty-hunit + tasty-quickcheck + text + ]; + description = "Quasiquoter for building URLs with ToHttpApiData types"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + http-attoparsec = callPackage ( { mkDerivation, @@ -373174,8 +373243,8 @@ self: { }: mkDerivation { pname = "ihp"; - version = "1.4.0"; - sha256 = "0k962vpcarq07a0wb5rlpah15q629xi39h2x8x0vb5i8nv7xg0c3"; + version = "1.4.1"; + sha256 = "0d5hj8c8qvjqmdjy7dxibhq41qzbfqmrcgmfw84s6gfss9jbanlq"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson @@ -406480,6 +406549,64 @@ self: { } ) { }; + language-docker_15_0_0 = callPackage ( + { + mkDerivation, + base, + bytestring, + containers, + data-default, + data-default-class, + hspec, + hspec-discover, + hspec-megaparsec, + HUnit, + megaparsec, + prettyprinter, + QuickCheck, + split, + text, + time, + }: + mkDerivation { + pname = "language-docker"; + version = "15.0.0"; + sha256 = "1l4pbadd65l4pk30p1xjgs9jmkslldcm8fbw8ck35mwql252kid2"; + libraryHaskellDepends = [ + base + bytestring + containers + data-default + data-default-class + megaparsec + prettyprinter + split + text + time + ]; + testHaskellDepends = [ + base + bytestring + containers + data-default + data-default-class + hspec + hspec-megaparsec + HUnit + megaparsec + prettyprinter + QuickCheck + split + text + time + ]; + testToolDepends = [ hspec-discover ]; + description = "Dockerfile parser, pretty-printer and embedded DSL"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + } + ) { }; + language-dockerfile = callPackage ( { mkDerivation, @@ -445773,6 +445900,19 @@ self: { } ) { }; + microlens_0_5_0_0 = callPackage ( + { mkDerivation, base }: + mkDerivation { + pname = "microlens"; + version = "0.5.0.0"; + sha256 = "0rdz2jwbv82gj7gn8rq1x6z5iyjyvmg2wq4b47mr9bqj264qwq04"; + libraryHaskellDepends = [ base ]; + description = "A tiny lens library with no dependencies"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + microlens-aeson = callPackage ( { mkDerivation, @@ -445840,6 +445980,26 @@ self: { } ) { }; + microlens-contra_0_1_0_4 = callPackage ( + { + mkDerivation, + base, + microlens, + }: + mkDerivation { + pname = "microlens-contra"; + version = "0.1.0.4"; + sha256 = "15rr6f9n91pnczx8pihlx6dcwfy8f0snkfxfb45b96fp633k95dj"; + libraryHaskellDepends = [ + base + microlens + ]; + description = "True folds and getters for microlens"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + microlens-each = callPackage ( { mkDerivation, @@ -445888,6 +446048,34 @@ self: { } ) { }; + microlens-ghc_0_4_15_2 = callPackage ( + { + mkDerivation, + array, + base, + bytestring, + containers, + microlens, + transformers, + }: + mkDerivation { + pname = "microlens-ghc"; + version = "0.4.15.2"; + sha256 = "1c1ndgzh532lsnwjag9w566fbcnjkw2lbd6fnnfriccyfxhdx93b"; + libraryHaskellDepends = [ + array + base + bytestring + containers + microlens + transformers + ]; + description = "microlens + array, bytestring, containers, transformers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + microlens-mtl = callPackage ( { mkDerivation, @@ -445913,6 +446101,32 @@ self: { } ) { }; + microlens-mtl_0_2_1_1 = callPackage ( + { + mkDerivation, + base, + microlens, + mtl, + transformers, + transformers-compat, + }: + mkDerivation { + pname = "microlens-mtl"; + version = "0.2.1.1"; + sha256 = "1r9jvn4ka3lakqnwxfh72zy9yc145ll15l7cw7sqn062z74dxk0w"; + libraryHaskellDepends = [ + base + microlens + mtl + transformers + transformers-compat + ]; + description = "microlens support for Reader/Writer/State from mtl"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + microlens-platform = callPackage ( { mkDerivation, @@ -445946,6 +446160,40 @@ self: { } ) { }; + microlens-platform_0_4_4_2 = callPackage ( + { + mkDerivation, + base, + hashable, + microlens, + microlens-ghc, + microlens-mtl, + microlens-th, + text, + unordered-containers, + vector, + }: + mkDerivation { + pname = "microlens-platform"; + version = "0.4.4.2"; + sha256 = "08y0mlmlx9hm23bp95m5nzq3zj0bz9q9in237vh0hgris8aaiwv0"; + libraryHaskellDepends = [ + base + hashable + microlens + microlens-ghc + microlens-mtl + microlens-th + text + unordered-containers + vector + ]; + description = "microlens + all batteries included (best for apps)"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + microlens-pro = callPackage ( { mkDerivation, @@ -445966,8 +446214,8 @@ self: { }: mkDerivation { pname = "microlens-pro"; - version = "0.2.0.4"; - sha256 = "099ynp1winji1jn08dqayywliwk9midccfsv13cakhrdnbps8zj3"; + version = "0.2.0.5"; + sha256 = "06fhqzw1g5253680i6q8kjy1h1b278bnrq9cdcqmab3zblzxh95g"; libraryHaskellDepends = [ base containers @@ -446063,6 +446311,40 @@ self: { } ) { }; + microlens-th_0_4_3_18 = callPackage ( + { + mkDerivation, + base, + containers, + microlens, + tagged, + template-haskell, + th-abstraction, + transformers, + }: + mkDerivation { + pname = "microlens-th"; + version = "0.4.3.18"; + sha256 = "12zdn20v1jl3q2cr96bf9rcj8qmrfr1kd3q0pdkjmayf108g8zj1"; + libraryHaskellDepends = [ + base + containers + microlens + template-haskell + th-abstraction + transformers + ]; + testHaskellDepends = [ + base + microlens + tagged + ]; + description = "Automatic generation of record lenses for microlens"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + micrologger = callPackage ( { mkDerivation, @@ -450422,8 +450704,8 @@ self: { pname = "mmark"; version = "0.0.8.0"; sha256 = "05wzjyqh4605g2y3lhcqrjh4qzj4fv8xg5baf3xi0x6ararrwjgr"; - revision = "1"; - editedCabalFile = "13d46lpf5b1kj6b1g89gb1s91h87njz3k69mp39nsfhwq19ygibf"; + revision = "2"; + editedCabalFile = "0gy66sawj11za86rwkvmr791acd84f895ym568w7wnbks9p6gmmr"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson @@ -450535,8 +450817,8 @@ self: { pname = "mmark-ext"; version = "0.2.1.5"; sha256 = "1dy3xnzpbbnp03k3r04q8y10pcj2r708dk8bff0pxzkvypm75g88"; - revision = "4"; - editedCabalFile = "0girl659kn2nxzcayjzx8pflws43vp3mfw03g3ril8i49r1wkxkn"; + revision = "5"; + editedCabalFile = "1zhkihv0m7as1jxq14if7ksr8lwvbwpa4q7q87xs43n52fassdw9"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base @@ -453519,6 +453801,80 @@ self: { } ) { }; + monad-effect = callPackage ( + { + mkDerivation, + async, + base, + containers, + criterion, + data-default, + data-effects, + deepseq, + effectful, + exceptions, + fused-effects, + haskell-src-meta, + heftia-effects, + logict, + monad-control, + mtl, + parsec, + polysemy, + resourcet, + stm, + tasty-bench, + template-haskell, + text, + transformers-base, + unix, + }: + mkDerivation { + pname = "monad-effect"; + version = "0.1.0.0"; + sha256 = "0iv13hf3017h1acldls05z8cnknsm6wpazd2ppqi67hdggvr1v3i"; + libraryHaskellDepends = [ + async + base + data-default + deepseq + exceptions + haskell-src-meta + monad-control + mtl + parsec + resourcet + stm + template-haskell + text + transformers-base + ]; + testHaskellDepends = [ + base + containers + criterion + mtl + parsec + text + ]; + benchmarkHaskellDepends = [ + base + data-effects + effectful + fused-effects + heftia-effects + logict + mtl + polysemy + tasty-bench + text + unix + ]; + description = "A fast and lightweight effect system"; + license = lib.licenses.bsd3; + } + ) { }; + monad-exception = callPackage ( { mkDerivation, @@ -486603,7 +486959,7 @@ self: { } ) { }; - ogma-cli_1_9_0 = callPackage ( + ogma-cli_1_10_0 = callPackage ( { mkDerivation, aeson, @@ -486620,8 +486976,8 @@ self: { }: mkDerivation { pname = "ogma-cli"; - version = "1.9.0"; - sha256 = "0br6rv5bli12xhbr8igxgwrp3j4cbm8mxqhva6mxykg6s2s19wab"; + version = "1.10.0"; + sha256 = "1fli4xhdrzbzkwjidz5piif4hs0zscw4rs6z30d9gb2zf4kl5h4z"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -486641,7 +486997,7 @@ self: { unix ]; description = "Ogma: Helper tool to interoperate between Copilot and other languages"; - license = "unknown"; + license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; mainProgram = "ogma"; } @@ -486719,7 +487075,7 @@ self: { } ) { }; - ogma-core_1_9_0 = callPackage ( + ogma-core_1_10_0 = callPackage ( { mkDerivation, aeson, @@ -486751,8 +487107,8 @@ self: { }: mkDerivation { pname = "ogma-core"; - version = "1.9.0"; - sha256 = "1nh0qnb84sy0qwks1fpyvz7i7sini5sqk1a7na82axw5jkhjdhrg"; + version = "1.10.0"; + sha256 = "010bdip18i0vkhkg2yp1yb4691przni612nwfjz8wrcdxgxvnpz0"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson @@ -486787,7 +487143,7 @@ self: { test-framework-quickcheck2 ]; description = "Ogma: Helper tool to interoperate between Copilot and other languages"; - license = "unknown"; + license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; } ) { }; @@ -486832,7 +487188,7 @@ self: { } ) { }; - ogma-extra_1_9_0 = callPackage ( + ogma-extra_1_10_0 = callPackage ( { mkDerivation, aeson, @@ -486849,8 +487205,8 @@ self: { }: mkDerivation { pname = "ogma-extra"; - version = "1.9.0"; - sha256 = "0cl4gfkkms75p1yl137dlpfivqqgc491dmh55iwagqszkgaix0lg"; + version = "1.10.0"; + sha256 = "0y2jmqnw1nfai225nl9x37klwynrwl2yz1352zix709cc0spma8i"; libraryHaskellDepends = [ aeson base @@ -486868,7 +487224,7 @@ self: { test-framework-quickcheck2 ]; description = "Ogma: Helper tool to interoperate between Copilot and other languages"; - license = "unknown"; + license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; } ) { }; @@ -486916,7 +487272,7 @@ self: { } ) { }; - ogma-language-c_1_9_0 = callPackage ( + ogma-language-c_1_10_0 = callPackage ( { mkDerivation, alex, @@ -486932,8 +487288,8 @@ self: { }: mkDerivation { pname = "ogma-language-c"; - version = "1.9.0"; - sha256 = "1s6acmdbvqzhdjd67vlsc0y5ld4s7z0w5g35ka3d6sqk4sj0j795"; + version = "1.10.0"; + sha256 = "0gamqxl9ajw1fnywx9wkip86xh6b9pgc6l5f80lvkw486g1qp5qf"; setupHaskellDepends = [ base Cabal @@ -486955,7 +487311,7 @@ self: { test-framework-quickcheck2 ]; description = "Ogma: Runtime Monitor translator: C Language Frontend"; - license = "unknown"; + license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; } ) { }; @@ -487011,15 +487367,15 @@ self: { } ) { }; - ogma-language-copilot_1_9_0 = callPackage ( + ogma-language-copilot_1_10_0 = callPackage ( { mkDerivation, base }: mkDerivation { pname = "ogma-language-copilot"; - version = "1.9.0"; - sha256 = "0sl2n2m1nkllmzrb2av6s1q1iq7jz9zrjh5mxczriwk3c1jv7x2c"; + version = "1.10.0"; + sha256 = "14zx4n9xqd36rn8s6akv5f2rlpvamlg4704n0c0yg2zs6n95zxlw"; libraryHaskellDepends = [ base ]; description = "Ogma: Runtime Monitor translator: Copilot Language Endpoints"; - license = "unknown"; + license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; } ) { }; @@ -487053,7 +487409,7 @@ self: { } ) { }; - ogma-language-csv_1_9_0 = callPackage ( + ogma-language-csv_1_10_0 = callPackage ( { mkDerivation, base, @@ -487066,8 +487422,8 @@ self: { }: mkDerivation { pname = "ogma-language-csv"; - version = "1.9.0"; - sha256 = "0mkkbgia5dvnpqy11pqxvikjvgck0zq7cx1alnsh6hi9j1qj75ad"; + version = "1.10.0"; + sha256 = "0j8w9r1618lqv922mdadvhgfyqjhmbh84giz8jwlx7dmqzk28a88"; libraryHaskellDepends = [ base bytestring @@ -487078,7 +487434,7 @@ self: { vector ]; description = "Ogma: Runtime Monitor translator: CSV Frontend"; - license = "unknown"; + license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; } ) { }; @@ -487188,7 +487544,7 @@ self: { } ) { }; - ogma-language-jsonspec_1_9_0 = callPackage ( + ogma-language-jsonspec_1_10_0 = callPackage ( { mkDerivation, aeson, @@ -487202,8 +487558,8 @@ self: { }: mkDerivation { pname = "ogma-language-jsonspec"; - version = "1.9.0"; - sha256 = "0wlkl13gg0jbi8fvszk4z1l0c4l7b0n68gnhnmn93srcn14iinkn"; + version = "1.10.0"; + sha256 = "1f9ha1jbg3pgyjhjwdf6xyiwsmca29pgpg0zk2gljmw9q7ry4b9i"; libraryHaskellDepends = [ aeson base @@ -487215,7 +487571,7 @@ self: { text ]; description = "Ogma: Runtime Monitor translator: JSON Frontend"; - license = "unknown"; + license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; } ) { }; @@ -487263,7 +487619,7 @@ self: { } ) { }; - ogma-language-lustre_1_9_0 = callPackage ( + ogma-language-lustre_1_10_0 = callPackage ( { mkDerivation, alex, @@ -487279,8 +487635,8 @@ self: { }: mkDerivation { pname = "ogma-language-lustre"; - version = "1.9.0"; - sha256 = "0rb22md683flgxkg08jzga4q7fynykzh25k1gcr6rsj0kaaxi4fj"; + version = "1.10.0"; + sha256 = "12s58r5g9q9c4jmwck97w8ff6567ncyh1kclvw0mcqpgk09cpvk2"; setupHaskellDepends = [ base Cabal @@ -487302,7 +487658,7 @@ self: { test-framework-quickcheck2 ]; description = "Ogma: Runtime Monitor translator: Lustre Language Frontend"; - license = "unknown"; + license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; } ) { }; @@ -487350,7 +487706,7 @@ self: { } ) { }; - ogma-language-smv_1_9_0 = callPackage ( + ogma-language-smv_1_10_0 = callPackage ( { mkDerivation, alex, @@ -487366,8 +487722,8 @@ self: { }: mkDerivation { pname = "ogma-language-smv"; - version = "1.9.0"; - sha256 = "15dsh5j6iaapaxi6i05z44shvbxvs5945r93046d6shxvxz5q5gb"; + version = "1.10.0"; + sha256 = "0cq0kdipn79wvhpfx51w52c78djki7dn7c12dl93w585r6f0spzp"; setupHaskellDepends = [ base Cabal @@ -487389,7 +487745,7 @@ self: { test-framework-quickcheck2 ]; description = "Ogma: Runtime Monitor translator: SMV Language Frontend"; - license = "unknown"; + license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; } ) { }; @@ -487419,7 +487775,7 @@ self: { } ) { }; - ogma-language-xlsx_1_9_0 = callPackage ( + ogma-language-xlsx_1_10_0 = callPackage ( { mkDerivation, base, @@ -487430,8 +487786,8 @@ self: { }: mkDerivation { pname = "ogma-language-xlsx"; - version = "1.9.0"; - sha256 = "191s4kc2gicgrdl3jzw9j31l0yncaradii2vz7h3gqg2rz63qfsv"; + version = "1.10.0"; + sha256 = "0n9i60kdm8blazgpq2swsdnpjryig6w7kykb9gws7hhlg5m16vkx"; libraryHaskellDepends = [ base bytestring @@ -487440,7 +487796,7 @@ self: { xlsx ]; description = "Ogma: Runtime Monitor translator: XLSX Frontend"; - license = "unknown"; + license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; } ) { }; @@ -487474,7 +487830,7 @@ self: { } ) { }; - ogma-language-xmlspec_1_9_0 = callPackage ( + ogma-language-xmlspec_1_10_0 = callPackage ( { mkDerivation, base, @@ -487487,8 +487843,8 @@ self: { }: mkDerivation { pname = "ogma-language-xmlspec"; - version = "1.9.0"; - sha256 = "07cp3d543pnbmb7qma8l9v1zfnh3nn41azl1clv8p9bsfgm5a86j"; + version = "1.10.0"; + sha256 = "091b8gp7z0hnmcfzx5id3sybp87598zzhbhjw1nmhkszphyd2y7z"; libraryHaskellDepends = [ base hxt @@ -487499,7 +487855,7 @@ self: { pretty ]; description = "Ogma: Runtime Monitor translator: XML Frontend"; - license = "unknown"; + license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; } ) { }; @@ -487516,15 +487872,15 @@ self: { } ) { }; - ogma-spec_1_9_0 = callPackage ( + ogma-spec_1_10_0 = callPackage ( { mkDerivation, base }: mkDerivation { pname = "ogma-spec"; - version = "1.9.0"; - sha256 = "1vg67wg2px1lp89m29h1dyy4cqgpxq5yfsdq6kg63b0i8dlv71g8"; + version = "1.10.0"; + sha256 = "078npma0dkqlhwiqw75s9q6k3c4h2m6g4v1wpxgj1n9laz4bf1nn"; libraryHaskellDepends = [ base ]; description = "Ogma: Runtime Monitor translator: JSON Frontend"; - license = "unknown"; + license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; } ) { }; @@ -487986,6 +488342,74 @@ self: { } ) { }; + ollama-haskell_0_2_1_0 = callPackage ( + { + mkDerivation, + aeson, + base, + base64-bytestring, + bytestring, + containers, + directory, + filepath, + http-client, + http-client-tls, + http-types, + mtl, + scientific, + silently, + stm, + tasty, + tasty-hunit, + text, + time, + }: + mkDerivation { + pname = "ollama-haskell"; + version = "0.2.1.0"; + sha256 = "0xs28lq5x7bc5qf35n2g2vnchvy0fw88yg0qvv4fl7swf15wdr0i"; + libraryHaskellDepends = [ + aeson + base + base64-bytestring + bytestring + containers + directory + filepath + http-client + http-client-tls + http-types + mtl + stm + text + time + ]; + testHaskellDepends = [ + aeson + base + base64-bytestring + bytestring + containers + directory + filepath + http-client + http-client-tls + http-types + mtl + scientific + silently + stm + tasty + tasty-hunit + text + time + ]; + description = "Haskell client for ollama"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + } + ) { }; + ollama-holes-plugin = callPackage ( { mkDerivation, @@ -496057,8 +496481,8 @@ self: { }: mkDerivation { pname = "ormolu"; - version = "0.8.0.1"; - sha256 = "12ix16zvz0i1i8yyhbfbv4r0735r2i2darkbz3jh7lfd1fgh6zs3"; + version = "0.8.0.2"; + sha256 = "1fh2m4sy8vzxvm1qm9413apzblqf4sla3454mx64ngkwx0pgi2ad"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -502299,7 +502723,7 @@ self: { } ) { }; - pantry_0_11_1 = callPackage ( + pantry_0_11_2 = callPackage ( { mkDerivation, aeson, @@ -502360,8 +502784,8 @@ self: { }: mkDerivation { pname = "pantry"; - version = "0.11.1"; - sha256 = "1qgmxfv74qqyn26x06gnx71ms8k0fiijlpz55k08yn8bcr05phzr"; + version = "0.11.2"; + sha256 = "0zlr88489c3gi00ck7yi3zxq1jp0niamgfk3d5b9qkv3zqdvx83z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -506709,6 +507133,8 @@ self: { pname = "patat"; version = "0.15.2.0"; sha256 = "0r9bx8f7q1h56mf8bvz6jaqrgl9iczac9qffmaqqsnqlvzn85wfi"; + revision = "1"; + editedCabalFile = "0x0dkxnkpwghzpmw93b72zfy2gyl4vhnxa0h15dycvd80k54n37x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -523638,8 +524064,8 @@ self: { }: mkDerivation { pname = "pms-domain-model"; - version = "0.1.1.0"; - sha256 = "1syw48m2szvj6z5j2yn5g694gnjhsrvh8n1c22ifj91v1n85sqah"; + version = "0.1.2.0"; + sha256 = "0zhc0bf5gbkqqhp6bvhpf2snaagx4v4qsydvbv18blrpkavvqrbk"; libraryHaskellDepends = [ aeson async @@ -523777,8 +524203,8 @@ self: { }: mkDerivation { pname = "pms-infra-cmdrun"; - version = "0.0.7.0"; - sha256 = "1cmyxcvbx7637p96psklpm0vip1998kcl0v4mxvlbb2yjddrb1q2"; + version = "0.0.8.0"; + sha256 = "0q0780gl1jadq0qjh7dqknvv9i0g0229nsaxahv6f3n9brx9bf30"; libraryHaskellDepends = [ aeson async @@ -527931,6 +528357,31 @@ self: { } ) { }; + polytree = callPackage ( + { + mkDerivation, + base, + bifunctors, + containers, + lens, + semigroupoids, + }: + mkDerivation { + pname = "polytree"; + version = "0.0.3"; + sha256 = "1nlk71dyvjwz0nsav6ahnfvcjpqx0s9nc7d9a113m4pjpjlk0mw3"; + libraryHaskellDepends = [ + base + bifunctors + containers + lens + semigroupoids + ]; + description = "A polymorphic rose-tree"; + license = lib.licenses.bsd3; + } + ) { }; + polytypeable = callPackage ( { mkDerivation, base }: mkDerivation { @@ -537591,8 +538042,8 @@ self: { }: mkDerivation { pname = "primdata"; - version = "0.1.2.2"; - sha256 = "0cjsjcm6d71d61idkmb9d8ia26hcwzrmx8k5w1afhzpla73zfia9"; + version = "0.1.2.3"; + sha256 = "015k5c0g1l6szvf267f0hdmcw5bms932fqfpqg00r4jjygylli3b"; libraryHaskellDepends = [ base ghc-prim @@ -539783,6 +540234,8 @@ self: { pname = "procex"; version = "0.3.3"; sha256 = "1r5rrdwzjvh2mdsv63hq2rv9qq04qwmvw83niri066ini60ns9ln"; + revision = "1"; + editedCabalFile = "1saj9mgscajshbk6hw975chvh2qlmxa0nlp86hx59iza75xq186r"; libraryHaskellDepends = [ async base @@ -545098,8 +545551,8 @@ self: { }: mkDerivation { pname = "pty-mcp-server"; - version = "0.1.3.0"; - sha256 = "0440npilxvpkny8m37500ggrdc438hn94qvzrr70ip2pqsr2wdwl"; + version = "0.1.4.0"; + sha256 = "0jvchk9g1f0g77filmylqss5h4wx4fn8jssmdzfn358fh36i5710"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -545907,6 +546360,48 @@ self: { } ) { }; + pup = callPackage ( + { + mkDerivation, + base, + comonad, + containers, + hedgehog, + megaparsec, + mtl, + prettyprinter, + stacked, + text, + }: + mkDerivation { + pname = "pup"; + version = "0.1.0"; + sha256 = "15jyl295frn3ylfwm01cx630hjllcsbmkm4pl2n1anayw6j9pm0r"; + libraryHaskellDepends = [ + base + comonad + containers + megaparsec + prettyprinter + stacked + text + ]; + testHaskellDepends = [ + base + comonad + containers + hedgehog + megaparsec + mtl + prettyprinter + stacked + text + ]; + description = "Invertible format descriptors"; + license = lib.licenses.mit; + } + ) { }; + puppetresources = callPackage ( { mkDerivation, @@ -550580,8 +551075,8 @@ self: { pname = "queue-sheet"; version = "0.8.0.1"; sha256 = "1s7j51542j4in10ihb47jflwkf6m4gsi1z1aq9mzs2ksj65n1yc9"; - revision = "1"; - editedCabalFile = "0bq0abf3qzlpcy6kxrhbzm9zg9fa2ps5fj27i9c67nyc5y520ana"; + revision = "2"; + editedCabalFile = "15m5ba4w79vjqj9fd1kw0y004pmrc1a8im0v0i5c90lgpv0fcr74"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -568180,8 +568675,8 @@ self: { }: mkDerivation { pname = "relocant"; - version = "1.0.0"; - sha256 = "1iazymf953msr6d7dn99slw12wmnivnx5nfzjbq8h4f84ybwmvr6"; + version = "1.1.0"; + sha256 = "0wfifgvaxpjygyc0bcrcasln2mmsc7x0avd0ia6jjwcd9cx9d6mh"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ @@ -593105,8 +593600,8 @@ self: { }: mkDerivation { pname = "semilattices"; - version = "0.0.0.8"; - sha256 = "05dmnszyxssbjzw6f7qwq3slzd913afn562f2rnc54q9719xyybn"; + version = "0.0.0.9"; + sha256 = "1q0sm7q4v7pwvrv1sak5vchwcsqsrglhxqsaaz0bqpjhirw90qk6"; libraryHaskellDepends = [ base containers @@ -594992,20 +595487,30 @@ self: { serialport = callPackage ( { mkDerivation, + async, base, bytestring, HUnit, + optparse-applicative, unix, }: mkDerivation { pname = "serialport"; - version = "0.5.6"; - sha256 = "00cymqx8jnlanv75kqgb00harhv8prgk23gwwvadqlzdfv119iql"; + version = "0.6.0"; + sha256 = "0npkywiq7gcprlsjq0hlf5zwq882bq8v7cvlqkq2dy7xfh75195h"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring + optparse-applicative unix ]; + executableHaskellDepends = [ + async + base + optparse-applicative + ]; testHaskellDepends = [ base bytestring @@ -595013,6 +595518,7 @@ self: { ]; description = "Cross platform serial port library"; license = lib.licenses.bsd3; + mainProgram = "serialport"; } ) { }; @@ -604011,8 +604517,8 @@ self: { pname = "setlocale"; version = "1.0.0.10"; sha256 = "19rv89jkhq5ic7j5rzpygnmsbzim2mn8ip0m292za613q88gywir"; - revision = "6"; - editedCabalFile = "18i818q67cxfgz7q8zm6a0z032rh0yjhk375f99jwqh9da2h67fb"; + revision = "7"; + editedCabalFile = "0mmv245b6dxm4m6lhrnp1bccaklwd222086n952jhgi44hw2iq4a"; libraryHaskellDepends = [ base ]; description = "Haskell bindings to setlocale"; license = lib.licenses.bsd3; @@ -633358,6 +633864,25 @@ self: { } ) { }; + stacked = callPackage ( + { + mkDerivation, + base, + comonad, + }: + mkDerivation { + pname = "stacked"; + version = "0.1.0"; + sha256 = "12wh22kh73khs6w0jlf2d011pr4cs7id0rjjl1wms5xph2bcswww"; + libraryHaskellDepends = [ + base + comonad + ]; + description = "A modern indexed monad stack"; + license = lib.licenses.mit; + } + ) { }; + stacked-dag = callPackage ( { mkDerivation, @@ -639827,6 +640352,31 @@ self: { } ) { }; + streamly-filepath = callPackage ( + { + mkDerivation, + base, + exceptions, + filepath, + os-string, + streamly-core, + }: + mkDerivation { + pname = "streamly-filepath"; + version = "0.1.0"; + sha256 = "1z5qrva7rk4223ai4rm9vn8d4mnrbxsl2gimcrbbxd5yv4l83sjr"; + libraryHaskellDepends = [ + base + exceptions + filepath + os-string + streamly-core + ]; + description = "Streamly compatibility with filepath package"; + license = lib.licenses.asl20; + } + ) { }; + streamly-fsevents = callPackage ( { mkDerivation, @@ -640176,8 +640726,8 @@ self: { }: mkDerivation { pname = "streamly-statistics"; - version = "0.1.0"; - sha256 = "0qm8g33abag2y9xq6cgmk3z8ilxjnz81c4qf7r8a31l89rrswx1z"; + version = "0.2.0"; + sha256 = "02px75d8hjgsc13dnfs3khfszd210xcjj96inlzs6zb1yc39pcfl"; libraryHaskellDepends = [ base containers @@ -674879,6 +675429,37 @@ self: { } ) { }; + timeout-snooze = callPackage ( + { + mkDerivation, + base, + hspec, + stm, + stm-delay, + unliftio, + }: + mkDerivation { + pname = "timeout-snooze"; + version = "0.1.0.0"; + sha256 = "0xnci3sn0kn864lik3w7lvhqrczyn103z7gzz2zcgih113ky7sn6"; + libraryHaskellDepends = [ + base + stm + stm-delay + unliftio + ]; + testHaskellDepends = [ + base + hspec + stm + stm-delay + unliftio + ]; + description = "Efficient timeout with reset"; + license = lib.licenses.bsd3; + } + ) { }; + timeout-with-results = callPackage ( { mkDerivation, @@ -697456,7 +698037,7 @@ self: { } ) { }; - unix_2_8_7_0 = callPackage ( + unix_2_8_8_0 = callPackage ( { mkDerivation, base, @@ -697469,10 +698050,8 @@ self: { }: mkDerivation { pname = "unix"; - version = "2.8.7.0"; - sha256 = "10zv2vcq82vv56hll5mpvfwfsx6ymp2f75fwxvp5a1xgbafqgpfb"; - revision = "2"; - editedCabalFile = "0xbk68mf4j22kw1a4q732b5n6j8v5yqc55kxdk3hcwgcm0a12wys"; + version = "2.8.8.0"; + sha256 = "0gjsg9w6psn1gqzkc8akv5a2343fc3x7dlr25xb1lwzbpyixwa51"; libraryHaskellDepends = [ base bytestring @@ -710928,48 +711507,45 @@ self: { mkDerivation, aeson, base, - binary, bytestring, + case-insensitive, cookie, crypton, directory, filepath, http-types, memory, - random, - stm, text, time, wai, + wai-csrf, wai-extra, }: mkDerivation { pname = "wai-cryptocookie"; - version = "0.2"; - sha256 = "1y97641w1ms0hzzw34v67h60hy4mjwnanvb8511qp033rpyqqh53"; + version = "0.3"; + sha256 = "1g2i1fjdpca0zq7pib6szh8zadrqb93sw1bqi12il5fhd805swh9"; libraryHaskellDepends = [ aeson base - binary bytestring + case-insensitive cookie crypton http-types memory - stm text time wai + wai-csrf ]; testHaskellDepends = [ - aeson base - binary + bytestring + cookie directory filepath http-types - random - stm wai wai-extra ]; @@ -710978,6 +711554,48 @@ self: { } ) { }; + wai-csrf = callPackage ( + { + mkDerivation, + base, + bytestring, + case-insensitive, + cookie, + crypton, + http-types, + memory, + time, + wai, + wai-extra, + }: + mkDerivation { + pname = "wai-csrf"; + version = "0.1"; + sha256 = "0i6bwp6libbbv1q0gcrn5cgk66v4ll84gsycxcw18r3nmh3qdawa"; + libraryHaskellDepends = [ + base + bytestring + case-insensitive + cookie + crypton + http-types + memory + time + wai + ]; + testHaskellDepends = [ + base + bytestring + cookie + http-types + wai + wai-extra + ]; + description = "Cross-site request forgery protection for WAI"; + license = lib.licenses.asl20; + } + ) { }; + wai-devel = callPackage ( { mkDerivation, @@ -733061,10 +733679,12 @@ self: { }: mkDerivation { pname = "xnobar"; - version = "0.0.0.1"; - sha256 = "15j9drn1igv5s1z7p5v71vy2i2a2f4gsaz5z6my1vkm097rbz51z"; - revision = "3"; - editedCabalFile = "122chc3px07ij5kk69bsbzrppkxxqd29cxma9zp48pjjakibwp3n"; + version = "0.0.0.2"; + sha256 = "1cs9kp2h07dx39rzykmylv5fvmdyynwmyj7mlxy6n95bawz4z1f4"; + revision = "1"; + editedCabalFile = "1b34ifw8rnb19gjgksljxcxb54y0qskjwwka5ly8bq84ll756v6n"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ async base @@ -733078,6 +733698,10 @@ self: { transformers xmobar ]; + executableHaskellDepends = [ + base + xmobar + ]; testHaskellDepends = [ base extra @@ -733088,6 +733712,7 @@ self: { license = lib.licenses.bsd3; badPlatforms = lib.platforms.darwin; hydraPlatforms = lib.platforms.none; + mainProgram = "Echo"; broken = true; } ) { }; From 1deb92346fcabee253bca127c316d2dabd1f8df1 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 15 Sep 2025 15:07:26 +0200 Subject: [PATCH 21/84] haskellPackages.mkDerivation: enforce unix line endings in cabal files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Automatically use sed(1) to remove DOS line endings from .cabal files. This is intended to work around Hackage producing revised cabal files with DOS line endings (https://github.com/haskell/hackage-server/issues/316). This frequently leads to - patches failing to apply. Unfortunately there is no way to apply a patch with Unix line endings to a file with DOS line endings with GNU patch(1). Only the following combinations are supported: file patch comment Unix Unix DOS DOS using --binary DOS Unix Haven't tested it, but I assume it works because patch(1) converts the file to Unix line endings implicitly (which can be disabled using --binary), but never the patch… - Test suites sometimes involve the .cabal file which can be affected by the line endings. This behavior is enabled by default to prevent cases where (unrevised) packages regress when they get a revision later. Of course, the behavior is a little nonsensical for non-Hackage packages, but it is probably rarely an issue in practice. When DOS line endings need to be preserved, the user can pass `dontConvertCabalFileToUnix = true`. Supersedes #279248. Resolves #206840. --- doc/languages-frameworks/haskell.section.md | 8 + doc/release-notes/rl-2511.section.md | 2 + .../haskell-modules/configuration-common.nix | 137 ++++++------------ .../haskell-modules/configuration-nix.nix | 9 -- .../haskell-modules/generic-builder.nix | 8 + 5 files changed, 59 insertions(+), 105 deletions(-) diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md index d9246994676d5..adeca607b44db 100644 --- a/doc/languages-frameworks/haskell.section.md +++ b/doc/languages-frameworks/haskell.section.md @@ -260,6 +260,14 @@ the same package with the `previousIntermediates` argument to support incremental builds. See [“Incremental builds”](#haskell-incremental-builds) for more information. Defaults to `false`. +`dontConvertCabalFileToUnix` +: By default, `haskellPackages.mkDerivation` converts the `.cabal` file of a +given package to Unix line endings. +This is intended to work around +[Hackage converting revised `.cabal` files to DOS line endings](https://github.com/haskell/hackage-server/issues/316) +which frequently causes patches to stop applying. +You can pass `true` to disable this behavior. + `enableLibraryProfiling` : Whether to enable [profiling][profiling] for libraries contained in the package. Enabled by default if supported. diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index 21ba9e4866aef..721eed57d8464 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -34,6 +34,8 @@ - GHC 8.6, 8.10, 9.0, 9.2, and their package sets have been removed. +- The `haskellPackages.mkDerivation` builder now converts packages' cabal files to Unix line endings before `patchPhase`. This behavior can be disabled using `dontConvertCabalFileToUnix`. + - Support for bootstrapping native GHC compilers on 32‐bit ARM and little‐endian 64‐bit PowerPC has been dropped. The latter was probably broken anyway. If there is interest in restoring support for these architectures, it should be possible to cross‐compile a bootstrap GHC binary. diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 6610e0601ee96..bd1e3a1f0b79b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -128,10 +128,6 @@ with haskellLib; overrideCabal ( old: { - # Prevent DOS line endings from Hackage from breaking a patch - prePatch = old.prePatch or "" + '' - ${pkgs.buildPackages.dos2unix}/bin/dos2unix *.cabal - ''; # Ignore unix bound intended to prevent an unix bug on 32bit systems. # We apply a patch for this issue to the GHC core packages directly. # See unix-fix-ctimeval-size-32-bit.patch in ../compilers/ghc/common-*.nix @@ -451,24 +447,14 @@ with haskellLib; arion-compose = dontCheck super.arion-compose; # Don't call setEnv in parallel in the test suite (which leads to flaky failures) - env-extra = - appendPatches - [ - (pkgs.fetchpatch { - name = "env-extra-no-parallel-setenv.patch"; - url = "https://github.com/d12frosted/env-extra/commit/4fcbc031b210e71e4243fcfe7c48d381e2f51d78.patch"; - sha256 = "sha256-EbXk+VOmxMJAMCMTXpTiW8fkbNI9za7f1alzCeaJaV4="; - excludes = [ "package.yaml" ]; - }) - ] - ( - overrideCabal (drv: { - prePatch = '' - ${drv.prePatch or ""} - ${lib.getExe' pkgs.buildPackages.dos2unix "dos2unix"} *.cabal - ''; - }) super.env-extra - ); + env-extra = appendPatches [ + (pkgs.fetchpatch { + name = "env-extra-no-parallel-setenv.patch"; + url = "https://github.com/d12frosted/env-extra/commit/4fcbc031b210e71e4243fcfe7c48d381e2f51d78.patch"; + sha256 = "sha256-EbXk+VOmxMJAMCMTXpTiW8fkbNI9za7f1alzCeaJaV4="; + excludes = [ "package.yaml" ]; + }) + ] super.env-extra; # This used to be a core package provided by GHC, but then the compiler # dropped it. We define the name here to make sure that old packages which @@ -697,21 +683,11 @@ with haskellLib; nix-graph = doJailbreak super.nix-graph; # Allow inspection-testing >= 0.6 in test suite - algebraic-graphs = - appendPatch - (pkgs.fetchpatch2 { - name = "algebraic-graphs-0.7-allow-inspection-testing-0.6.patch"; - url = "https://github.com/snowleopard/alga/commit/d4e43fb42db05413459fb2df493361d5a666588a.patch"; - hash = "sha256-feGEuALVJ0Zl8zJPIfgEFry9eH/MxA0Aw7zlDq0PC/s="; - }) - ( - overrideCabal (drv: { - prePatch = '' - ${drv.prePatch or ""} - ${lib.getExe' pkgs.buildPackages.dos2unix "dos2unix"} *.cabal - ''; - }) super.algebraic-graphs - ); + algebraic-graphs = appendPatch (pkgs.fetchpatch2 { + name = "algebraic-graphs-0.7-allow-inspection-testing-0.6.patch"; + url = "https://github.com/snowleopard/alga/commit/d4e43fb42db05413459fb2df493361d5a666588a.patch"; + hash = "sha256-feGEuALVJ0Zl8zJPIfgEFry9eH/MxA0Aw7zlDq0PC/s="; + }) super.algebraic-graphs; # Too strict bounds on hspec # https://github.com/illia-shkroba/pfile/issues/2 @@ -1519,14 +1495,6 @@ with haskellLib; # dontCheck: use of non-standard strptime "%s" which musl doesn't support; only used in test unix-time = if pkgs.stdenv.hostPlatform.isMusl then dontCheck super.unix-time else super.unix-time; - # Workaround for https://github.com/sol/hpack/issues/528 - # The hpack test suite can't deal with the CRLF line endings hackage revisions insert - hpack = overrideCabal (drv: { - postPatch = drv.postPatch or "" + '' - "${lib.getBin pkgs.buildPackages.dos2unix}/bin/dos2unix" *.cabal - ''; - }) super.hpack; - # hslua has tests that break when using musl. # https://github.com/hslua/hslua/issues/106 hslua-core = @@ -1892,23 +1860,13 @@ with haskellLib; prettyprinter-ansi-terminal = dontCheck super.prettyprinter-ansi-terminal; # Released version prohibits QuickCheck >= 2.15 at the moment - optparse-applicative = - appendPatches - [ - (pkgs.fetchpatch2 { - name = "optparse-applicative-0.18.1-allow-QuickCheck-2.15.patch"; - url = "https://github.com/pcapriotti/optparse-applicative/commit/2c2a39ed53e6339d8dc717efeb7d44f4c2b69cab.patch"; - hash = "sha256-198TfBUR3ygPpvKPvtH69UmbMmoRagmzr9UURPr6Kj4="; - }) - ] - ( - overrideCabal (drv: { - prePatch = '' - ${drv.prePatch or ""} - ${lib.getExe' pkgs.buildPackages.dos2unix "dos2unix"} *.cabal - ''; - }) super.optparse-applicative - ); + optparse-applicative = appendPatches [ + (pkgs.fetchpatch2 { + name = "optparse-applicative-0.18.1-allow-QuickCheck-2.15.patch"; + url = "https://github.com/pcapriotti/optparse-applicative/commit/2c2a39ed53e6339d8dc717efeb7d44f4c2b69cab.patch"; + hash = "sha256-198TfBUR3ygPpvKPvtH69UmbMmoRagmzr9UURPr6Kj4="; + }) + ] super.optparse-applicative; # chell-quickcheck doesn't work with QuickCheck >= 2.15 with no known fix yet # https://github.com/typeclasses/chell/issues/5 @@ -2675,10 +2633,6 @@ with haskellLib; # hexstring is not compatible with newer versions of base16-bytestring # See https://github.com/solatis/haskell-hexstring/issues/3 hexstring = overrideCabal (old: { - # Prevent DOS line endings from Hackage from breaking a patch - prePatch = old.prePatch or "" + '' - ${pkgs.buildPackages.dos2unix}/bin/dos2unix src/Data/HexString.hs - ''; patches = old.patches or [ ] ++ [ (pkgs.fetchpatch { name = "fix-base16-bytestring-compat"; @@ -2777,36 +2731,27 @@ with haskellLib; # Overly strict bounds on tasty-quickcheck (test suite) (< 0.11) hashable = doJailbreak super.hashable; - cborg = lib.pipe super.cborg [ - (appendPatches [ - # This patch changes CPP macros form gating on the version of ghc-prim to base - # since that's where the definitions are imported from. The source commit - # also changes the cabal file metadata which we filter out since we are - # only interested in this change as a dependency of cborg-i686-support-upstream.patch. - (pkgs.fetchpatch { - name = "cborg-no-gate-on-ghc-prim-version.patch"; - url = "https://github.com/well-typed/cborg/commit/a33f94f616f5047e45608a34ca16bfb1304ceaa1.patch"; - hash = "sha256-30j4Dksh2nnLKAcUF5XJw3Z/UjfV3F+JFnHeXSUs9Rk="; - includes = [ "**/Codec/CBOR/**" ]; - stripLen = 1; - }) - # Fixes compilation on 32-bit platforms. Unreleased patch committed to the - # upstream master branch: https://github.com/well-typed/cborg/pull/351 - (pkgs.fetchpatch { - name = "cborg-i686-support-upstream.patch"; - url = "https://github.com/well-typed/cborg/commit/ecc1360dcf9e9ee27d08de5206b844e075c88ca4.patch"; - hash = "sha256-9m2FlG6ziRxA1Dy22mErBaIjiZHa1dqtkbmFnMMFrTI="; - stripLen = 1; - }) - ]) - # Make sure patches to cborg.cabal apply - (overrideCabal (drv: { - prePatch = '' - ${drv.prePatch or ""} - ${lib.getExe' pkgs.buildPackages.dos2unix "dos2unix"} *.cabal - ''; - })) - ]; + cborg = appendPatches [ + # This patch changes CPP macros form gating on the version of ghc-prim to base + # since that's where the definitions are imported from. The source commit + # also changes the cabal file metadata which we filter out since we are + # only interested in this change as a dependency of cborg-i686-support-upstream.patch. + (pkgs.fetchpatch { + name = "cborg-no-gate-on-ghc-prim-version.patch"; + url = "https://github.com/well-typed/cborg/commit/a33f94f616f5047e45608a34ca16bfb1304ceaa1.patch"; + hash = "sha256-30j4Dksh2nnLKAcUF5XJw3Z/UjfV3F+JFnHeXSUs9Rk="; + includes = [ "**/Codec/CBOR/**" ]; + stripLen = 1; + }) + # Fixes compilation on 32-bit platforms. Unreleased patch committed to the + # upstream master branch: https://github.com/well-typed/cborg/pull/351 + (pkgs.fetchpatch { + name = "cborg-i686-support-upstream.patch"; + url = "https://github.com/well-typed/cborg/commit/ecc1360dcf9e9ee27d08de5206b844e075c88ca4.patch"; + hash = "sha256-9m2FlG6ziRxA1Dy22mErBaIjiZHa1dqtkbmFnMMFrTI="; + stripLen = 1; + }) + ] super.cborg; # Doesn't compile with tasty-quickcheck == 0.11 (see issue above) serialise = dontCheck super.serialise; diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 16573cbe50517..75b9f19b7ec4e 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -711,9 +711,6 @@ builtins.intersectAttrs super { patches = drv.patches or [ ] ++ [ ./patches/GLUT.patch ]; - prePatch = drv.prePatch or "" + '' - ${lib.getBin pkgs.buildPackages.dos2unix}/bin/dos2unix *.cabal - ''; }) super.GLUT; libsystemd-journal = addExtraLibrary pkgs.systemd super.libsystemd-journal; @@ -1627,12 +1624,6 @@ builtins.intersectAttrs super { # Additionally install documentation jacinda = overrideCabal (drv: { enableSeparateDocOutput = true; - # Test suite is broken by DOS line endings inserted by Hackage revisions - # https://github.com/vmchale/jacinda/issues/5 - postPatch = '' - ${drv.postPatch or ""} - ${pkgs.buildPackages.dos2unix}/bin/dos2unix *.cabal - ''; postInstall = '' ${drv.postInstall or ""} diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index f2ea85774d60f..d1ef4e81e213c 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -184,6 +184,11 @@ in # See https://nixos.org/manual/nixpkgs/unstable/#haskell-packaging-helpers # or its source doc/languages-frameworks/haskell.section.md disallowGhcReference ? false, + # By default we convert the `.cabal` file to Unix line endings to work around + # Hackage converting them to DOS line endings when revised, see + # . + # Pass `true` to disable this behavior. + dontConvertCabalFileToUnix ? false, # Cabal 3.8 which is shipped by default for GHC >= 9.3 always calls # `pkg-config --libs --static` as part of the configure step. This requires # Requires.private dependencies of pkg-config dependencies to be present in @@ -601,6 +606,9 @@ lib.fix ( echo "Replace Cabal file with edited version from ${newCabalFileUrl}." cp ${newCabalFile} ${pname}.cabal '' + + lib.optionalString (!dontConvertCabalFileToUnix) '' + sed -i '${pname}.cabal' -e 's/\r$//' + '' + prePatch; postPatch = From b7c88f16f4c9545e4b3a78754b63e2f1f0cca59c Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 26 Sep 2025 13:56:01 +0200 Subject: [PATCH 22/84] ghcWithPackages: make krank ignore informational issue references --- pkgs/development/haskell-modules/with-packages-wrapper.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index aba7c109a6b31..0637c97a37144 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -124,7 +124,8 @@ else fi done - # haddock was referring to the base ghc, https://github.com/NixOS/nixpkgs/issues/36976 + # haddock needs to be wrapped like GHC, see + # https://github.com/NixOS/nixpkgs/issues/36976 krank:ignore-line if [[ -x "${ghc}/bin/haddock" ]]; then rm -f $out/bin/haddock makeWrapper ${ghc}/bin/haddock $out/bin/haddock \ @@ -171,7 +172,7 @@ else # ghc-pkg is now trying to open the file. These file are symlink # to another nix derivation, so they are not writable. Removing # them allow the correct behavior of ghc-pkg recache - # See: https://github.com/NixOS/nixpkgs/issues/79441 + # See: https://github.com/NixOS/nixpkgs/issues/79441 krank:ignore-line rm ${packageCfgDir}/package.cache.lock rm ${packageCfgDir}/package.cache From e1831c312a5c74ca096502f00c559781e2ce664c Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 21 Sep 2025 15:53:25 +0200 Subject: [PATCH 23/84] haskell.compiler: make krank ignore informational issue references A lot of the links to issues in pkgs/development/compilers/ghc note historical issues we need to workaround for outdated versions of GHC or note related discussion. Them being closed is not actionable in many cases so I have marked them with krank:ignore-line, so they don't show up in reports generated using krank. --- .../compilers/ghc/9.0.2-binary.nix | 2 +- .../compilers/ghc/9.2.4-binary.nix | 2 +- .../compilers/ghc/9.6.3-binary.nix | 2 +- .../compilers/ghc/9.8.4-binary.nix | 2 +- .../compilers/ghc/common-hadrian.nix | 22 ++++++++++--------- .../ghc/common-make-native-bignum.nix | 16 +++++++------- pkgs/top-level/haskell-packages.nix | 2 +- 7 files changed, 25 insertions(+), 23 deletions(-) diff --git a/pkgs/development/compilers/ghc/9.0.2-binary.nix b/pkgs/development/compilers/ghc/9.0.2-binary.nix index e99a7fe331c89..8a301d40edd76 100644 --- a/pkgs/development/compilers/ghc/9.0.2-binary.nix +++ b/pkgs/development/compilers/ghc/9.0.2-binary.nix @@ -477,7 +477,7 @@ stdenv.mkDerivation { # GHC cannot currently produce outputs that are ready for `-pie` linking. # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear. # See: - # * https://github.com/NixOS/nixpkgs/issues/129247 + # * https://github.com/NixOS/nixpkgs/issues/129247 krank:ignore-line # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580 hardeningDisable = [ "pie" ]; diff --git a/pkgs/development/compilers/ghc/9.2.4-binary.nix b/pkgs/development/compilers/ghc/9.2.4-binary.nix index 2031babd4ebb5..09dfc715f656d 100644 --- a/pkgs/development/compilers/ghc/9.2.4-binary.nix +++ b/pkgs/development/compilers/ghc/9.2.4-binary.nix @@ -441,7 +441,7 @@ stdenv.mkDerivation { # GHC cannot currently produce outputs that are ready for `-pie` linking. # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear. # See: - # * https://github.com/NixOS/nixpkgs/issues/129247 + # * https://github.com/NixOS/nixpkgs/issues/129247 krank:ignore-line # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580 hardeningDisable = [ "pie" ]; diff --git a/pkgs/development/compilers/ghc/9.6.3-binary.nix b/pkgs/development/compilers/ghc/9.6.3-binary.nix index 814c188be2da4..2c720917c7f2a 100644 --- a/pkgs/development/compilers/ghc/9.6.3-binary.nix +++ b/pkgs/development/compilers/ghc/9.6.3-binary.nix @@ -420,7 +420,7 @@ stdenv.mkDerivation { # GHC cannot currently produce outputs that are ready for `-pie` linking. # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear. # See: - # * https://github.com/NixOS/nixpkgs/issues/129247 + # * https://github.com/NixOS/nixpkgs/issues/129247 krank:ignore-line # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580 hardeningDisable = [ "pie" ]; diff --git a/pkgs/development/compilers/ghc/9.8.4-binary.nix b/pkgs/development/compilers/ghc/9.8.4-binary.nix index 11422665a057a..1d5de11f2ae05 100644 --- a/pkgs/development/compilers/ghc/9.8.4-binary.nix +++ b/pkgs/development/compilers/ghc/9.8.4-binary.nix @@ -435,7 +435,7 @@ stdenv.mkDerivation { # GHC cannot currently produce outputs that are ready for `-pie` linking. # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear. # See: - # * https://github.com/NixOS/nixpkgs/issues/129247 + # * https://github.com/NixOS/nixpkgs/issues/129247 krank:ignore-line # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580 hardeningDisable = [ "pie" ]; diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index 9a0aa7f404019..442791788fb92 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -185,14 +185,14 @@ || (lib.versionAtLeast version "9.8" && lib.versionOlder version "9.11"); in - # Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129 + # Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129 krank:ignore-line lib.optionals (lib.versionOlder version "9.6.7") [ ./docs-sphinx-7.patch ] ++ lib.optionals (lib.versionAtLeast version "9.6" && lib.versionOlder version "9.6.5") [ # Fix aarch64-linux builds of 9.6.0 - 9.6.4. # Fixes a pointer type mismatch in the RTS. - # https://gitlab.haskell.org/ghc/ghc/-/issues/24348 + # https://gitlab.haskell.org/ghc/ghc/-/issues/24348 krank:ignore-line (fetchpatch { name = "fix-incompatible-pointer-types.patch"; url = "https://gitlab.haskell.org/ghc/ghc/-/commit/1e48c43483693398001bfb0ae644a3558bf6a9f3.diff"; @@ -211,8 +211,8 @@ [ # Determine size of time related types using hsc2hs instead of assuming CLong. # Prevents failures when e.g. stat(2)ing on 32bit systems with 64bit time_t etc. - # https://github.com/haskell/ghcup-hs/issues/1107 - # https://gitlab.haskell.org/ghc/ghc/-/issues/25095 + # https://github.com/haskell/ghcup-hs/issues/1107 krank:ignore-line + # https://gitlab.haskell.org/ghc/ghc/-/issues/25095 krank:ignore-line # Note that in normal situations this shouldn't be the case since nixpkgs # doesn't set -D_FILE_OFFSET_BITS=64 and friends (yet). (fetchpatch { @@ -232,7 +232,7 @@ ] ++ lib.optionals (lib.versionAtLeast version "9.6" && lib.versionOlder version "9.8") [ # Fix unlit being installed under a different name than is used in the - # settings file: https://gitlab.haskell.org/ghc/ghc/-/issues/23317 + # settings file: https://gitlab.haskell.org/ghc/ghc/-/issues/23317 krank:ignore-line (fetchpatch { name = "ghc-9.6-fix-unlit-path.patch"; url = "https://gitlab.haskell.org/ghc/ghc/-/commit/8fde4ac84ec7b1ead238cb158bbef48555d12af9.patch"; @@ -245,7 +245,7 @@ # # These cause problems as they're not eliminated by GHC's dead code # elimination on aarch64-darwin. (see - # https://github.com/NixOS/nixpkgs/issues/140774 for details). + # https://github.com/NixOS/nixpkgs/issues/140774 for details). krank:ignore-line ( if lib.versionOlder version "9.10" then ./Cabal-at-least-3.6-paths-fix-cycle-aarch64-darwin.patch @@ -266,7 +266,8 @@ # impossible to import an existing flavour in UserSettings, so patching # the defaults is actually simpler and less maintenance intensive # compared to keeping an entire flavour definition in sync with upstream - # manually. See also https://gitlab.haskell.org/ghc/ghc/-/issues/23625 + # manually. + # See also https://gitlab.haskell.org/ghc/ghc/-/issues/23625 krank:ignore-line ++ lib.optionals (!enableHyperlinkedSource) [ ( if lib.versionOlder version "9.8" then @@ -285,7 +286,7 @@ ] # Fixes stack overrun in rts which crashes an process whenever # freeHaskellFunPtr is called with nixpkgs' hardening flags. - # https://gitlab.haskell.org/ghc/ghc/-/issues/25485 + # https://gitlab.haskell.org/ghc/ghc/-/issues/25485 krank:ignore-line # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/13599 ++ lib.optionals (lib.versionOlder version "9.13") [ (fetchpatch { @@ -789,7 +790,7 @@ stdenv.mkDerivation ( # GHC cannot currently produce outputs that are ready for `-pie` linking. # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear. # See: - # * https://github.com/NixOS/nixpkgs/issues/129247 + # * https://github.com/NixOS/nixpkgs/issues/129247 krank:ignore-line # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580 hardeningDisable = [ "format" @@ -814,7 +815,8 @@ stdenv.mkDerivation ( '' # the bindist configure script uses different env variables than the GHC configure script - # see https://github.com/NixOS/nixpkgs/issues/267250 and https://gitlab.haskell.org/ghc/ghc/-/issues/24211 + # see https://github.com/NixOS/nixpkgs/issues/267250 krank:ignore-line + # https://gitlab.haskell.org/ghc/ghc/-/issues/24211 krank:ignore-line + lib.optionalString (stdenv.targetPlatform.linker == "cctools") '' export InstallNameToolCmd=$INSTALL_NAME_TOOL export OtoolCmd=$OTOOL diff --git a/pkgs/development/compilers/ghc/common-make-native-bignum.nix b/pkgs/development/compilers/ghc/common-make-native-bignum.nix index 922875e6b4e1a..900e04aed39ce 100644 --- a/pkgs/development/compilers/ghc/common-make-native-bignum.nix +++ b/pkgs/development/compilers/ghc/common-make-native-bignum.nix @@ -134,7 +134,7 @@ let # program is built (which we generally always want to have a complete GHC install) # and whether it is run on the GHC sources to generate hyperlinked source code # (which is impossible for cross-compilation); see: - # https://gitlab.haskell.org/ghc/ghc/-/issues/20077 + # https://gitlab.haskell.org/ghc/ghc/-/issues/20077 krank:ignore-line # This implies that currently a cross-compiled GHC will never have a `haddock` # program, so it can never generate haddocks for any packages. # If this is solved in the future, we'd like to unconditionally @@ -292,8 +292,8 @@ stdenv.mkDerivation ( patches = [ # Determine size of time related types using hsc2hs instead of assuming CLong. # Prevents failures when e.g. stat(2)ing on 32bit systems with 64bit time_t etc. - # https://github.com/haskell/ghcup-hs/issues/1107 - # https://gitlab.haskell.org/ghc/ghc/-/issues/25095 + # https://github.com/haskell/ghcup-hs/issues/1107 krank:ignore-line + # https://gitlab.haskell.org/ghc/ghc/-/issues/25095 krank:ignore-line # Note that in normal situations this shouldn't be the case since nixpkgs # doesn't set -D_FILE_OFFSET_BITS=64 and friends (yet). (fetchpatch { @@ -304,7 +304,7 @@ stdenv.mkDerivation ( extraPrefix = "libraries/unix/"; }) - # Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129 + # Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129 krank:ignore-line ./docs-sphinx-7.patch # Correctly record libnuma's library and include directories in the @@ -328,7 +328,7 @@ stdenv.mkDerivation ( # the solution is to backport those changes from GHC 9.6 that skip the intermediate # assembly step. # - # https://gitlab.haskell.org/ghc/ghc/-/issues/25608#note_622589 + # https://gitlab.haskell.org/ghc/ghc/-/issues/25608#note_622589 krank:ignore-line # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6877 ++ [ # Need to use this patch so the next one applies, passes file location info to the cc phase @@ -358,7 +358,7 @@ stdenv.mkDerivation ( # Fixes stack overrun in rts which crashes an process whenever # freeHaskellFunPtr is called with nixpkgs' hardening flags. - # https://gitlab.haskell.org/ghc/ghc/-/issues/25485 + # https://gitlab.haskell.org/ghc/ghc/-/issues/25485 krank:ignore-line # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/13599 # TODO: patch doesn't apply for < 9.4, but may still be necessary? ++ [ @@ -375,7 +375,7 @@ stdenv.mkDerivation ( # # These cause problems as they're not eliminated by GHC's dead code # elimination on aarch64-darwin. (see - # https://github.com/NixOS/nixpkgs/issues/140774 for details). + # https://github.com/NixOS/nixpkgs/issues/140774 for details). krank:ignore-line ./Cabal-at-least-3.6-paths-fix-cycle-aarch64-darwin.patch ]; @@ -592,7 +592,7 @@ stdenv.mkDerivation ( # GHC cannot currently produce outputs that are ready for `-pie` linking. # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear. # See: - # * https://github.com/NixOS/nixpkgs/issues/129247 + # * https://github.com/NixOS/nixpkgs/issues/129247 krank:ignore-line # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580 hardeningDisable = [ "format" diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b013eaefd123b..2865a084a62ed 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -87,7 +87,7 @@ in ghc948 = callPackage ../development/compilers/ghc/9.4.8.nix { bootPkgs = # Building with 9.2 is broken due to - # https://gitlab.haskell.org/ghc/ghc/-/issues/21914 + # https://gitlab.haskell.org/ghc/ghc/-/issues/21914 krank:ignore-line bb.packages.ghc902Binary; inherit (buildPackages.python3Packages) sphinx; inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; From 3bb02f4081473472dd84fb06039e5f182a4639d6 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 21 Sep 2025 16:08:11 +0200 Subject: [PATCH 24/84] doc/haskell: make krank ignore informational issue reference --- doc/languages-frameworks/haskell.section.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md index adeca607b44db..f81c1b77d84ed 100644 --- a/doc/languages-frameworks/haskell.section.md +++ b/doc/languages-frameworks/haskell.section.md @@ -1257,8 +1257,8 @@ it does for the unstable branches. ### Why is topic X not covered in this section? Why is section Y missing? {#haskell-why-not-covered} We have been working on [moving the nixpkgs Haskell documentation back into the -nixpkgs manual](https://github.com/NixOS/nixpkgs/issues/121403). Since this -process has not been completed yet, you may find some topics missing here +nixpkgs manual](https://github.com/NixOS/nixpkgs/issues/121403). +Since this process has not been completed yet, you may find some topics missing here covered in the old [haskell4nix docs](https://haskell4nix.readthedocs.io/). If you feel any important topic is not documented at all, feel free to comment From 19420d092f9435bbfe6e6a6ea9f5c20c11e8cd07 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 21 Sep 2025 22:07:43 +0200 Subject: [PATCH 25/84] test.haskell: make krank ignore purely informational issue reference --- pkgs/test/haskell/upstreamStackHpackVersion/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/test/haskell/upstreamStackHpackVersion/default.nix b/pkgs/test/haskell/upstreamStackHpackVersion/default.nix index 5092bb4730496..5b7a7ff724b58 100644 --- a/pkgs/test/haskell/upstreamStackHpackVersion/default.nix +++ b/pkgs/test/haskell/upstreamStackHpackVersion/default.nix @@ -5,7 +5,8 @@ # matches with the version of hpack used by the upstream stack release. This # is because hpack works slightly differently based on the version, and it can # be frustrating to use hpack in a team setting when members are using different -# versions. See for more info: https://github.com/NixOS/nixpkgs/issues/223390 +# versions. See for more info: +# https://github.com/NixOS/nixpkgs/issues/223390 krank:ignore-line # # This test is written as a fixed-output derivation, because we need to access # accesses the internet to download the upstream stack release. From fffe18dcd944f734cbcead62ddb200983d60e0e7 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 21 Sep 2025 22:08:41 +0200 Subject: [PATCH 26/84] haskellPackages.blockio-uring: update issue reference Upstream added support for liburing 2.11, but since then we have updated to liburing 2.12. --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 1dca02112466b..27e50181c9b17 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -531,8 +531,8 @@ broken-packages: - bliplib # failure in job https://hydra.nixos.org/build/233195751 at 2023-09-02 - blockchain # failure in job https://hydra.nixos.org/build/233245492 at 2023-09-02 - blockhash # failure in job https://hydra.nixos.org/build/233227049 at 2023-09-02 - - blockio-uring # failure in job https://hydra.nixos.org/build/302801498, https://github.com/well-typed/blockio-uring/issues/44 at 2025-07-27 - - blockio-uring # https://github.com/well-typed/blockio-uring/issues/44, added 2025-07-27 + - blockio-uring # failure in job https://hydra.nixos.org/build/302801498, https://github.com/well-typed/blockio-uring/issues/47 at 2025-07-27 + - blockio-uring # https://github.com/well-typed/blockio-uring/issues/47, added 2025-07-27 - Blogdown # failure in job https://hydra.nixos.org/build/233239841 at 2023-09-02 - BlogLiterately # failure in job https://hydra.nixos.org/build/233202164 at 2023-09-02 - bloodhound-amazonka-auth # failure building library in job https://hydra.nixos.org/build/237245625 at 2023-10-21 From fc2d612b1d92a7775eea0926038a2fa48b49d2d7 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 22 Sep 2025 02:25:40 +0200 Subject: [PATCH 27/84] haskellPackages.serialport: explain why we skip the test suite --- pkgs/development/haskell-modules/configuration-common.nix | 3 --- pkgs/development/haskell-modules/configuration-nix.nix | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index bd1e3a1f0b79b..900ab20e137d2 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -817,9 +817,6 @@ with haskellLib; # Upstream notified by e-mail. permutation = dontCheck super.permutation; - # https://github.com/jputcu/serialport/issues/25 - serialport = dontCheck super.serialport; - # Test suite depends on source code being available simple-affine-space = dontCheck super.simple-affine-space; diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 75b9f19b7ec4e..dcbbddbf611ba 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -286,6 +286,10 @@ builtins.intersectAttrs super { })) ]; + # Test suite requires access to an actual serial port + # https://github.com/jputcu/serialport/issues/25 krank:ignore-line + serialport = dontCheck super.serialport; + # Provides a library and an executable (pretty-derivation) nix-derivation = enableSeparateBinOutput super.nix-derivation; From 1780b13e360e443dc5ea05ffab1beb8024f8c306 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 22 Sep 2025 02:26:16 +0200 Subject: [PATCH 28/84] haskellPackages.GLFW-b: explain why we skip the test suite --- pkgs/development/haskell-modules/configuration-common.nix | 1 - pkgs/development/haskell-modules/configuration-nix.nix | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 900ab20e137d2..e1be481d1b979 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -938,7 +938,6 @@ with haskellLib; git-vogue = dontCheck super.git-vogue; github-rest = dontCheck super.github-rest; # test suite needs the network gitlib-cmdline = dontCheck super.gitlib-cmdline; - GLFW-b = dontCheck super.GLFW-b; # https://github.com/bsl/GLFW-b/issues/50 hackport = dontCheck super.hackport; hadoop-formats = dontCheck super.hadoop-formats; hashed-storage = dontCheck super.hashed-storage; diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index dcbbddbf611ba..c10045f763497 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -517,6 +517,8 @@ builtins.intersectAttrs super { addExtraLibraries [ pkgs.libGLU pkgs.libGL ] (super.hsqml.override { qt5 = pkgs.qt5Full; }) ); monomer = dontCheck super.monomer; + # GLFW init fails in sandbox https://github.com/bsl/GLFW-b/issues/50 krank:ignore-line + GLFW-b = dontCheck super.GLFW-b; # Wants to check against a real DB, Needs freetds odbc = dontCheck (addExtraLibraries [ pkgs.freetds ] super.odbc); From 3712b50a4a5ae1178064d3ae2b3ac984ae2d82c5 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 22 Sep 2025 02:44:02 +0200 Subject: [PATCH 29/84] nixfmt-classic: note current ticket for bounds issue --- pkgs/development/haskell-modules/configuration-common.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index e1be481d1b979..e77a9dc10b77e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -671,7 +671,8 @@ with haskellLib; postPatch = "sed -i s/home/tmp/ test/Spec.hs"; }) super.shell-conduit; - # https://github.com/serokell/nixfmt/issues/130 + # No maintenance planned until eventual removal + # https://github.com/NixOS/nixfmt/issues/340#issuecomment-3315920564 nixfmt = doJailbreak super.nixfmt; # Too strict upper bounds on turtle and text From e13fa666211f519b0aa6c087543316f945495182 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 22 Sep 2025 02:44:51 +0200 Subject: [PATCH 30/84] haskellPackages.pfile: note current ticket for bounds issue --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index e77a9dc10b77e..33920e2f810a3 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -690,8 +690,8 @@ with haskellLib; hash = "sha256-feGEuALVJ0Zl8zJPIfgEFry9eH/MxA0Aw7zlDq0PC/s="; }) super.algebraic-graphs; - # Too strict bounds on hspec - # https://github.com/illia-shkroba/pfile/issues/2 + # Too strict bounds on filepath, hpsec, tasty, tasty-quickcheck, transformers + # https://github.com/illia-shkroba/pfile/issues/3 pfile = doJailbreak super.pfile; # Manually maintained From 89d686c14e67e411a23bfa98896befae31167b1c Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 22 Sep 2025 02:45:12 +0200 Subject: [PATCH 31/84] haskellPackages.regex-applicative-text:note it won't receive updates Closed issue indicates WONTFIX, so we can make krank ignore it. --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 33920e2f810a3..8c9764982fda4 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -772,8 +772,8 @@ with haskellLib; else dontDistribute (markBroken super.fclabels); - # Bounds on base are too strict. - # https://github.com/phadej/regex-applicative-text/issues/13 + # Bounds on base are too strict. Upstream is no longer maintained: + # https://github.com/phadej/regex-applicative-text/issues/13 krank:ignore-line regex-applicative-text = doJailbreak super.regex-applicative-text; # Tests require a Kafka broker running locally From dc9dcaf7ac1ab64258a2eae8684bac3a50f4f1fb Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 22 Sep 2025 02:46:55 +0200 Subject: [PATCH 32/84] haskellPackages.lzma-conduit: make krank ignore closed issue MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Not really actionable since the reporter closed it because the project “seems abandoned”. Good that cachix depends on it! --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 8c9764982fda4..c682bcaab6b23 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -869,7 +869,7 @@ with haskellLib; matterhorn = doJailbreak super.matterhorn; # Too strict bounds on transformers and resourcet - # https://github.com/alphaHeavy/lzma-conduit/issues/23 + # https://github.com/alphaHeavy/lzma-conduit/issues/23 krank:ignore-line lzma-conduit = doJailbreak super.lzma-conduit; # 2020-06-05: HACK: does not pass own build suite - `dontCheck` From 0eedc11e2fb2a6dcba1c18fad2a04b3fbdb00257 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 22 Sep 2025 02:48:59 +0200 Subject: [PATCH 33/84] haskell.lib: make krank ignore informational issue references --- pkgs/development/haskell-modules/lib/compose.nix | 3 ++- pkgs/development/haskell-modules/lib/default.nix | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/lib/compose.nix b/pkgs/development/haskell-modules/lib/compose.nix index 30cac6779ff74..c2171e8948a4b 100644 --- a/pkgs/development/haskell-modules/lib/compose.nix +++ b/pkgs/development/haskell-modules/lib/compose.nix @@ -114,7 +114,8 @@ rec { Note that jailbreaking at this time, doesn't lift bounds on conditional branches. - https://github.com/peti/jailbreak-cabal/issues/7 has further details. + https://github.com/peti/jailbreak-cabal/issues/7 (krank:ignore-line) + has further details. */ doJailbreak = overrideCabal (drv: { jailbreak = true; diff --git a/pkgs/development/haskell-modules/lib/default.nix b/pkgs/development/haskell-modules/lib/default.nix index b544c80db937b..4a1ce897070a4 100644 --- a/pkgs/development/haskell-modules/lib/default.nix +++ b/pkgs/development/haskell-modules/lib/default.nix @@ -94,7 +94,8 @@ rec { Note that jailbreaking at this time, doesn't lift bounds on conditional branches. - https://github.com/peti/jailbreak-cabal/issues/7 has further details. + https://github.com/peti/jailbreak-cabal/issues/7 (krank:ignore-line) + has further details. */ doJailbreak = compose.doJailbreak; From 1cb88af1613110a9ad1b458de6feb3fe132234dc Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 22 Sep 2025 02:49:58 +0200 Subject: [PATCH 34/84] haskell.lib.compose.buildStackProject: make krank ignore issue ref Links the issue the line below addresses. --- pkgs/development/haskell-modules/generic-stack-builder.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/generic-stack-builder.nix b/pkgs/development/haskell-modules/generic-stack-builder.nix index d2f6beb5260c6..47e0a40866749 100644 --- a/pkgs/development/haskell-modules/generic-stack-builder.nix +++ b/pkgs/development/haskell-modules/generic-stack-builder.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation ( # Non-NixOS git needs cert GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; - # Fixes https://github.com/commercialhaskell/stack/issues/2358 + # Fixes https://github.com/commercialhaskell/stack/issues/2358 krank:ignore-line LANG = "en_US.UTF-8"; preferLocalBuild = true; From 58f7e2db1274edaa6949838a687a60a407be396b Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 22 Sep 2025 16:21:30 +0200 Subject: [PATCH 35/84] vaultenv: clarify that it won't be released to hackage --- pkgs/development/haskell-modules/non-hackage-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/non-hackage-packages.nix b/pkgs/development/haskell-modules/non-hackage-packages.nix index 87e6562435890..8ec9237352502 100644 --- a/pkgs/development/haskell-modules/non-hackage-packages.nix +++ b/pkgs/development/haskell-modules/non-hackage-packages.nix @@ -41,7 +41,8 @@ self: super: ghc-settings-edit = self.callPackage ../tools/haskell/ghc-settings-edit { }; - # https://github.com/channable/vaultenv/issues/1 + # Upstream won't upload vaultenv to Hackage: + # https://github.com/channable/vaultenv/issues/1 krank:ignore-line vaultenv = self.callPackage ../tools/haskell/vaultenv { }; # spago is not released to Hackage. From 4809a5ea44b9b94edbe66cc9830e9f63f070d247 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 22 Sep 2025 16:21:58 +0200 Subject: [PATCH 36/84] haskellPackages.spago: clarify that it won't be released to hackage --- pkgs/development/haskell-modules/non-hackage-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/non-hackage-packages.nix b/pkgs/development/haskell-modules/non-hackage-packages.nix index 8ec9237352502..d13f5d6b8c961 100644 --- a/pkgs/development/haskell-modules/non-hackage-packages.nix +++ b/pkgs/development/haskell-modules/non-hackage-packages.nix @@ -45,8 +45,8 @@ self: super: # https://github.com/channable/vaultenv/issues/1 krank:ignore-line vaultenv = self.callPackage ../tools/haskell/vaultenv { }; - # spago is not released to Hackage. - # https://github.com/spacchetti/spago/issues/512 + # spago(-legacy) won't be released to Hackage: + # https://github.com/spacchetti/spago/issues/512 krank:ignore-line spago = self.callPackage ../tools/purescript/spago/spago.nix { }; # Unofficial fork until PRs are merged https://github.com/pcapriotti/optparse-applicative/pulls/roberth From 1a64625aa4639d122e0ebaf07106a272ccd04bc5 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 22 Sep 2025 16:22:27 +0200 Subject: [PATCH 37/84] haskellPackages.cryptonite: make krank ignore closed issue tracker cryptonite has been abandoned and all issues are reported as closed by the GitHub API since the repository has been archived. --- pkgs/development/haskell-modules/configuration-arm.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-arm.nix b/pkgs/development/haskell-modules/configuration-arm.nix index 5a4df23a384ce..c124a4e5fc1f8 100644 --- a/pkgs/development/haskell-modules/configuration-arm.nix +++ b/pkgs/development/haskell-modules/configuration-arm.nix @@ -117,7 +117,7 @@ self: super: # AARCH32-SPECIFIC OVERRIDES # KAT/ECB/D2 test segfaults on armv7l - # https://github.com/haskell-crypto/cryptonite/issues/367 + # https://github.com/haskell-crypto/cryptonite/issues/367 krank:ignore-line cryptonite = dontCheck super.cryptonite; } // lib.optionalAttrs (with pkgs.stdenv.hostPlatform; isAarch && isAndroid) { From 9666a0de1b471db03519d4d59d14bf9321a3ff89 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 26 Sep 2025 14:26:58 +0200 Subject: [PATCH 38/84] haskellPackages.turtle: fix mv not working on dirs This fixes spago.tests, for example. --- .../haskell-modules/configuration-common.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c682bcaab6b23..fc9800377146f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -683,6 +683,16 @@ with haskellLib; # https://github.com/awakesecurity/nix-graph/issues/5 nix-graph = doJailbreak super.nix-graph; + # Fix `mv` not working on directories + turtle = appendPatches [ + (pkgs.fetchpatch { + name = "turtle-fix-mv.patch"; + url = "https://github.com/Gabriella439/turtle/commit/b3975531f8d6345da54b005f226adab095085865.patch"; + sha256 = "sha256-EqvMQpRz/7hbY6wJ0xG8Ou6oKhwWdpjzBv+NPW6tnSY="; + includes = [ "src/Turtle/Prelude.hs" ]; + }) + ] super.turtle; + # Allow inspection-testing >= 0.6 in test suite algebraic-graphs = appendPatch (pkgs.fetchpatch2 { name = "algebraic-graphs-0.7-allow-inspection-testing-0.6.patch"; From 621a3a56ebf5db7ff21feb47b0e490de0f8a3d8a Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 28 Sep 2025 16:26:23 +0200 Subject: [PATCH 39/84] haskellPackages.mkDerivation: convert any/all cabal files to unix nls In general, `pname` SHOULD be the same as the Cabal package name in Haskell updates, but things work fine without this in many cases (e.g. when only building executables), so we need to preserve this. Since Cabal only allows a single .cabal file per directory, we can just process *.cabal. --- pkgs/development/haskell-modules/generic-builder.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index d1ef4e81e213c..c4ba748515d85 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -607,7 +607,7 @@ lib.fix ( cp ${newCabalFile} ${pname}.cabal '' + lib.optionalString (!dontConvertCabalFileToUnix) '' - sed -i '${pname}.cabal' -e 's/\r$//' + sed -i -e 's/\r$//' *.cabal '' + prePatch; From d9757d4fe3a38b642e800bc4caca1288a8fdec86 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 28 Sep 2025 16:30:38 +0200 Subject: [PATCH 40/84] haskellPackages.mkDerivation: jailbreak any/all cabal files Since Cabal only allows a single cabal file per directory, we can just jailbreak *.cabal which works even if the user doesn't have set pname to match the cabal file name (which they SHOULD do, though). The only remaining reference to ${pname}.cabal in the revision handling code is fine since we know the proper name of the cabal file from Hackage in that case. --- pkgs/development/haskell-modules/generic-builder.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index c4ba748515d85..31634958f5467 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -614,7 +614,7 @@ lib.fix ( postPatch = optionalString jailbreak '' echo "Run jailbreak-cabal to lift version restrictions on build inputs." - ${jailbreak-cabal}/bin/jailbreak-cabal ${pname}.cabal + ${jailbreak-cabal}/bin/jailbreak-cabal *.cabal '' + postPatch; From bcab0af638f6ae0b726eeab1f7d501d7594950d9 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 28 Sep 2025 16:47:01 +0200 Subject: [PATCH 41/84] haskellPackages.mkDerivation: convert .cabal file after prePatch cabal2nix emits prePatch = "hpack" for packages that need it, so the .cabal file may not exist before prePatch. --- pkgs/development/haskell-modules/generic-builder.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 31634958f5467..6767cfa7af503 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -606,10 +606,13 @@ lib.fix ( echo "Replace Cabal file with edited version from ${newCabalFileUrl}." cp ${newCabalFile} ${pname}.cabal '' + + prePatch + + "\n" + # cabal2nix-generated expressions run hpack not until prePatch to create + # the .cabal file (if necessary) + lib.optionalString (!dontConvertCabalFileToUnix) '' sed -i -e 's/\r$//' *.cabal - '' - + prePatch; + ''; postPatch = optionalString jailbreak '' From 852445871bf92936d9618b6831d36f1b2a1bd6c5 Mon Sep 17 00:00:00 2001 From: Marc Scholten Date: Mon, 29 Sep 2025 09:19:22 -0500 Subject: [PATCH 42/84] haskellPackages.ihp{,-ide,-migrate,-postgresql-simple-extra}: add maintainer mpscholten --- .../haskell-modules/configuration-hackage2nix/main.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 6e6ea2343d64f..a6b2d2fa02170 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -377,6 +377,10 @@ package-maintainers: - libssh2 - sitemap - ihp-openai + - ihp + - ihp-ide + - ihp-migrate + - ihp-postgresql-simple-extra ncfavier: - Agda - irc-client From 5ae5c0ffbfa06ca88fd2557d210e92061b0672dd Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 30 Sep 2025 15:46:35 +0200 Subject: [PATCH 43/84] haskellPackages.microlens-pro: pin at 0.2.0.3 to match microlens < 0.5 prescribed by Stackage LTS 24. --- .../configuration-hackage2nix/main.yaml | 2 + .../haskell-modules/hackage-packages.nix | 44 +++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index a6b2d2fa02170..ce69e1c41e704 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -40,6 +40,8 @@ default-package-overrides: # liquidhaskell(-boot) support one GHC at a time, so we choose the one matching the current GHC (9.10) - liquidhaskell == 0.9.10.* - liquidhaskell-boot == 0.9.10.* + # Needs to match microlens == 0.4.* in Stackage LTS 24 + - microlens-pro < 0.2.0.4 # keep-sorted end # keep-sorted start skip_lines=1 case=no numeric=yes diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 564cf1cda7410..c74f95d74739b 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -446195,6 +446195,49 @@ self: { ) { }; microlens-pro = callPackage ( + { + mkDerivation, + base, + containers, + microlens, + microlens-contra, + microlens-platform, + microlens-th, + mtl, + profunctors, + tagged, + template-haskell, + text, + th-abstraction, + unordered-containers, + vector, + }: + mkDerivation { + pname = "microlens-pro"; + version = "0.2.0.3"; + sha256 = "1mmj8y7rvfasas1kqpns8aj9mr52rgb8mm8fy5qwmv0ll8r3siik"; + libraryHaskellDepends = [ + base + containers + microlens + microlens-contra + microlens-platform + microlens-th + mtl + profunctors + tagged + template-haskell + text + th-abstraction + unordered-containers + vector + ]; + description = "Prisms and isomorphisms for microlens"; + license = lib.licenses.bsd3; + } + ) { }; + + microlens-pro_0_2_0_5 = callPackage ( { mkDerivation, base, @@ -446234,6 +446277,7 @@ self: { ]; description = "Prisms and isomorphisms for microlens"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; From 93e49c0442213de2b6fc6141a59e50f495423008 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 30 Sep 2025 15:58:29 +0200 Subject: [PATCH 44/84] haskellPackages.botan-bindings: drop released patch --- pkgs/development/haskell-modules/configuration-common.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index fc9800377146f..9dce365641073 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -3411,14 +3411,6 @@ with haskellLib; stripe-signature = doJailbreak super.stripe-signature; stripe-wreq = doJailbreak super.stripe-wreq; - # 2025-08-01: Fixes few build errors related to pointers. - # https://github.com/haskell-cryptography/botan/pull/17 - botan-bindings = appendPatch (pkgs.fetchpatch2 { - url = "https://github.com/haskell-cryptography/botan/commit/99de68c3938187b7ab740c6534ec032a4a236747.patch"; - sha256 = "sha256-v255WFO9HsRuTAWFZG27TYbpoK7rJ1AuiCFNFIV18mI="; - stripLen = 1; - }) super.botan-bindings; - # 2025-08-04: Disable failing testcases. It would feel bad to disable all the # checks in a cryptography related package. botan-low = overrideCabal (drv: { From ee751e3bdbdf74d6a5dcfb1e7a6fde6a71cd5461 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 30 Sep 2025 16:01:39 +0200 Subject: [PATCH 45/84] fffuu: use sourceRoot instead of cd-ing in preCompileBuildDriver (prePatch assumes it is executed in the same directory as the cabal file.) --- pkgs/tools/misc/fffuu/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/fffuu/default.nix b/pkgs/tools/misc/fffuu/default.nix index 2b6172d852fc3..9a9d57f154250 100644 --- a/pkgs/tools/misc/fffuu/default.nix +++ b/pkgs/tools/misc/fffuu/default.nix @@ -16,17 +16,17 @@ mkDerivation { sha256 = "1qc7p44dqja6qrjbjdc2xn7n9v41j5v59sgjnxjj5k0mxp58y1ch"; }; + postUnpack = '' + sourceRoot="$sourceRoot/haskell_tool" + ''; + postPatch = '' - substituteInPlace haskell_tool/fffuu.cabal \ + substituteInPlace fffuu.cabal \ --replace "containers >=0.5 && <0.6" "containers >= 0.6" \ --replace "optparse-generic >= 1.2.3 && < 1.3" "optparse-generic >= 1.2.3" \ --replace "split >= 0.2.3 && <= 0.2.4" "split >= 0.2.3" ''; - preCompileBuildDriver = '' - cd haskell_tool - ''; - isLibrary = false; isExecutable = true; From 7c76fbf6afbb7a1b0b31fca5f315a20412aa2d79 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 30 Sep 2025 16:02:44 +0200 Subject: [PATCH 46/84] haskellPackages.vaultenv: run hpack in prePatch This matches cabal2nix generated expressions. We assume that the cabal file exists after the user supplied prePatch. --- pkgs/development/tools/haskell/vaultenv/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/haskell/vaultenv/default.nix b/pkgs/development/tools/haskell/vaultenv/default.nix index ee9d867c128d2..ad645ef016ec8 100644 --- a/pkgs/development/tools/haskell/vaultenv/default.nix +++ b/pkgs/development/tools/haskell/vaultenv/default.nix @@ -46,6 +46,7 @@ mkDerivation rec { prePatch = '' substituteInPlace package.yaml \ --replace -Werror "" + hpack ''; isLibrary = false; @@ -82,7 +83,6 @@ mkDerivation rec { hspec-expectations quickcheck-instances ]; - preConfigure = "hpack"; homepage = "https://github.com/channable/vaultenv#readme"; description = "Runs processes with secrets from HashiCorp Vault"; license = lib.licenses.bsd3; From 80d57251def07c1af94c7a4919cbcd46cad7e999 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 30 Sep 2025 16:03:34 +0200 Subject: [PATCH 47/84] echidna: run hpack in prePatch This matches cabal2nix generated expressions. We assume that the cabal file exists after the user supplied prePatch. --- pkgs/by-name/ec/echidna/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ec/echidna/package.nix b/pkgs/by-name/ec/echidna/package.nix index 1a6376cba4a57..ca4ca1d3c090c 100644 --- a/pkgs/by-name/ec/echidna/package.nix +++ b/pkgs/by-name/ec/echidna/package.nix @@ -96,7 +96,7 @@ haskellPackages.mkDerivation rec { makeWrapper ]; - preConfigure = '' + prePatch = '' hpack ''; From efcc55998fb90b43e20a5411f17d27342f6941db Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 30 Sep 2025 16:17:46 +0200 Subject: [PATCH 48/84] haskellPackages.hexstring: restore Unix->DOS conversion of src file This was removed in #443159 by mistake. --- pkgs/development/haskell-modules/configuration-common.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 9dce365641073..e70f59986c01a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2640,6 +2640,11 @@ with haskellLib; # hexstring is not compatible with newer versions of base16-bytestring # See https://github.com/solatis/haskell-hexstring/issues/3 hexstring = overrideCabal (old: { + # GitHub doesn't generate a patch with DOS line endings, so we + # need to convert the patched file to Unix line endings + prePatch = old.prePatch or "" + '' + sed -i -e 's/\r$//' src/Data/HexString.hs + ''; patches = old.patches or [ ] ++ [ (pkgs.fetchpatch { name = "fix-base16-bytestring-compat"; From 7fca2079a8c1a5c1a75a2b72162aa7c13eb02e06 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 2 Oct 2025 11:56:18 +0200 Subject: [PATCH 49/84] haskellPackages.zinza: update jailbreak comment --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index e70f59986c01a..6e3a25801d971 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -3014,8 +3014,8 @@ with haskellLib; hash = "sha256-JxraFWzErJT4EhELa3PWBGHaLT9OLgEPNSnxwpdpHd0="; }) (doJailbreak super.argon2); # Unmaintained - # 2024-07-09: zinza has bumped their QuickCheck and tasty dependencies beyond stackage lts. - # Can possibly be removed once QuickCheck >= 2.15 and tasty >= 1.5 + # 2025-10-02: Too strict upper bound on tasty-quickcheck (<0.11) + # https://github.com/phadej/zinza/pull/28 zinza = dontCheck super.zinza; pdftotext = overrideCabal (drv: { From 5ba41f20b22b393092a91ce44e414f70613917db Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 2 Oct 2025 12:03:23 +0200 Subject: [PATCH 50/84] haskellPackages.granite: allow QuickCheck >= 2.15 --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 6 ++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 6e3a25801d971..8b60cca407f62 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -3036,6 +3036,10 @@ with haskellLib; # https://github.com/google/proto-lens/issues/403 proto-lens-arbitrary = doJailbreak super.proto-lens-arbitrary; + # Forbids QuickCheck >= 2.15 + # https://github.com/mchav/granite/issues/12#issuecomment-3360209408 + granite = doJailbreak super.granite; + proto3-wire = appendPatches [ (fetchpatch { # https://github.com/awakesecurity/proto3-wire/pull/109 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 27e50181c9b17..a52fcf0385a8a 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -2296,7 +2296,6 @@ broken-packages: - Grafos # failure in job https://hydra.nixos.org/build/233201494 at 2023-09-02 - grakn # failure in job https://hydra.nixos.org/build/233218052 at 2023-09-02 - grammatical-parsers # failure in job https://hydra.nixos.org/build/233252219 at 2023-09-02 - - granite # failure in job https://hydra.nixos.org/build/307518928 at 2025-09-19 - graph-matchings # failure in job https://hydra.nixos.org/build/233245821 at 2023-09-02 - graph-rewriting # failure in job https://hydra.nixos.org/build/233191278 at 2023-09-02 - graph-serialize # failure in job https://hydra.nixos.org/build/233192162 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 209a854a7a4d3..ba19f4801cc3b 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -280045,9 +280045,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "Easy terminal plotting"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "granite"; - broken = true; } ) { }; @@ -373336,6 +373334,7 @@ self: { ]; description = "Haskell Web Framework"; license = lib.licenses.mit; + maintainers = [ lib.maintainers.mpscholten ]; } ) { }; @@ -373579,6 +373578,7 @@ self: { ]; description = "Dev tools for IHP"; license = lib.licenses.mit; + maintainers = [ lib.maintainers.mpscholten ]; } ) { }; @@ -373601,6 +373601,7 @@ self: { description = "Provides the IHP migrate binary"; license = lib.licenses.mit; mainProgram = "migrate"; + maintainers = [ lib.maintainers.mpscholten ]; } ) { }; @@ -373700,6 +373701,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "Extra data types for postgresql-simple"; license = lib.licenses.mit; + maintainers = [ lib.maintainers.mpscholten ]; } ) { }; From 51d02e5255f50b8cca16542db95a252c6385c707 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 2 Oct 2025 12:25:54 +0200 Subject: [PATCH 51/84] haskellPackages.snappy-hs: work around erroneous vector constraint --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 8b60cca407f62..ff2889ed4bc99 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -3040,6 +3040,10 @@ with haskellLib; # https://github.com/mchav/granite/issues/12#issuecomment-3360209408 granite = doJailbreak super.granite; + # Erroneously forbids vector >= 0.13.2.0 + # https://github.com/mchav/snappy-hs/commit/400490df38e0db7f353c0427f034a231bdf73098#r167007963 + snappy-hs = doJailbreak super.snappy-hs; + proto3-wire = appendPatches [ (fetchpatch { # https://github.com/awakesecurity/proto3-wire/pull/109 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index a52fcf0385a8a..2f1bff24722b5 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -5860,7 +5860,6 @@ broken-packages: - snaplet-sqlite-simple # failure in job https://hydra.nixos.org/build/252738602 at 2024-03-16 - snaplet-typed-sessions # failure in job https://hydra.nixos.org/build/252724459 at 2024-03-16 - snappy-conduit # failure in job https://hydra.nixos.org/build/233196865 at 2023-09-02 - - snappy-hs # failure in job https://hydra.nixos.org/build/307522028 at 2025-09-19 - snelstart-import # failure in job https://hydra.nixos.org/build/295097114 at 2025-04-22 - SNet # failure in job https://hydra.nixos.org/build/233225638 at 2023-09-02 - snipcheck # failure in job https://hydra.nixos.org/build/233214417 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index ba19f4801cc3b..8fd345d9d9db8 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -622575,9 +622575,7 @@ self: { testHaskellDepends = [ base ]; description = "Snappy compression library"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "snappy-hs"; - broken = true; } ) { }; From 8511e08473bae02634d3df8af79c7b80966a2ae3 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 20 Sep 2025 23:51:37 +0200 Subject: [PATCH 52/84] dhall-lsp-server: apply patch for text >= 2.1.2 (cherry picked from commit 7adbd08882e1945cca0f322b8d32509681606526) --- .../haskell-modules/configuration-common.nix | 20 +++++++++++++++---- .../configuration-hackage2nix/broken.yaml | 1 - .../haskell-modules/hackage-packages.nix | 2 -- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ff2889ed4bc99..a30090f7ec1aa 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1727,10 +1727,22 @@ with haskellLib; # Lift bound on lens <5.3 lsp-types_2_1_1_0 = doDistribute (doJailbreak super.lsp-types_2_1_1_0); - # 2025-03-03: dhall-lsp-server-1.1.4 requires lsp-2.1.0.0 - dhall-lsp-server = super.dhall-lsp-server.override { - lsp = self.lsp_2_1_0_0; - }; + dhall-lsp-server = + appendPatches + [ + (pkgs.fetchpatch { + name = "dhall-lsp-server-text-2.1.2.patch"; + url = "https://github.com/dhall-lang/dhall-haskell/commit/9f2d4d44be643229784bfc502ab49184ec82bc05.patch"; + hash = "sha256-cwNH5+7YY8UbA9zHhTRfVaqtIMowZGfFT5Kj+wSlapA="; + relative = "dhall-lsp-server"; + }) + ] + ( + # 2025-03-03: dhall-lsp-server-1.1.4 requires lsp-2.1.0.0 + super.dhall-lsp-server.override { + lsp = self.lsp_2_1_0_0; + } + ); # Tests disabled and broken override needed because of missing lib chrome-test-utils: https://github.com/reflex-frp/reflex-dom/issues/392 reflex-dom-core = lib.pipe super.reflex-dom-core [ diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 2f1bff24722b5..615ffb5c480d4 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1357,7 +1357,6 @@ broken-packages: - dhall-check # failure in job https://hydra.nixos.org/build/233206425 at 2023-09-02 - dhall-csv # failure in job https://hydra.nixos.org/build/233256049 at 2023-09-02 - dhall-fly # failure in job https://hydra.nixos.org/build/233220306 at 2023-09-02 - - dhall-lsp-server # failure in job https://hydra.nixos.org/build/307610458 at 2025-09-19 - dhall-recursive-adt # failure in job https://hydra.nixos.org/build/233210665 at 2023-09-02 - dhall-text # failure in job https://hydra.nixos.org/build/233253809 at 2023-09-02 - dhall-text-shell # failure in job https://hydra.nixos.org/build/244399613 at 2024-01-01 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 8fd345d9d9db8..2bf98912919aa 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -189293,13 +189293,11 @@ self: { ]; description = "Language Server Protocol (LSP) server for Dhall"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "dhall-lsp-server"; maintainers = [ lib.maintainers.dalpd lib.maintainers.Gabriella439 ]; - broken = true; } ) { }; From 93950532ac17e508b7a395bf3e0366adb41b1f02 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 20 Sep 2025 23:58:57 +0200 Subject: [PATCH 53/84] dhall-lsp-server: use lsp from Stackage LTS 24 (cherry picked from commit 1fe73e3aa7956c3178b2ccfd53a788ad26f02b79) --- .../haskell-modules/configuration-common.nix | 40 +-- .../configuration-hackage2nix/main.yaml | 3 - .../haskell-modules/hackage-packages.nix | 273 ------------------ 3 files changed, 14 insertions(+), 302 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index a30090f7ec1aa..610e00ae0f965 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1705,31 +1705,17 @@ with haskellLib; # https://github.com/NixOS/nixpkgs/issues/198495 (dontCheckIf (pkgs.postgresqlTestHook.meta.broken) super.persistent-postgresql); - # Needs matching lsp-types - # Allow lens >= 5.3 - lsp_2_4_0_0 = doDistribute ( - doJailbreak ( - super.lsp_2_4_0_0.override { - lsp-types = self.lsp-types_2_1_1_0; - } - ) - ); - - # Needs matching lsp-types; - # Lift bound on sorted-list <0.2.2 - lsp_2_1_0_0 = doDistribute ( - doJailbreak ( - super.lsp_2_1_0_0.override { - lsp-types = self.lsp-types_2_1_1_0; - } - ) - ); - # Lift bound on lens <5.3 - lsp-types_2_1_1_0 = doDistribute (doJailbreak super.lsp-types_2_1_1_0); - dhall-lsp-server = appendPatches [ + # Add support for lsp >= 2.7 + (pkgs.fetchpatch { + name = "dhall-lsp-server-lsp-2.7.patch"; + url = "https://github.com/dhall-lang/dhall-haskell/commit/a621e1438df5865d966597e2e1b0bb37e8311447.patch"; + sha256 = "sha256-7edxNIeIM/trl2SUXybvSzkscvr1kj5+tZF50IeTOgY="; + relative = "dhall-lsp-server"; + }) + # Fix build with text >= 2.1.2 (pkgs.fetchpatch { name = "dhall-lsp-server-text-2.1.2.patch"; url = "https://github.com/dhall-lang/dhall-haskell/commit/9f2d4d44be643229784bfc502ab49184ec82bc05.patch"; @@ -1738,10 +1724,12 @@ with haskellLib; }) ] ( - # 2025-03-03: dhall-lsp-server-1.1.4 requires lsp-2.1.0.0 - super.dhall-lsp-server.override { - lsp = self.lsp_2_1_0_0; - } + overrideCabal (drv: { + prePatch = '' + ${drv.prePatch or ""} + ${lib.getExe' pkgs.buildPackages.dos2unix "dos2unix"} *.cabal + ''; + }) super.dhall-lsp-server ); # Tests disabled and broken override needed because of missing lib chrome-test-utils: https://github.com/reflex-frp/reflex-dom/issues/392 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index d424d3f3d8eed..035dd4d4d1602 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -93,9 +93,6 @@ extra-packages: - hlint == 3.6.* # 2025-04-14: needed for hls with ghc-lib-parser 9.6 - hspec-megaparsec == 2.2.0 # 2023-11-18: Latest version compatible with ghc 9.0 - language-javascript == 0.7.0.0 # required by purescript - - lsp < 2.5 # 2024-07-08: need for koka - - lsp == 2.1.* # 2024-02-28: need for dhall-lsp-server - - lsp-types == 2.1.* # 2024-02-28: need for dhall-lsp-server and koka - network-run == 0.4.0 # 2024-10-20: for GHC 9.10/network == 3.1.* - ormolu == 0.5.2.0 # 2023-08-08: preserve for ghc 9.0 - ormolu == 0.7.2.0 # 2023-11-13: for ghc-lib-parser 9.6 compat diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 2bf98912919aa..8f3e6594bd5fb 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -429994,176 +429994,6 @@ self: { } ) { inherit (pkgs) rocksdb; }; - lsp_2_1_0_0 = callPackage ( - { - mkDerivation, - aeson, - async, - attoparsec, - base, - bytestring, - co-log-core, - containers, - data-default, - directory, - exceptions, - filepath, - hashable, - hspec, - hspec-discover, - lens, - lsp-types, - mtl, - prettyprinter, - random, - row-types, - sorted-list, - stm, - temporary, - text, - text-rope, - transformers, - unliftio-core, - unordered-containers, - uuid, - }: - mkDerivation { - pname = "lsp"; - version = "2.1.0.0"; - sha256 = "03gk98fgf32blywdds0fc5351bmcbbfrnqwlg33l2ih75nwa59y8"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson - async - attoparsec - base - bytestring - co-log-core - containers - data-default - directory - exceptions - filepath - hashable - lens - lsp-types - mtl - prettyprinter - random - row-types - sorted-list - stm - temporary - text - text-rope - transformers - unliftio-core - unordered-containers - uuid - ]; - testHaskellDepends = [ - base - containers - hspec - row-types - sorted-list - text - text-rope - unordered-containers - ]; - testToolDepends = [ hspec-discover ]; - description = "Haskell library for the Microsoft Language Server Protocol"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - } - ) { }; - - lsp_2_4_0_0 = callPackage ( - { - mkDerivation, - aeson, - async, - attoparsec, - base, - bytestring, - co-log-core, - containers, - data-default, - directory, - exceptions, - filepath, - hashable, - hspec, - hspec-discover, - lens, - lens-aeson, - lsp-types, - mtl, - prettyprinter, - random, - row-types, - sorted-list, - stm, - text, - text-rope, - transformers, - unliftio-core, - unordered-containers, - uuid, - }: - mkDerivation { - pname = "lsp"; - version = "2.4.0.0"; - sha256 = "1ggfw2wp9g9fpg9x3kj9zh6l6p2yiw4q0v1gzxjg0mcmvp4aad8w"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson - async - attoparsec - base - bytestring - co-log-core - containers - data-default - directory - exceptions - filepath - hashable - lens - lens-aeson - lsp-types - mtl - prettyprinter - random - row-types - sorted-list - stm - text - text-rope - transformers - unliftio-core - unordered-containers - uuid - ]; - testHaskellDepends = [ - base - containers - hspec - row-types - sorted-list - text - text-rope - unordered-containers - ]; - testToolDepends = [ hspec-discover ]; - description = "Haskell library for the Microsoft Language Server Protocol"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - } - ) { }; - lsp = callPackage ( { mkDerivation, @@ -430427,109 +430257,6 @@ self: { } ) { }; - lsp-types_2_1_1_0 = callPackage ( - { - mkDerivation, - aeson, - base, - binary, - containers, - data-default, - deepseq, - Diff, - directory, - dlist, - exceptions, - file-embed, - filepath, - generic-arbitrary, - hashable, - hspec, - hspec-discover, - indexed-traversable, - indexed-traversable-instances, - lens, - lens-aeson, - mod, - mtl, - network-uri, - prettyprinter, - QuickCheck, - quickcheck-instances, - regex, - row-types, - safe, - some, - template-haskell, - text, - }: - mkDerivation { - pname = "lsp-types"; - version = "2.1.1.0"; - sha256 = "0gsr0v11xfav7dnq4d433y9ca0snmqaax4pp5sgmf33zl8qhi6s0"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson - base - binary - containers - data-default - deepseq - Diff - dlist - exceptions - file-embed - filepath - generic-arbitrary - hashable - indexed-traversable - indexed-traversable-instances - lens - lens-aeson - mod - mtl - network-uri - prettyprinter - QuickCheck - quickcheck-instances - row-types - safe - some - template-haskell - text - ]; - executableHaskellDepends = [ - base - containers - directory - filepath - mtl - prettyprinter - regex - text - ]; - testHaskellDepends = [ - aeson - base - filepath - hspec - lens - network-uri - QuickCheck - quickcheck-instances - row-types - text - ]; - testToolDepends = [ hspec-discover ]; - doHaddock = false; - description = "Haskell library for the Microsoft Language Server Protocol, data types"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - mainProgram = "generator"; - } - ) { }; - lsp-types = callPackage ( { mkDerivation, From dd91ca469c39913e08a6f68d70bceebe654a66af Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 21 Sep 2025 14:32:25 +0200 Subject: [PATCH 54/84] haskellPackages.pandoc-crossref: revert patch requiring pandoc>=3.8 - The linked issue has been resolved, but the updated bounds are only available on master. - 0.3.21 contains a patch for an interface deprecation in pandoc 3.8 which we need to revert in order to build with pandoc 3.7. (cherry picked from commit f2b98de78a3a2967cf011f10beacef2088daf0f2) --- .../haskell-modules/configuration-common.nix | 20 +++++++++++++++++-- .../configuration-hackage2nix/broken.yaml | 1 - .../haskell-modules/hackage-packages.nix | 2 -- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 610e00ae0f965..b0e1766b4ac86 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -866,8 +866,24 @@ with haskellLib; }) super.xml-picklers; # 2025-08-03: Too strict bounds on open-browser, data-default and containers - # https://github.com/lierdakil/pandoc-crossref/issues/478 - pandoc-crossref = doJailbreak super.pandoc-crossref; + # https://github.com/lierdakil/pandoc-crossref/issues/478 krank:ignore-line + pandoc-crossref = lib.pipe super.pandoc-crossref [ + (warnAfterVersion "0.3.21") + doJailbreak + + # We are still using pandoc == 3.7.* + (appendPatch ( + lib.warnIf (lib.versionAtLeast self.pandoc.version "3.8") + "haskellPackages.pandoc-crossref: remove revert of pandoc-3.8 patch" + pkgs.fetchpatch + { + name = "pandoc-crossref-revert-pandoc-3.8-highlight.patch"; + url = "https://github.com/lierdakil/pandoc-crossref/commit/b0c35a59d5a802f6525407bfeb31699ffd0b4671.patch"; + hash = "sha256-MIITL9Qr3+1fKf1sTwHzXPcYTt3YC+vr9CpMgqsBXlc="; + revert = true; + } + )) + ]; # Too strict upper bound on data-default-class (< 0.2) # https://github.com/stackbuilders/dotenv-hs/issues/203 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 615ffb5c480d4..b4fcad9292d22 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -4561,7 +4561,6 @@ broken-packages: - pan-os-syslog # failure in job https://hydra.nixos.org/build/233244422 at 2023-09-02 - pandoc-citeproc # failure in job https://hydra.nixos.org/build/233198462 at 2023-09-02 - pandoc-columns # failure in job https://hydra.nixos.org/build/233234538 at 2023-09-02 - - pandoc-crossref # failure in job https://hydra.nixos.org/build/307611190 at 2025-09-19 - pandoc-csv2table # failure in job https://hydra.nixos.org/build/233229925 at 2023-09-02 - pandoc-dhall-decoder # failure in job https://hydra.nixos.org/build/307611186 at 2025-09-19 - pandoc-emphasize-code # failure in job https://hydra.nixos.org/build/252733347 at 2024-03-16 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 8f3e6594bd5fb..649e211b69070 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -500276,9 +500276,7 @@ self: { doHaddock = false; description = "Pandoc filter for cross-references"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; mainProgram = "pandoc-crossref"; - broken = true; } ) { }; From 823113f3a98cc4c663333ef8a2f2d9027c7871c4 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 18 Sep 2025 19:14:57 +0200 Subject: [PATCH 55/84] stack: provide hpack 0.38.1 to match upstream binaries (cherry picked from commit 4ede35a36fc0bf48bc0ce3fe31c30c64f8427348) --- .../haskell-modules/configuration-common.nix | 7 +- .../configuration-hackage2nix/main.yaml | 1 + .../haskell-modules/configuration-nix.nix | 27 ++-- .../haskell-modules/hackage-packages.nix | 135 ++++++++++++++++++ 4 files changed, 158 insertions(+), 12 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index b0e1766b4ac86..c3bbe1311e60b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2193,12 +2193,15 @@ with haskellLib; # stack-3.7.1 requires Cabal < 3.12 stack = + let + stack' = super.stack.overrideScope (self: super: { hpack = self.hpack_0_38_1; }); + in if lib.versionOlder self.ghc.version "9.10" then - super.stack + stack' else lib.pipe # to reduce rebuilds, don't override Cabal in the entire scope - ((super.stack.override { Cabal = self.Cabal_3_10_3_0; }).overrideScope ( + ((stack'.override { Cabal = self.Cabal_3_10_3_0; }).overrideScope ( self: super: let downgradeCabal = diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 035dd4d4d1602..7f8e037af806e 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -91,6 +91,7 @@ extra-packages: - hasql-pool < 1.1 # 2025-01-19: Needed for building postgrest - hasql-transaction < 1.1.1 # 2025-01-19: Needed for building postgrest - hlint == 3.6.* # 2025-04-14: needed for hls with ghc-lib-parser 9.6 + - hpack == 0.38.1 # 2025-09-18: to match exact version upstream stack-3.7.1 uses - hspec-megaparsec == 2.2.0 # 2023-11-18: Latest version compatible with ghc 9.0 - language-javascript == 0.7.0.0 # required by purescript - network-run == 0.4.0 # 2024-10-20: for GHC 9.10/network == 3.1.* diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index c10045f763497..312bf224c2e49 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1878,16 +1878,23 @@ builtins.intersectAttrs super { extensions = enableSeparateBinOutput super.extensions; # These test cases access the network - hpack = overrideCabal (drv: { - testFlags = drv.testFlags or [ ] ++ [ - "--skip" - "/Hpack.Defaults/ensureFile/with 404/does not create any files/" - "--skip" - "/Hpack.Defaults/ensureFile/downloads file if missing/" - "--skip" - "/EndToEnd/hpack/defaults/fails if defaults don't exist/" - ]; - }) super.hpack; + inherit + (lib.mapAttrs ( + _: + overrideCabal (drv: { + testFlags = drv.testFlags or [ ] ++ [ + "--skip" + "/Hpack.Defaults/ensureFile/with 404/does not create any files/" + "--skip" + "/Hpack.Defaults/ensureFile/downloads file if missing/" + "--skip" + "/EndToEnd/hpack/defaults/fails if defaults don't exist/" + ]; + }) + ) super) + hpack + hpack_0_38_1 + ; doctest = overrideCabal (drv: { testFlags = drv.testFlags or [ ] ++ [ diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 649e211b69070..02c4100539259 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -341274,6 +341274,141 @@ self: { } ) { }; + hpack_0_38_1 = callPackage ( + { + mkDerivation, + aeson, + base, + bifunctors, + bytestring, + Cabal, + containers, + crypton, + deepseq, + directory, + filepath, + Glob, + hspec, + hspec-discover, + http-client, + http-client-tls, + http-types, + HUnit, + infer-license, + interpolate, + mockery, + mtl, + pretty, + QuickCheck, + scientific, + template-haskell, + temporary, + text, + transformers, + unordered-containers, + vcr, + vector, + yaml, + }: + mkDerivation { + pname = "hpack"; + version = "0.38.1"; + sha256 = "03qygb51jb4r6sg2bkaz7k80h11wgjr27hgpx6h08xm8axdk2gba"; + revision = "1"; + editedCabalFile = "0dyd6pp2pk62nynp0x2j9kjddfv43p9inplk4iya7hdldyjs77k0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson + base + bifunctors + bytestring + Cabal + containers + crypton + deepseq + directory + filepath + Glob + http-client + http-client-tls + http-types + infer-license + mtl + pretty + scientific + text + transformers + unordered-containers + vector + yaml + ]; + executableHaskellDepends = [ + aeson + base + bifunctors + bytestring + Cabal + containers + crypton + deepseq + directory + filepath + Glob + http-client + http-client-tls + http-types + infer-license + mtl + pretty + scientific + text + transformers + unordered-containers + vector + yaml + ]; + testHaskellDepends = [ + aeson + base + bifunctors + bytestring + Cabal + containers + crypton + deepseq + directory + filepath + Glob + hspec + http-client + http-client-tls + http-types + HUnit + infer-license + interpolate + mockery + mtl + pretty + QuickCheck + scientific + template-haskell + temporary + text + transformers + unordered-containers + vcr + vector + yaml + ]; + testToolDepends = [ hspec-discover ]; + description = "A modern format for Haskell packages"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "hpack"; + } + ) { }; + hpack = callPackage ( { mkDerivation, From 5499b12373487e9256b5f9c7c301e2413ac1261d Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 22 Sep 2025 02:18:36 +0200 Subject: [PATCH 56/84] haskellPackages.cabal2nix-unstable: use correct output on Darwin cabal2nix doesn't have a separate bin output, but cabal2nix-unstable does (now?), so copying over the code doesn't work. Just stop hardcoding the bin output in both cases. (cherry picked from commit ec426cc387bba05f0ee92356b06eefb2ceb0b8b2) --- pkgs/development/haskell-modules/configuration-darwin.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index d77a6dc74a067..b0a7b0d80fa76 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -352,18 +352,18 @@ self: super: # the latter in the future! cabal2nix = overrideCabal (old: { postInstall = '' - remove-references-to -t ${self.hpack} "$out/bin/cabal2nix" + remove-references-to -t ${self.hpack} "''${!outputBin}/bin/cabal2nix" # Note: The `data` output is needed at runtime. - remove-references-to -t ${self.distribution-nixpkgs.out} "$out/bin/hackage2nix" + remove-references-to -t ${self.distribution-nixpkgs.out} "''${!outputBin}/bin/hackage2nix" ${old.postInstall or ""} ''; }) super.cabal2nix; cabal2nix-unstable = overrideCabal (old: { postInstall = '' - remove-references-to -t ${self.hpack} "$out/bin/cabal2nix" + remove-references-to -t ${self.hpack} "''${!outputBin}/bin/cabal2nix" # Note: The `data` output is needed at runtime. - remove-references-to -t ${self.distribution-nixpkgs-unstable.out} "$out/bin/hackage2nix" + remove-references-to -t ${self.distribution-nixpkgs-unstable.out} "''${!outputBin}/bin/hackage2nix" ${old.postInstall or ""} ''; From f865d6e14af55f79108daaf9aa8aff6c7e2e6690 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 21 Sep 2025 01:51:05 +0200 Subject: [PATCH 57/84] ihaskell: re-enable ihaskell-diagrams (cherry picked from commit d74914e95884b2628eacc1fed8042a9c604ef58d) --- pkgs/development/tools/haskell/ihaskell/wrapper.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/tools/haskell/ihaskell/wrapper.nix b/pkgs/development/tools/haskell/ihaskell/wrapper.nix index 21984b6e8da4e..d33fb0fa5bf78 100644 --- a/pkgs/development/tools/haskell/ihaskell/wrapper.nix +++ b/pkgs/development/tools/haskell/ihaskell/wrapper.nix @@ -14,9 +14,7 @@ let [ self.ihaskell self.ihaskell-blaze - # Doesn't work with latest ihaskell versions missing an unrelated change - # https://github.com/IHaskell/IHaskell/issues/1378 - # self.ihaskell-diagrams + self.ihaskell-diagrams ] ++ packages self ); From b9bb1cea32d65b05cfea417d6efee235fabeacd7 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 21 Sep 2025 01:24:05 +0200 Subject: [PATCH 58/84] haskellPackages.{arbtt,binrep,cabal-cargs,dataframe,monad-bayes,patat,regression-simple}: jailbreak haskellPackages.cabal-cargs: drop override obsoleted by 1.7.0. (cherry picked from commit d00493bd14a01107c279f251f8fcc264bc6a31a5) --- .../haskell-modules/configuration-common.nix | 71 ++++++++++--------- .../configuration-hackage2nix/broken.yaml | 8 --- .../transitive-broken.yaml | 4 +- .../haskell-modules/hackage-packages.nix | 19 ----- 4 files changed, 39 insertions(+), 63 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c3bbe1311e60b..b220a5c298662 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -201,28 +201,9 @@ with haskellLib; } ); - # Expected test output for these accidentally checks the absolute location of the source directory - # https://github.com/dan-t/cabal-cargs/issues/9 - cabal-cargs = overrideCabal (drv: { - testFlags = drv.testFlags or [ ] ++ [ - "-p" - "!/FindCabalFilePure withoutSandbox/" - "-p" - "!/FromCabalFilePure withoutSandbox/" - "-p" - "!/FromLibSrcPure withoutSandbox/" - "-p" - "!/FromExeSrcFilePure withoutSandbox/" - "-p" - "!/FindCabalFilePure withSandbox/" - "-p" - "!/FromCabalFilePure withSandbox/" - "-p" - "!/FromLibSrcPure withSandbox/" - "-p" - "!/FromExeSrcFilePure withSandbox/" - ]; - }) super.cabal-cargs; + # 2025-09-20: Too strict bound on filepath (<1.5) + # https://github.com/dan-t/cabal-cargs/issues/10 + cabal-cargs = doJailbreak super.cabal-cargs; # Extensions wants a specific version of Cabal for its list of Haskell # language extensions. @@ -427,6 +408,10 @@ with haskellLib; # https://github.com/sw17ch/data-clist/pull/28 data-clist = doJailbreak super.data-clist; + # 2025-09-20: Allow QuickCheck >= 2.15 + # https://github.com/raehik/binrep/issues/14 + binrep = warnAfterVersion "1.1.0" (doJailbreak super.binrep); + # 2024-06-23: Hourglass is archived and had its last commit 6 years ago. # Patch is needed to add support for time 1.10, which is only used in the tests # https://github.com/vincenthz/hs-hourglass/pull/56 @@ -494,6 +479,10 @@ with haskellLib; ghc-datasize = disableLibraryProfiling super.ghc-datasize; ghc-vis = disableLibraryProfiling super.ghc-vis; + # 2025-09-20: Too strict upper bound on base (<4.20) + # https://github.com/phadej/regression-simple/issues/13 + regression-simple = doJailbreak super.regression-simple; + # Fix 32bit struct being used for 64bit syscall on 32bit platforms # https://github.com/haskellari/lukko/issues/15 lukko = appendPatches [ @@ -885,6 +874,10 @@ with haskellLib; )) ]; + # Too strict bounds on QuickCheck (<2.15), containers (<0.7), hashable (<1.5), pandoc (<3.7) + # https://github.com/jaspervdj/patat/issues/194 + patat = doJailbreak super.patat; + # Too strict upper bound on data-default-class (< 0.2) # https://github.com/stackbuilders/dotenv-hs/issues/203 dotenv = doJailbreak super.dotenv; @@ -2656,6 +2649,9 @@ with haskellLib; # 2025-08-06: Upper bounds on containers <0.7 and hedgehog < 1.5 too strict. hermes-json = doJailbreak super.hermes-json; + # Allow containers >= 0.7, https://github.com/nomeata/arbtt/issues/181 + arbtt = doJailbreak super.arbtt; + # hexstring is not compatible with newer versions of base16-bytestring # See https://github.com/solatis/haskell-hexstring/issues/3 hexstring = overrideCabal (old: { @@ -3271,17 +3267,22 @@ with haskellLib; brillo-juicy = warnAfterVersion "0.2.4" (doJailbreak super.brillo-juicy); brillo = warnAfterVersion "1.13.3" (doJailbreak super.brillo); - # Floating point precision issues. Test suite is only checked on x86_64. - # https://github.com/tweag/monad-bayes/issues/368 - monad-bayes = dontCheckIf ( - let - inherit (pkgs.stdenv) hostPlatform; - in - !hostPlatform.isx86_64 - # Presumably because we emulate x86_64-darwin via Rosetta, x86_64-darwin - # also fails on Hydra - || hostPlatform.isDarwin - ) super.monad-bayes; + monad-bayes = + # Floating point precision issues. Test suite is only checked on x86_64. + # https://github.com/tweag/monad-bayes/issues/368 + dontCheckIf + ( + let + inherit (pkgs.stdenv) hostPlatform; + in + !hostPlatform.isx86_64 + # Presumably because we emulate x86_64-darwin via Rosetta, x86_64-darwin + # also fails on Hydra + || hostPlatform.isDarwin + ) + # Too strict bounds on brick (<2.6), vty (<6.3) + # https://github.com/tweag/monad-bayes/issues/378 + (doJailbreak super.monad-bayes); crucible = lib.pipe @@ -3435,6 +3436,10 @@ with haskellLib; # including the current one in nixpkgs. liquid-fixpoint = dontCheck super.liquid-fixpoint; + # 2025-09-20: Too strict upper bound on text (<2.1.3) + # https://github.com/mchav/dataframe/issues/61 + dataframe = doJailbreak (warnAfterVersion "0.3.0.4" super.dataframe); + # 2025-8-26: Too strict bounds on containers and text, see: https://github.com/stackbuilders/inflections-hs/pull/83 inflections = doJailbreak super.inflections; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index b4fcad9292d22..1012f06cdb831 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -231,7 +231,6 @@ broken-packages: - arbor-monad-logger # failure in job https://hydra.nixos.org/build/233228659 at 2023-09-02 - arbor-monad-metric # failure in job https://hydra.nixos.org/build/233236175 at 2023-09-02 - arbor-postgres # failure in job https://hydra.nixos.org/build/233232935 at 2023-09-02 - - arbtt # failure in job https://hydra.nixos.org/build/307516851 at 2025-09-19 - arch-hs # failure in job https://hydra.nixos.org/build/233225768 at 2023-09-02 - archiver # failure in job https://hydra.nixos.org/build/233245795 at 2023-09-02 - archlinux # failure in job https://hydra.nixos.org/build/233202430 at 2023-09-02 @@ -485,8 +484,6 @@ broken-packages: - bindings-wlc # failure in job https://hydra.nixos.org/build/233332720 at 2023-09-02 - bindynamic # failure in job https://hydra.nixos.org/build/295091957 at 2025-04-22 - binembed # failure in job https://hydra.nixos.org/build/233219100 at 2023-09-02 - - binrep # failure in job https://hydra.nixos.org/build/307517077 at 2025-09-19 - - binrep-instances # failure in job https://hydra.nixos.org/build/295092045 at 2025-04-22 - binsm # failure in job https://hydra.nixos.org/build/233232355 at 2023-09-02 - bio # failure in job https://hydra.nixos.org/build/233225273 at 2023-09-02 - bio-sequence # failure in job https://hydra.nixos.org/build/233236140 at 2023-09-02 @@ -654,7 +651,6 @@ broken-packages: - cabal-auto-expose # failure in job https://hydra.nixos.org/build/233195440 at 2023-09-02 - cabal-build-programs # failure in job https://hydra.nixos.org/build/257091363 at 2024-04-27 - cabal-bundle-clib # failure in job https://hydra.nixos.org/build/233199225 at 2023-09-02 - - cabal-cargs # failure in job https://hydra.nixos.org/build/307517214 at 2025-09-19 - cabal-constraints # failure in job https://hydra.nixos.org/build/233214316 at 2023-09-02 - cabal-db # failure in job https://hydra.nixos.org/build/233197235 at 2023-09-02 - cabal-debian # failure in job https://hydra.nixos.org/build/233255267 at 2023-09-02 @@ -1258,7 +1254,6 @@ broken-packages: - database-migrate # failure in job https://hydra.nixos.org/build/233201597 at 2023-09-02 - database-study # failure in job https://hydra.nixos.org/build/233222466 at 2023-09-02 - datadog # failure in job https://hydra.nixos.org/build/233191124 at 2023-09-02 - - dataframe # failure in job https://hydra.nixos.org/build/307517771 at 2025-09-19 - DataIndex # failure in job https://hydra.nixos.org/build/233254506 at 2023-09-02 - datalog # failure in job https://hydra.nixos.org/build/233242707 at 2023-09-02 - datapacker # failure in job https://hydra.nixos.org/build/233206524 at 2023-09-02 @@ -4070,7 +4065,6 @@ broken-packages: - mollie-api-haskell # failure in job https://hydra.nixos.org/build/233200867 at 2023-09-02 - monad-atom # failure in job https://hydra.nixos.org/build/233243367 at 2023-09-02 - monad-atom-simple # failure in job https://hydra.nixos.org/build/233259038 at 2023-09-02 - - monad-bayes # failure in job https://hydra.nixos.org/build/307520391 at 2025-09-19 - monad-branch # failure in job https://hydra.nixos.org/build/233251253 at 2023-09-02 - monad-choice # failure in job https://hydra.nixos.org/build/233255987 at 2023-09-02 - monad-fork # failure in job https://hydra.nixos.org/build/233206855 at 2023-09-02 @@ -4651,7 +4645,6 @@ broken-packages: - pasta-curves # failure in job https://hydra.nixos.org/build/233196512 at 2023-09-02 - pastis # failure in job https://hydra.nixos.org/build/233218498 at 2023-09-02 - pasty # failure in job https://hydra.nixos.org/build/233251812 at 2023-09-02 - - patat # failure in job https://hydra.nixos.org/build/307611198 at 2025-09-19 - patches-vector # failure in job https://hydra.nixos.org/build/233244862 at 2023-09-02 - path-formatting # failure in job https://hydra.nixos.org/build/233199358 at 2023-09-02 - path-sing # failure in job https://hydra.nixos.org/build/237234354 at 2023-10-21 @@ -5307,7 +5300,6 @@ broken-packages: - registry-messagepack # failure in job https://hydra.nixos.org/build/303231364 at 2025-07-27 - registry-options # failure in job https://hydra.nixos.org/build/295096594 at 2025-04-22 - regress # failure in job https://hydra.nixos.org/build/233208901 at 2023-09-02 - - regression-simple # failure in job https://hydra.nixos.org/build/307521504 at 2025-09-19 - regular # failure in job https://hydra.nixos.org/build/233232656 at 2023-09-02 - rehoo # failure in job https://hydra.nixos.org/build/233246417 at 2023-09-02 - rei # failure in job https://hydra.nixos.org/build/233221328 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index e5bdcb6107cd1..4f70b7e6cdef8 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -310,7 +310,6 @@ dont-distribute-packages: - blockio - blogination - BlogLiterately-diagrams - - bloomfilter-blocked - bloxorz - blubber - bluetile @@ -680,6 +679,7 @@ dont-distribute-packages: - datadog-tracing - datafix - dataflow + - dataframe_0_3_0_4 - datasets - date-conversions - dbjava @@ -2960,7 +2960,6 @@ dont-distribute-packages: - rfc-psql - rfc-redis - rfc-servant - - rhine-bayes - rhythm-game-tutorial - rib - ribosome @@ -3456,7 +3455,6 @@ dont-distribute-packages: - tasklite - tasklite-core - tasty-bdd - - tasty-bench-fit - tasty-groundhog-converters - tasty-integrate - tasty-jenkins-xml diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 02c4100539259..fc676dfd1df59 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -81812,9 +81812,7 @@ self: { ]; description = "Automatic Rule-Based Time Tracker"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.rvl ]; - broken = true; } ) { }; @@ -105792,9 +105790,7 @@ self: { ]; description = "Encode precise binary representations directly in types"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.raehik ]; - broken = true; } ) { }; @@ -105816,8 +105812,6 @@ self: { ]; description = "Orphan instances for binrep"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -111569,7 +111563,6 @@ self: { doHaddock = false; description = "Classic and block-style bloom filters"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -123227,9 +123220,7 @@ self: { ]; description = "A command line program for extracting compiler arguments from a cabal file"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "cabal-cargs"; - broken = true; } ) { }; @@ -180627,9 +180618,7 @@ self: { ]; description = "A fast, safe, and intuitive DataFrame library"; license = lib.licenses.gpl3Plus; - hydraPlatforms = lib.platforms.none; mainProgram = "dataframe"; - broken = true; } ) { }; @@ -453336,10 +453325,8 @@ self: { ]; description = "A library for probabilistic programming"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "example"; maintainers = [ lib.maintainers.turion ]; - broken = true; } ) { }; @@ -507087,10 +507074,8 @@ self: { ]; description = "Terminal-based presentations using Pandoc"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; mainProgram = "patat"; maintainers = [ lib.maintainers.dalpd ]; - broken = true; } ) { }; @@ -567496,8 +567481,6 @@ self: { ]; description = "Simple linear and quadratic regression"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -574449,7 +574432,6 @@ self: { ]; description = "monad-bayes backend for Rhine"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "rhine-bayes-gloss"; } ) { }; @@ -658443,7 +658425,6 @@ self: { ]; description = "Determine time complexity of a given function"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; } ) { }; From 1c6a830c853f678e7eaaa07a4cd7cb31543bd297 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 22 Sep 2025 16:01:31 +0200 Subject: [PATCH 59/84] haskellPackages.bloomfilter-blocked: disable test suite we can't easily build (cherry picked from commit d19e1790d64df689daa077539e08496faf0034c9) --- pkgs/development/haskell-modules/configuration-common.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index b220a5c298662..611919a354e94 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -378,6 +378,14 @@ with haskellLib; # There are numerical tests on random data, that may fail occasionally lapack = dontCheck super.lapack; + # fpr-calc test suite depends on random >= 1.3 + # see https://github.com/IntersectMBO/lsm-tree/issues/797 + bloomfilter-blocked = + lib.warnIf (lib.versionAtLeast self.random.version "1.3") + "haskellPackages.bloomfilter-blocked: dontCheck can potentially be removed" + dontCheck + super.bloomfilter-blocked; + # support for transformers >= 0.6 lifted-base = appendPatch (fetchpatch { url = "https://github.com/basvandijk/lifted-base/commit/6b61483ec7fd0d5d5d56ccb967860d42740781e8.patch"; From 771cacffaf60de5eedd4a25671a97413cd05c9bb Mon Sep 17 00:00:00 2001 From: maralorn Date: Sat, 20 Sep 2025 21:09:26 +0200 Subject: [PATCH 60/84] haskell.packages.ghc{94,96,98,912}.haskell-language-server: Fix build (cherry picked from commit 3bce98bfed6c26282c301505b9e12d8c44767f1d) --- .../haskell-modules/configuration-common.nix | 16 +- .../configuration-ghc-9.4.x.nix | 16 +- .../configuration-ghc-9.6.x.nix | 36 +- .../configuration-ghc-9.8.x.nix | 35 +- .../configuration-hackage2nix/main.yaml | 10 +- .../haskell-modules/hackage-packages.nix | 508 +++++++++++++++++- 6 files changed, 601 insertions(+), 20 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 611919a354e94..c64039f957935 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -255,10 +255,24 @@ with haskellLib; super // { # HLS 2.11: Too strict bound on Diff 1.0. - haskell-language-server = dontCheck (doJailbreak super.haskell-language-server); + haskell-language-server = lib.pipe super.haskell-language-server [ + dontCheck + doJailbreak + ( + if versionOlder self.ghc.version "9.10" || versionOlder "9.11" self.ghc.version then + addBuildDepends [ + self.apply-refact + self.hlint + self.refact + ] + else + lib.id + ) + ]; } ) ) + hlint fourmolu ormolu haskell-language-server diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index 7d0853cc057f8..7673e54c2e74c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -121,7 +121,7 @@ self: super: { tar = self.tar_0_6_3_0; # A given major version of ghc-exactprint only supports one version of GHC. - ghc-exactprint = super.ghc-exactprint_1_6_1_3; + ghc-exactprint = dontCheck super.ghc-exactprint_1_6_1_3; # Too strict upper bound on template-haskell # https://github.com/mokus0/th-extras/issues/18 @@ -130,22 +130,32 @@ self: super: { # https://github.com/kowainik/relude/issues/436 relude = dontCheck super.relude; + haddock-library = doJailbreak super.haddock-library; + apply-refact = addBuildDepend self.data-default-class super.apply-refact; + path = self.path_0_9_5; inherit ( let hls_overlay = lself: lsuper: { Cabal-syntax = lself.Cabal-syntax_3_10_3_0; Cabal = lself.Cabal_3_10_3_0; + extensions = dontCheck (doJailbreak (lself.extensions_0_1_0_1)); }; in lib.mapAttrs (_: pkg: doDistribute (pkg.overrideScope hls_overlay)) { - haskell-language-server = allowInconsistentDependencies super.haskell-language-server; - fourmolu = doJailbreak self.fourmolu_0_14_0_0; # ansi-terminal, Diff + haskell-language-server = allowInconsistentDependencies ( + addBuildDepends [ self.retrie self.floskell ] super.haskell-language-server + ); + fourmolu = doJailbreak (dontCheck self.fourmolu_0_14_0_0); # ansi-terminal, Diff ormolu = doJailbreak self.ormolu_0_7_2_0; # ansi-terminal hlint = self.hlint_3_6_1; stylish-haskell = self.stylish-haskell_0_14_5_0; + retrie = doJailbreak (unmarkBroken super.retrie); + floskell = doJailbreak super.floskell; } ) + retrie + floskell haskell-language-server fourmolu ormolu diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index 746115587fbff..351f10d84bae1 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -109,7 +109,6 @@ in stm-containers = dontCheck super.stm-containers; regex-tdfa = dontCheck super.regex-tdfa; hiedb = dontCheck super.hiedb; - retrie = dontCheck super.retrie; # https://github.com/kowainik/relude/issues/436 relude = dontCheck (doJailbreak super.relude); @@ -198,8 +197,39 @@ 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-parser = doDistribute self.ghc-lib-parser_9_10_3_20250912; - ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_10_0_0; + 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; + apply-refact = addBuildDepend self.data-default-class super.apply-refact; + inherit + ( + let + hls_overlay = lself: lsuper: { + Cabal-syntax = lself.Cabal-syntax_3_10_3_0; + Cabal = lself.Cabal_3_10_3_0; + extensions = dontCheck (doJailbreak lself.extensions_0_1_0_1); + }; + in + lib.mapAttrs (_: pkg: doDistribute (pkg.overrideScope hls_overlay)) { + haskell-language-server = allowInconsistentDependencies ( + addBuildDepends [ self.retrie self.floskell ] super.haskell-language-server + ); + ormolu = doDistribute self.ormolu_0_7_4_0; + fourmolu = doDistribute (dontCheck (doJailbreak self.fourmolu_0_15_0_0)); + hlint = doDistribute self.hlint_3_8; + stylish-haskell = self.stylish-haskell_0_14_6_0; + retrie = doJailbreak (unmarkBroken super.retrie); + floskell = doJailbreak super.floskell; + } + ) + retrie + floskell + haskell-language-server + fourmolu + ormolu + hlint + stylish-haskell + ; } # super.ghc is required to break infinite recursion as Nix is strict in the attrNames // diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix index 4023b746fe621..f739c9ddea641 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix @@ -104,6 +104,37 @@ in # A given major version of ghc-exactprint only supports one version of GHC. ghc-exactprint = doDistribute super.ghc-exactprint_1_8_0_0; - ghc-lib-parser = doDistribute self.ghc-lib-parser_9_10_3_20250912; - ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_10_0_0; + haddock-library = doJailbreak super.haddock-library; + apply-refact = addBuildDepend self.data-default-class super.apply-refact; + 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 + ( + let + hls_overlay = lself: lsuper: { + Cabal-syntax = lself.Cabal-syntax_3_10_3_0; + Cabal = lself.Cabal_3_10_3_0; + extensions = dontCheck (doJailbreak super.extensions_0_1_0_1); + }; + in + lib.mapAttrs (_: pkg: doDistribute (pkg.overrideScope hls_overlay)) { + haskell-language-server = allowInconsistentDependencies ( + addBuildDepends [ self.retrie self.floskell ] super.haskell-language-server + ); + ormolu = doDistribute self.ormolu_0_7_4_0; + fourmolu = doDistribute (dontCheck (doJailbreak self.fourmolu_0_15_0_0)); + hlint = doDistribute self.hlint_3_8; + stylish-haskell = self.stylish-haskell_0_14_6_0; + retrie = doJailbreak (unmarkBroken super.retrie); + floskell = doJailbreak super.floskell; + } + ) + retrie + floskell + haskell-language-server + fourmolu + ormolu + hlint + stylish-haskell + ; } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 7f8e037af806e..ea7be8f72bcf5 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -60,7 +60,9 @@ extra-packages: - Cabal-syntax == 3.12.* - Cabal-syntax == 3.14.* - Cabal-syntax == 3.16.* # version required for cabal-install and other packages + - extensions == 0.1.0.1 # 2025-09-21: needed for Cabal 3.10 (fourmolo/ormolu with ghc 9.8) - fourmolu == 0.14.0.0 # 2023-11-13: for ghc-lib-parser 9.6 compat + - fourmolu == 0.15.0.0 # 2025-09-21: for ghc-lib-parser 9.8 compat - fsnotify < 0.4 # 2024-04-22: required by spago-0.21 - fuzzyset == 0.2.4 # 2023-12-20: Needed for building postgrest > 10 - ghc-exactprint == 0.6.* # 2022-12-12: needed for GHC < 9.2 @@ -74,10 +76,10 @@ extra-packages: - ghc-lib == 9.10.* # 2024-12-30: preserve for GHC 9.10/ghc-tags 1.9 - ghc-lib-parser == 9.2.* # 2022-02-17: preserve for GHC 8.10, 9.0 - ghc-lib-parser == 9.6.* # 2024-05-19: preserve for GHC 9.2, 9.4 - - ghc-lib-parser == 9.10.* # 2024-12-26: preserve for GHC 9.6, 9.8, 9.10 + - ghc-lib-parser == 9.8.* # 2024-12-26: preserve for GHC 9.6, 9.8 - ghc-lib-parser-ex == 9.2.* # 2022-07-13: preserve for GHC 8.10, 9.0 - ghc-lib-parser-ex == 9.6.* # 2024-05-19: preserve for GHC 9.2, 9.4 - - ghc-lib-parser-ex == 9.10.* # 2024-12-26: preserve for GHC 9.6, 9.8, 9.10 + - ghc-lib-parser-ex == 9.8.* # 2024-12-26: preserve for GHC 9.6, 9.8 - ghc-tags == 1.5.* # 2023-02-18: preserve for ghc-lib == 9.2.* - ghc-tags == 1.7.* # 2023-02-18: preserve for ghc-lib == 9.6.* - ghc-tags == 1.8.* # 2023-02-18: preserve for ghc-lib == 9.8.* @@ -91,13 +93,16 @@ extra-packages: - hasql-pool < 1.1 # 2025-01-19: Needed for building postgrest - hasql-transaction < 1.1.1 # 2025-01-19: Needed for building postgrest - hlint == 3.6.* # 2025-04-14: needed for hls with ghc-lib-parser 9.6 + - hlint == 3.8.* # 2025-09-21: needed for hls with ghc-lib-parser 9.8 - hpack == 0.38.1 # 2025-09-18: to match exact version upstream stack-3.7.1 uses - hspec-megaparsec == 2.2.0 # 2023-11-18: Latest version compatible with ghc 9.0 - language-javascript == 0.7.0.0 # required by purescript - network-run == 0.4.0 # 2024-10-20: for GHC 9.10/network == 3.1.* - ormolu == 0.5.2.0 # 2023-08-08: preserve for ghc 9.0 - ormolu == 0.7.2.0 # 2023-11-13: for ghc-lib-parser 9.6 compat + - ormolu == 0.7.4.0 # 2023-09-21: for ghc-lib-parser 9.8 compat - os-string == 1.* # 2025-07-30: dummy package we need for pre os-string GHCs + - path == 0.9.5 # 2025-09-21: Pin for hls on ghc 9.4 - postgresql-binary < 0.14 # 2025-01-19: Needed for building postgrest - primitive-unlifted == 0.1.3.1 # 2024-03-16: preserve for ghc 9.2 - retrie < 1.2.0.0 # 2022-12-30: preserve for ghc < 9.2 @@ -106,6 +111,7 @@ extra-packages: - simple-get-opt < 0.5 # 2025-05-01: for crux-0.7.2 - stylish-haskell == 0.14.4.0 # 2022-09-19: preserve for ghc 9.0 - stylish-haskell == 0.14.5.0 # 2025-04-14: needed for hls with ghc-lib 9.6 + - stylish-haskell == 0.14.6.0 # 2025-09-21: needed for hls with ghc-lib 9.8 - stylish-haskell == 0.15.0.1 # 2025-04-14: needed for hls with ghc-lib 9.10 - tar == 0.6.0.0 # 2025-02-08: last version to not require os-string (which can't be built with GHC < 9.2) - tar == 0.6.3.0 # 2025-08-17: last version to not require file-io and directory-ospath-streaming (for GHC < 9.6) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index fc676dfd1df59..1aa2eb2b9c298 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -224744,6 +224744,69 @@ self: { } ) { }; + extensions_0_1_0_1 = callPackage ( + { + mkDerivation, + base, + bytestring, + Cabal, + colourista, + containers, + directory, + filepath, + ghc-boot-th, + hedgehog, + hspec, + hspec-hedgehog, + optparse-applicative, + parsec, + text, + }: + mkDerivation { + pname = "extensions"; + version = "0.1.0.1"; + sha256 = "1rf6jhmms6ll7mn9rh81amzb7nd4zjqcnxdzivw50dxcrcfmdiq2"; + revision = "1"; + editedCabalFile = "1ixf5bpxy840zdlg3gsl3whzii03fc5j16i591pakprsvprp04hk"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base + bytestring + Cabal + containers + directory + filepath + ghc-boot-th + parsec + text + ]; + executableHaskellDepends = [ + base + colourista + containers + directory + filepath + optparse-applicative + text + ]; + testHaskellDepends = [ + base + bytestring + containers + ghc-boot-th + hedgehog + hspec + hspec-hedgehog + text + ]; + description = "Parse Haskell Language Extensions"; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + mainProgram = "extensions"; + } + ) { }; + extensions = callPackage ( { mkDerivation, @@ -241026,6 +241089,114 @@ self: { } ) { }; + fourmolu_0_15_0_0 = callPackage ( + { + mkDerivation, + aeson, + ansi-terminal, + array, + base, + binary, + bytestring, + Cabal-syntax, + containers, + deepseq, + Diff, + directory, + file-embed, + filepath, + ghc-lib-parser, + hspec, + hspec-discover, + hspec-megaparsec, + megaparsec, + MemoTrie, + mtl, + optparse-applicative, + path, + path-io, + pretty, + process, + QuickCheck, + scientific, + syb, + temporary, + text, + th-env, + yaml, + }: + mkDerivation { + pname = "fourmolu"; + version = "0.15.0.0"; + sha256 = "11xy0k5zkhd0dz7ify0m466l90j8sblm9rzzwkc0nn0d8pxyizfq"; + revision = "1"; + editedCabalFile = "1a0wnrvygipxivjzjbbvl1vm4pc45p5p239z741xj9jj5kipjh9c"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson + ansi-terminal + array + base + binary + bytestring + Cabal-syntax + containers + deepseq + Diff + directory + file-embed + filepath + ghc-lib-parser + megaparsec + MemoTrie + mtl + scientific + syb + text + yaml + ]; + executableHaskellDepends = [ + base + Cabal-syntax + containers + directory + filepath + ghc-lib-parser + optparse-applicative + text + th-env + yaml + ]; + testHaskellDepends = [ + base + bytestring + Cabal-syntax + containers + Diff + directory + filepath + ghc-lib-parser + hspec + hspec-megaparsec + megaparsec + path + path-io + pretty + process + QuickCheck + temporary + text + yaml + ]; + testToolDepends = [ hspec-discover ]; + description = "A formatter for Haskell source code"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "fourmolu"; + } + ) { }; + fourmolu = callPackage ( { mkDerivation, @@ -258579,7 +258750,7 @@ self: { } ) { }; - ghc-lib-parser_9_10_3_20250912 = callPackage ( + ghc-lib-parser_9_8_5_20250214 = callPackage ( { mkDerivation, alex, @@ -258604,8 +258775,8 @@ self: { }: mkDerivation { pname = "ghc-lib-parser"; - version = "9.10.3.20250912"; - sha256 = "1ilh872nvzdvz1k9lnf3q4xwspbdgb9lcygfff1bnszf9jv14z7r"; + version = "9.8.5.20250214"; + sha256 = "1l07lkc4d9ryxy26fr7mry4691m0f3p0wi6b6l1jzr968hrs06cb"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array @@ -258776,7 +258947,7 @@ self: { } ) { }; - ghc-lib-parser-ex_9_10_0_0 = callPackage ( + ghc-lib-parser-ex_9_8_0_2 = callPackage ( { mkDerivation, base, @@ -258792,8 +258963,8 @@ self: { }: mkDerivation { pname = "ghc-lib-parser-ex"; - version = "9.10.0.0"; - sha256 = "1v4nq8nvg9bpdnqgpy8pkzb05h7f9f6m2a6bcqj3j2i9jzqv7sb6"; + version = "9.8.0.2"; + sha256 = "1s4ibjdzrflb2r88srmdnslj09h78xqwdn6djcnirmnka7qrf09v"; libraryHaskellDepends = [ base bytestring @@ -258803,8 +258974,6 @@ self: { ]; testHaskellDepends = [ base - bytestring - containers directory extra filepath @@ -258813,7 +258982,7 @@ self: { tasty-hunit uniplate ]; - description = "Programming with GHC parse trees"; + description = "Algorithms on GHC parse trees"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; } @@ -332010,6 +332179,80 @@ self: { } ) { }; + hlint_3_8 = callPackage ( + { + mkDerivation, + aeson, + ansi-terminal, + base, + bytestring, + cmdargs, + containers, + cpphs, + data-default, + deriving-aeson, + directory, + extra, + file-embed, + filepath, + filepattern, + ghc-lib-parser, + ghc-lib-parser-ex, + hscolour, + process, + refact, + text, + transformers, + uniplate, + unordered-containers, + utf8-string, + vector, + yaml, + }: + mkDerivation { + pname = "hlint"; + version = "3.8"; + sha256 = "0x5xkd8n9idmg334kj1kky6bcl4wl8ks4i87j3r8zwp75fv3dwm8"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson + ansi-terminal + base + bytestring + cmdargs + containers + cpphs + data-default + deriving-aeson + directory + extra + file-embed + filepath + filepattern + ghc-lib-parser + ghc-lib-parser-ex + hscolour + process + refact + text + transformers + uniplate + unordered-containers + utf8-string + vector + yaml + ]; + executableHaskellDepends = [ base ]; + description = "Source code suggestions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "hlint"; + maintainers = [ lib.maintainers.maralorn ]; + } + ) { }; + hlint = callPackage ( { mkDerivation, @@ -496339,6 +496582,100 @@ self: { } ) { }; + ormolu_0_7_4_0 = callPackage ( + { + mkDerivation, + ansi-terminal, + array, + base, + binary, + bytestring, + Cabal-syntax, + containers, + deepseq, + Diff, + directory, + file-embed, + filepath, + ghc-lib-parser, + hspec, + hspec-discover, + hspec-megaparsec, + megaparsec, + MemoTrie, + mtl, + optparse-applicative, + path, + path-io, + QuickCheck, + syb, + temporary, + text, + th-env, + }: + mkDerivation { + pname = "ormolu"; + version = "0.7.4.0"; + sha256 = "1s7a9crjhbsmjkdvpv8ycygpiikv96s96p3lmjik4pb3q7idir2z"; + revision = "5"; + editedCabalFile = "107p02xhq0gfacc6j8kackqn16a0wnayq7qpi26acvzqqyxhcjxy"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal + array + base + binary + bytestring + Cabal-syntax + containers + deepseq + Diff + directory + file-embed + filepath + ghc-lib-parser + megaparsec + MemoTrie + mtl + syb + text + ]; + executableHaskellDepends = [ + base + Cabal-syntax + containers + directory + filepath + ghc-lib-parser + optparse-applicative + text + th-env + ]; + testHaskellDepends = [ + base + Cabal-syntax + containers + directory + filepath + ghc-lib-parser + hspec + hspec-megaparsec + megaparsec + path + path-io + QuickCheck + temporary + text + ]; + testToolDepends = [ hspec-discover ]; + description = "A formatter for Haskell source code"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "ormolu"; + } + ) { }; + ormolu = callPackage ( { mkDerivation, @@ -507258,6 +507595,60 @@ self: { } ) { }; + path_0_9_5 = callPackage ( + { + mkDerivation, + aeson, + base, + bytestring, + deepseq, + exceptions, + filepath, + genvalidity, + genvalidity-hspec, + genvalidity-property, + hashable, + hspec, + mtl, + QuickCheck, + template-haskell, + text, + validity, + }: + mkDerivation { + pname = "path"; + version = "0.9.5"; + sha256 = "0cy4vilmhzhi5nfh4v2kyvizhjzjpjib3bvgm1sgmvjzj40dfgrd"; + libraryHaskellDepends = [ + aeson + base + deepseq + exceptions + filepath + hashable + template-haskell + text + ]; + testHaskellDepends = [ + aeson + base + bytestring + filepath + genvalidity + genvalidity-hspec + genvalidity-property + hspec + mtl + QuickCheck + template-haskell + validity + ]; + description = "Support for well-typed paths"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + path = callPackage ( { mkDerivation, @@ -644263,6 +644654,105 @@ self: { } ) { }; + stylish-haskell_0_14_6_0 = callPackage ( + { + mkDerivation, + aeson, + base, + bytestring, + Cabal, + containers, + directory, + file-embed, + filepath, + ghc-lib-parser, + ghc-lib-parser-ex, + HsYAML, + HsYAML-aeson, + HUnit, + mtl, + optparse-applicative, + random, + regex-tdfa, + strict, + syb, + test-framework, + test-framework-hunit, + text, + }: + mkDerivation { + pname = "stylish-haskell"; + version = "0.14.6.0"; + sha256 = "1v72i3dxn30z832cs19sbnj5p40y873sv4kciaivd0ls7i5mm8vb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson + base + bytestring + Cabal + containers + directory + file-embed + filepath + ghc-lib-parser + ghc-lib-parser-ex + HsYAML + HsYAML-aeson + mtl + regex-tdfa + syb + text + ]; + executableHaskellDepends = [ + aeson + base + bytestring + Cabal + containers + directory + file-embed + filepath + ghc-lib-parser + ghc-lib-parser-ex + HsYAML + HsYAML-aeson + mtl + optparse-applicative + regex-tdfa + strict + syb + text + ]; + testHaskellDepends = [ + aeson + base + bytestring + Cabal + containers + directory + file-embed + filepath + ghc-lib-parser + ghc-lib-parser-ex + HsYAML + HsYAML-aeson + HUnit + mtl + random + regex-tdfa + syb + test-framework + test-framework-hunit + text + ]; + description = "Haskell code prettifier"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "stylish-haskell"; + } + ) { }; + stylish-haskell_0_15_0_1 = callPackage ( { mkDerivation, From 847d79da4aee6565c7ff4402f4e477052a57e43c Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 23 Sep 2025 13:22:37 +0200 Subject: [PATCH 61/84] spago-legacy: 0.21.0 -> 0.21.1, rename from spago See https://github.com/purescript/spago-legacy/pull/3. Co-authored-by: Peter Becich (cherry picked from commit 401566541bfa7ed6796cbcfbe7500e8ff5e70dce) --- .../compilers/purescript/purescript/update.sh | 2 +- .../haskell-modules/configuration-common.nix | 1 - .../configuration-hackage2nix/main.yaml | 2 - .../haskell-modules/configuration-nix.nix | 76 ++++++------- .../haskell-modules/hackage-packages.nix | 100 ------------------ .../haskell-modules/non-hackage-packages.nix | 4 +- .../{spago => spago-legacy}/default.nix | 12 +-- .../spago-legacy.nix} | 12 +-- .../{spago => spago-legacy}/update.sh | 22 ++-- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/release-haskell.nix | 2 +- 12 files changed, 65 insertions(+), 171 deletions(-) rename pkgs/development/tools/purescript/{spago => spago-legacy}/default.nix (77%) rename pkgs/development/tools/purescript/{spago/spago.nix => spago-legacy/spago-legacy.nix} (87%) rename pkgs/development/tools/purescript/{spago => spago-legacy}/update.sh (61%) diff --git a/pkgs/development/compilers/purescript/purescript/update.sh b/pkgs/development/compilers/purescript/purescript/update.sh index 186a51a2bca3a..0834fbf5d1dc5 100755 --- a/pkgs/development/compilers/purescript/purescript/update.sh +++ b/pkgs/development/compilers/purescript/purescript/update.sh @@ -50,4 +50,4 @@ echo echo "Finished. Make sure you run the following commands to confirm PureScript builds correctly:" echo ' - `nix build -L -f ./. purescript`' echo ' - `nix build -L -f ./. purescript.passthru.tests.minimal-module`' -echo ' - `sudo nix build -L -f ./. spago.passthru.tests --option sandbox relaxed`' +echo ' - `sudo nix build -L -f ./. spago-legacy.passthru.tests --option sandbox relaxed`' diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c64039f957935..b32d0767fcf5a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2719,7 +2719,6 @@ with haskellLib; let # We need to build purescript with these dependencies and thus also its reverse # dependencies to avoid version mismatches in their dependency closure. - # TODO: maybe unify with the spago overlay in configuration-nix.nix? purescriptOverlay = self: super: { # As of 2021-11-08, the latest release of `language-javascript` is 0.7.1.0, # but it has a problem with parsing the `async` keyword. It doesn't allow diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index ea7be8f72bcf5..36fcd0f270f84 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -63,7 +63,6 @@ extra-packages: - extensions == 0.1.0.1 # 2025-09-21: needed for Cabal 3.10 (fourmolo/ormolu with ghc 9.8) - fourmolu == 0.14.0.0 # 2023-11-13: for ghc-lib-parser 9.6 compat - fourmolu == 0.15.0.0 # 2025-09-21: for ghc-lib-parser 9.8 compat - - fsnotify < 0.4 # 2024-04-22: required by spago-0.21 - fuzzyset == 0.2.4 # 2023-12-20: Needed for building postgrest > 10 - ghc-exactprint == 0.6.* # 2022-12-12: needed for GHC < 9.2 - ghc-exactprint == 1.5.* # 2023-03-30: needed for GHC == 9.2 @@ -118,7 +117,6 @@ extra-packages: - text-builder < 1 # 2025-08-27: Needed for building postgrest - text-builder-dev < 0.4 # 2025-08-27: Needed for building postgrest - text-metrics < 0.3.3 # 2025-02-08: >= 0.3.3 uses GHC2021 - - versions < 6 # 2024-04-22: required by spago-0.21 - weeder == 2.3.* # 2022-05-31: preserve for GHC 9.0.2 - weeder == 2.4.* # 2023-02-02: preserve for GHC 9.2.* # keep-sorted end diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 312bf224c2e49..36a5198f81ae9 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1084,7 +1084,7 @@ builtins.intersectAttrs super { addBuildTool self.buildHaskellPackages.gtk2hs-buildtools super.pango ); - spago = + spago-legacy = let docsSearchApp_0_0_10 = pkgs.fetchurl { url = "https://github.com/purescript/purescript-docs-search/releases/download/v0.0.10/docs-search-app.js"; @@ -1106,49 +1106,43 @@ builtins.intersectAttrs super { sha256 = "1hjdprm990vyxz86fgq14ajn0lkams7i00h8k2i2g1a0hjdwppq6"; }; in - lib.pipe - (super.spago.override { - # base <4.19, text <2.1 - versions = doJailbreak self.versions_5_0_5; - fsnotify = self.fsnotify_0_3_0_1; - }) - [ - (overrideCabal (drv: { - postUnpack = (drv.postUnpack or "") + '' - # Spago includes the following two files directly into the binary - # with Template Haskell. They are fetched at build-time from the - # `purescript-docs-search` repo above. If they cannot be fetched at - # build-time, they are pulled in from the `templates/` directory in - # the spago source. - # - # However, they are not actually available in the spago source, so they - # need to fetched with nix and put in the correct place. - # https://github.com/spacchetti/spago/issues/510 - cp ${docsSearchApp_0_0_10} "$sourceRoot/templates/docs-search-app-0.0.10.js" - cp ${docsSearchApp_0_0_11} "$sourceRoot/templates/docs-search-app-0.0.11.js" - cp ${purescriptDocsSearch_0_0_10} "$sourceRoot/templates/purescript-docs-search-0.0.10" - cp ${purescriptDocsSearch_0_0_11} "$sourceRoot/templates/purescript-docs-search-0.0.11" - - # For some weird reason, on Darwin, the open(2) call to embed these files - # requires write permissions. The easiest resolution is just to permit that - # (doesn't cause any harm on other systems). - chmod u+w \ - "$sourceRoot/templates/docs-search-app-0.0.10.js" \ - "$sourceRoot/templates/purescript-docs-search-0.0.10" \ - "$sourceRoot/templates/docs-search-app-0.0.11.js" \ - "$sourceRoot/templates/purescript-docs-search-0.0.11" - ''; - })) + lib.pipe super.spago-legacy [ + (overrideCabal (drv: { + postUnpack = (drv.postUnpack or "") + '' + # Spago includes the following two files directly into the binary + # with Template Haskell. They are fetched at build-time from the + # `purescript-docs-search` repo above. If they cannot be fetched at + # build-time, they are pulled in from the `templates/` directory in + # the spago source. + # + # However, they are not actually available in the spago source, so they + # need to fetched with nix and put in the correct place. + # https://github.com/spacchetti/spago/issues/510 + cp ${docsSearchApp_0_0_10} "$sourceRoot/templates/docs-search-app-0.0.10.js" + cp ${docsSearchApp_0_0_11} "$sourceRoot/templates/docs-search-app-0.0.11.js" + cp ${purescriptDocsSearch_0_0_10} "$sourceRoot/templates/purescript-docs-search-0.0.10" + cp ${purescriptDocsSearch_0_0_11} "$sourceRoot/templates/purescript-docs-search-0.0.11" + + # For some weird reason, on Darwin, the open(2) call to embed these files + # requires write permissions. The easiest resolution is just to permit that + # (doesn't cause any harm on other systems). + chmod u+w \ + "$sourceRoot/templates/docs-search-app-0.0.10.js" \ + "$sourceRoot/templates/purescript-docs-search-0.0.10" \ + "$sourceRoot/templates/docs-search-app-0.0.11.js" \ + "$sourceRoot/templates/purescript-docs-search-0.0.11" + ''; + })) - # Tests require network access. - dontCheck + # Tests require network access. + dontCheck - # Overly strict upper bound on text - doJailbreak + # Overly strict upper bound on text (<1.3) + doJailbreak - # Generate shell completion for spago - (self.generateOptparseApplicativeCompletions [ "spago" ]) - ]; + # Generate shell completion for spago + (self.generateOptparseApplicativeCompletions [ "spago" ]) + ]; # checks SQL statements at compile time, and so requires a running PostgreSQL # database to run it's test suite diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 1aa2eb2b9c298..3eea9373d9a24 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -245376,63 +245376,6 @@ self: { } ) { }; - fsnotify_0_3_0_1 = callPackage ( - { - mkDerivation, - async, - base, - bytestring, - containers, - directory, - filepath, - hinotify, - random, - shelly, - tasty, - tasty-hunit, - temporary, - text, - time, - unix, - unix-compat, - }: - mkDerivation { - pname = "fsnotify"; - version = "0.3.0.1"; - sha256 = "19bdbz9wb9jvln6yg6qm0hz0w84bypvkxf0wjhgrgd52f9gidlny"; - revision = "3"; - editedCabalFile = "0n5p6ljx8i5mmalkw05izjgzbqg08y7rxxn2gk8ghxlqldgqgix9"; - libraryHaskellDepends = [ - async - base - bytestring - containers - directory - filepath - hinotify - shelly - text - time - unix - unix-compat - ]; - testHaskellDepends = [ - async - base - directory - filepath - random - tasty - tasty-hunit - temporary - unix-compat - ]; - description = "Cross platform library for file change notification"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - } - ) { }; - fsnotify = callPackage ( { mkDerivation, @@ -708052,49 +707995,6 @@ self: { } ) { }; - versions_5_0_5 = callPackage ( - { - mkDerivation, - base, - deepseq, - hashable, - megaparsec, - microlens, - parser-combinators, - QuickCheck, - tasty, - tasty-hunit, - tasty-quickcheck, - text, - }: - mkDerivation { - pname = "versions"; - version = "5.0.5"; - sha256 = "01kn3ilizzm5n05nz0qry1vjb6bj8dzinyqn3mbshds298acn70c"; - libraryHaskellDepends = [ - base - deepseq - hashable - megaparsec - parser-combinators - text - ]; - testHaskellDepends = [ - base - megaparsec - microlens - QuickCheck - tasty - tasty-hunit - tasty-quickcheck - text - ]; - description = "Types and parsers for software version numbers"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - } - ) { }; - versions = callPackage ( { mkDerivation, diff --git a/pkgs/development/haskell-modules/non-hackage-packages.nix b/pkgs/development/haskell-modules/non-hackage-packages.nix index d13f5d6b8c961..071ef52a31897 100644 --- a/pkgs/development/haskell-modules/non-hackage-packages.nix +++ b/pkgs/development/haskell-modules/non-hackage-packages.nix @@ -45,9 +45,9 @@ self: super: # https://github.com/channable/vaultenv/issues/1 krank:ignore-line vaultenv = self.callPackage ../tools/haskell/vaultenv { }; - # spago(-legacy) won't be released to Hackage: + # spago-legacy won't be released to Hackage: # https://github.com/spacchetti/spago/issues/512 krank:ignore-line - spago = self.callPackage ../tools/purescript/spago/spago.nix { }; + spago-legacy = self.callPackage ../tools/purescript/spago-legacy/spago-legacy.nix { }; # Unofficial fork until PRs are merged https://github.com/pcapriotti/optparse-applicative/pulls/roberth # cabal2nix --maintainer roberth https://github.com/hercules-ci/optparse-applicative.git > pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix diff --git a/pkgs/development/tools/purescript/spago/default.nix b/pkgs/development/tools/purescript/spago-legacy/default.nix similarity index 77% rename from pkgs/development/tools/purescript/spago/default.nix rename to pkgs/development/tools/purescript/spago-legacy/default.nix index c06b588c56baf..ed5ffa3550985 100644 --- a/pkgs/development/tools/purescript/spago/default.nix +++ b/pkgs/development/tools/purescript/spago-legacy/default.nix @@ -4,7 +4,7 @@ lib, # The following are only needed for the passthru.tests: - spago, + spago-legacy, cacert, git, nodejs, @@ -12,11 +12,11 @@ runCommand, }: -lib.pipe haskellPackages.spago [ +lib.pipe haskellPackages.spago-legacy [ haskell.lib.compose.justStaticExecutables (haskell.lib.compose.overrideCabal (oldAttrs: { - changelog = "https://github.com/purescript/spago/releases/tag/${oldAttrs.version}"; + changelog = "https://github.com/purescript/spago-legacy/releases/tag/${oldAttrs.version}"; passthru = (oldAttrs.passthru or { }) // { updateScript = ./update.sh; @@ -25,10 +25,10 @@ lib.pipe haskellPackages.spago [ # network, so they cannot be run in the nix sandbox. sudo is needed in # order to change the sandbox option. # - # $ sudo nix-build -A spago.passthru.tests --option sandbox relaxed + # $ sudo nix-build -A spago-legacy.passthru.tests --option sandbox relaxed # tests = - runCommand "spago-tests" + runCommand "spago-legacy-tests" { __noChroot = true; nativeBuildInputs = [ @@ -36,7 +36,7 @@ lib.pipe haskellPackages.spago [ git nodejs purescript - spago + spago-legacy ]; } '' diff --git a/pkgs/development/tools/purescript/spago/spago.nix b/pkgs/development/tools/purescript/spago-legacy/spago-legacy.nix similarity index 87% rename from pkgs/development/tools/purescript/spago/spago.nix rename to pkgs/development/tools/purescript/spago-legacy/spago-legacy.nix index 905d6b63720e8..75ea67ae64a07 100644 --- a/pkgs/development/tools/purescript/spago/spago.nix +++ b/pkgs/development/tools/purescript/spago-legacy/spago-legacy.nix @@ -62,12 +62,12 @@ zlib, }: mkDerivation { - pname = "spago"; - version = "0.21.0"; + pname = "spago-legacy"; + version = "0.21.1"; src = fetchgit { - url = "https://github.com/purescript/spago.git"; - sha256 = "1v5y15nhw6smnir0y7y854pa70iv8asxsqph2y8rz1c9lkz5d41g"; - rev = "c354f4a461f65fcb83aaa843830ea1589f6c7179"; + url = "https://github.com/purescript/spago-legacy.git"; + sha256 = "18p9cic1y9b2v12np4b5sd82rz5njxh8f1vgqs4gwm6xjccmszmr"; + rev = "2790261c28f59940f192c56f3b8245b3ae8b798d"; fetchSubmodules = true; }; isLibrary = true; @@ -148,7 +148,7 @@ mkDerivation { versions ]; testToolDepends = [ hspec-discover ]; - homepage = "https://github.com/purescript/spago#readme"; + homepage = "https://github.com/purescript/spago-legacy#readme"; license = lib.licenses.bsd3; mainProgram = "spago"; } diff --git a/pkgs/development/tools/purescript/spago/update.sh b/pkgs/development/tools/purescript/spago-legacy/update.sh similarity index 61% rename from pkgs/development/tools/purescript/spago/update.sh rename to pkgs/development/tools/purescript/spago-legacy/update.sh index e25b1b8670b27..5ac99bdb0be04 100755 --- a/pkgs/development/tools/purescript/spago/update.sh +++ b/pkgs/development/tools/purescript/spago-legacy/update.sh @@ -1,10 +1,10 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl jq haskellPackages.cabal2nix-unstable.bin nix-prefetch-scripts -I nixpkgs=. # -# This script will update the spago derivation to the latest version using +# This script will update the spago-legacy derivation to the latest version using # cabal2nix. # -# Note that you should always try building spago after updating it here, since +# Note that you should always try building spago-legacy after updating it here, since # some of the overrides in pkgs/development/haskell/configuration-nix.nix may # need to be updated/changed. @@ -14,26 +14,28 @@ set -eo pipefail script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" # Spago derivation created with cabal2nix. -spago_derivation_file="${script_dir}/spago.nix" +spago_derivation_file="${script_dir}/spago-legacy.nix" -# This is the current revision of spago in Nixpkgs. +# This is the current revision of spago-legacy in Nixpkgs. old_version="$(sed -En 's/.*\bversion = "(.*?)".*/\1/p' "$spago_derivation_file")" -# This is the latest release version of spago on GitHub. -new_version=$(curl --silent "https://api.github.com/repos/purescript/spago/releases" | jq '.[0].tag_name' --raw-output) +# This is the latest release version of spago-legacy on GitHub. +new_version=$(curl --silent "https://api.github.com/repos/purescript/spago-legacy/releases" | jq '.[0].tag_name' --raw-output) -echo "Updating spago from old version $old_version to new version $new_version." +echo "Updating spago-legacy from old version $old_version to new version $new_version." echo "Running cabal2nix and outputting to ${spago_derivation_file}..." echo "# This has been automatically generated by the script" > "$spago_derivation_file" echo "# ./update.sh. This should not be changed by hand." >> "$spago_derivation_file" -cabal2nix --revision "$new_version" "https://github.com/purescript/spago.git" >> "$spago_derivation_file" +cabal2nix --revision "$new_version" "https://github.com/purescript/spago-legacy.git" >> "$spago_derivation_file" + +nixfmt "$spago_derivation_file" # TODO: This should ideally also automatically update the docsSearchVersion # from pkgs/development/haskell/configuration-nix.nix. echo echo "Finished. Make sure you run the following commands to confirm Spago builds correctly:" -echo ' - `nix build -L -f ./. spago`' -echo ' - `sudo nix build -L -f ./. spago.passthru.tests --option sandbox relaxed`' +echo ' - `nix build -L -f ./. spago-legacy`' +echo ' - `sudo nix build -L -f ./. spago-legacy.passthru.tests --option sandbox relaxed`' diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5f685ed794719..42f0eb58865c5 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2361,6 +2361,7 @@ mapAliases { soundOfSorting = sound-of-sorting; # Added 2023-07-07 SP800-90B_EntropyAssessment = sp800-90b-entropyassessment; # Added on 2024-06-12 SPAdes = spades; # Added 2024-06-12 + spago = spago-legacy; # Added 2025-09-23 spark2014 = gnatprove; # Added 2024-02-25 space-orbit = throw "'space-orbit' has been removed because it is unmaintained; Debian upstream stopped tracking it in 2011."; # Added 2025-06-08 spatialite_gui = throw "spatialite_gui has been renamed to spatialite-gui"; # Added 2025-01-12 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bb0befcf03b80..77e512d2cb99a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5101,7 +5101,7 @@ with pkgs; purenix = haskell.lib.compose.justStaticExecutables haskellPackages.purenix; - spago = callPackage ../development/tools/purescript/spago { }; + spago-legacy = callPackage ../development/tools/purescript/spago-legacy { }; pulp = nodePackages.pulp; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 7227412a13477..0370ee354bfe6 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -335,7 +335,7 @@ let shellcheck-minimal sourceAndTags spacecookie - spago + spago-legacy specup splot stack From 022de5278d71740ac96bad9b45a928711ffb93d9 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 26 Sep 2025 14:51:59 +0200 Subject: [PATCH 62/84] spago-legacy: move to by-name (cherry picked from commit 2c29bb5c9db223645b86a96ada274f367979be0a) --- .../default.nix => by-name/sp/spago-legacy/package.nix} | 0 .../purescript => by-name/sp}/spago-legacy/spago-legacy.nix | 0 .../tools/purescript => by-name/sp}/spago-legacy/update.sh | 0 pkgs/development/haskell-modules/non-hackage-packages.nix | 2 +- pkgs/top-level/all-packages.nix | 2 -- 5 files changed, 1 insertion(+), 3 deletions(-) rename pkgs/{development/tools/purescript/spago-legacy/default.nix => by-name/sp/spago-legacy/package.nix} (100%) rename pkgs/{development/tools/purescript => by-name/sp}/spago-legacy/spago-legacy.nix (100%) rename pkgs/{development/tools/purescript => by-name/sp}/spago-legacy/update.sh (100%) diff --git a/pkgs/development/tools/purescript/spago-legacy/default.nix b/pkgs/by-name/sp/spago-legacy/package.nix similarity index 100% rename from pkgs/development/tools/purescript/spago-legacy/default.nix rename to pkgs/by-name/sp/spago-legacy/package.nix diff --git a/pkgs/development/tools/purescript/spago-legacy/spago-legacy.nix b/pkgs/by-name/sp/spago-legacy/spago-legacy.nix similarity index 100% rename from pkgs/development/tools/purescript/spago-legacy/spago-legacy.nix rename to pkgs/by-name/sp/spago-legacy/spago-legacy.nix diff --git a/pkgs/development/tools/purescript/spago-legacy/update.sh b/pkgs/by-name/sp/spago-legacy/update.sh similarity index 100% rename from pkgs/development/tools/purescript/spago-legacy/update.sh rename to pkgs/by-name/sp/spago-legacy/update.sh diff --git a/pkgs/development/haskell-modules/non-hackage-packages.nix b/pkgs/development/haskell-modules/non-hackage-packages.nix index 071ef52a31897..e0cd3a7ac2e9a 100644 --- a/pkgs/development/haskell-modules/non-hackage-packages.nix +++ b/pkgs/development/haskell-modules/non-hackage-packages.nix @@ -47,7 +47,7 @@ self: super: # spago-legacy won't be released to Hackage: # https://github.com/spacchetti/spago/issues/512 krank:ignore-line - spago-legacy = self.callPackage ../tools/purescript/spago-legacy/spago-legacy.nix { }; + spago-legacy = self.callPackage ../../by-name/sp/spago-legacy/spago-legacy.nix { }; # Unofficial fork until PRs are merged https://github.com/pcapriotti/optparse-applicative/pulls/roberth # cabal2nix --maintainer roberth https://github.com/hercules-ci/optparse-applicative.git > pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 77e512d2cb99a..077c4ce2842d7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5101,8 +5101,6 @@ with pkgs; purenix = haskell.lib.compose.justStaticExecutables haskellPackages.purenix; - spago-legacy = callPackage ../development/tools/purescript/spago-legacy { }; - pulp = nodePackages.pulp; pscid = nodePackages.pscid; From c2ae641f30b16807746262810eb9a0a6ac2e8cc2 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 28 Sep 2025 17:18:13 +0200 Subject: [PATCH 63/84] spago: note why alias was introduced (cherry picked from commit a3bce32ab065b3ca79f34c907f3a0d056cfd522c) --- pkgs/top-level/aliases.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 42f0eb58865c5..f65fd643fa6f7 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2361,7 +2361,7 @@ mapAliases { soundOfSorting = sound-of-sorting; # Added 2023-07-07 SP800-90B_EntropyAssessment = sp800-90b-entropyassessment; # Added on 2024-06-12 SPAdes = spades; # Added 2024-06-12 - spago = spago-legacy; # Added 2025-09-23 + spago = spago-legacy; # Added 2025-09-23, pkgs.spago should become spago@next which hasn't been packaged yet spark2014 = gnatprove; # Added 2024-02-25 space-orbit = throw "'space-orbit' has been removed because it is unmaintained; Debian upstream stopped tracking it in 2011."; # Added 2025-06-08 spatialite_gui = throw "spatialite_gui has been renamed to spatialite-gui"; # Added 2025-01-12 From 0c50551755670c8fa4ab4fe4bd938e1a6df7ca6b Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 2 Oct 2025 12:30:46 +0200 Subject: [PATCH 64/84] haskellPackages.dataframe: drop obsolete override This partially reverts commit d00493bd14a01107c279f251f8fcc264bc6a31a5. --- pkgs/development/haskell-modules/configuration-common.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index b32d0767fcf5a..532f80840fc78 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -3457,10 +3457,6 @@ with haskellLib; # including the current one in nixpkgs. liquid-fixpoint = dontCheck super.liquid-fixpoint; - # 2025-09-20: Too strict upper bound on text (<2.1.3) - # https://github.com/mchav/dataframe/issues/61 - dataframe = doJailbreak (warnAfterVersion "0.3.0.4" super.dataframe); - # 2025-8-26: Too strict bounds on containers and text, see: https://github.com/stackbuilders/inflections-hs/pull/83 inflections = doJailbreak super.inflections; From 7d09e5d50e36cb197ee43a25547b7d2f538a5854 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 2 Oct 2025 12:33:52 +0200 Subject: [PATCH 65/84] dhall-lsp-server: drop now unnecessary dos2unix call --- .../haskell-modules/configuration-common.nix | 42 +++++++------------ 1 file changed, 16 insertions(+), 26 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 532f80840fc78..ce10e49f603cf 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1736,32 +1736,22 @@ with haskellLib; # https://github.com/NixOS/nixpkgs/issues/198495 (dontCheckIf (pkgs.postgresqlTestHook.meta.broken) super.persistent-postgresql); - dhall-lsp-server = - appendPatches - [ - # Add support for lsp >= 2.7 - (pkgs.fetchpatch { - name = "dhall-lsp-server-lsp-2.7.patch"; - url = "https://github.com/dhall-lang/dhall-haskell/commit/a621e1438df5865d966597e2e1b0bb37e8311447.patch"; - sha256 = "sha256-7edxNIeIM/trl2SUXybvSzkscvr1kj5+tZF50IeTOgY="; - relative = "dhall-lsp-server"; - }) - # Fix build with text >= 2.1.2 - (pkgs.fetchpatch { - name = "dhall-lsp-server-text-2.1.2.patch"; - url = "https://github.com/dhall-lang/dhall-haskell/commit/9f2d4d44be643229784bfc502ab49184ec82bc05.patch"; - hash = "sha256-cwNH5+7YY8UbA9zHhTRfVaqtIMowZGfFT5Kj+wSlapA="; - relative = "dhall-lsp-server"; - }) - ] - ( - overrideCabal (drv: { - prePatch = '' - ${drv.prePatch or ""} - ${lib.getExe' pkgs.buildPackages.dos2unix "dos2unix"} *.cabal - ''; - }) super.dhall-lsp-server - ); + dhall-lsp-server = appendPatches [ + # Add support for lsp >= 2.7 + (pkgs.fetchpatch { + name = "dhall-lsp-server-lsp-2.7.patch"; + url = "https://github.com/dhall-lang/dhall-haskell/commit/a621e1438df5865d966597e2e1b0bb37e8311447.patch"; + sha256 = "sha256-7edxNIeIM/trl2SUXybvSzkscvr1kj5+tZF50IeTOgY="; + relative = "dhall-lsp-server"; + }) + # Fix build with text >= 2.1.2 + (pkgs.fetchpatch { + name = "dhall-lsp-server-text-2.1.2.patch"; + url = "https://github.com/dhall-lang/dhall-haskell/commit/9f2d4d44be643229784bfc502ab49184ec82bc05.patch"; + hash = "sha256-cwNH5+7YY8UbA9zHhTRfVaqtIMowZGfFT5Kj+wSlapA="; + relative = "dhall-lsp-server"; + }) + ] super.dhall-lsp-server; # Tests disabled and broken override needed because of missing lib chrome-test-utils: https://github.com/reflex-frp/reflex-dom/issues/392 reflex-dom-core = lib.pipe super.reflex-dom-core [ From 22057fdadb79eb4907b91ce6250cfb1185fd6fe5 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 26 Sep 2025 13:43:41 +0200 Subject: [PATCH 66/84] haskellPackages: disable remaining dependents on libsoup_2_4 --- pkgs/development/haskell-modules/configuration-common.nix | 6 ++++++ .../haskell-modules/configuration-hackage2nix/main.yaml | 4 ++-- pkgs/development/haskell-modules/hackage-packages.nix | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ff2889ed4bc99..dc8b2773dcfed 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1739,6 +1739,12 @@ with haskellLib; unmarkBroken ]; + # Requires jsaddle-webkit2gtk to build outside of pkgsCross.ghcjs + # which requires a version of libsoup that's marked as insecure + reflex-dom = dontDistribute super.reflex-dom; + reflex-localize-dom = dontDistribute super.reflex-localize-dom; + trasa-reflex = dontDistribute super.trasa-reflex; + # https://github.com/ghcjs/jsaddle/pull/160/ jsaddle = appendPatch (fetchpatch { name = "fix-on-firefox.patch"; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index d424d3f3d8eed..bc775150e3a69 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -143,14 +143,12 @@ package-maintainers: - generics-sop - ghcjs-base - ghcjs-dom - - ghcjs-dom-hello - ghcjs-dom-javascript - ghcjs-dom-jsaddle - haveibeenpwned - jsaddle - jsaddle-clib - jsaddle-dom - - jsaddle-hello - jsaddle-warp - jsaddle-wkwebview - json-sop @@ -934,7 +932,9 @@ dont-distribute-packages: - yices-painless # These packages don’t build because they use deprecated libsoup 2.4 versions. + - jsaddle-hello - jsaddle-webkit2gtk + - ghcjs-dom-hello - gi-javascriptcore4 - gi-soup2 - gi-webkit2 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 8fd345d9d9db8..687a0e3d4547f 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -261842,7 +261842,7 @@ self: { ]; description = "GHCJS DOM Hello World, an example package"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.alexfmpe ]; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -390512,7 +390512,7 @@ self: { ]; description = "JSaddle Hello World, an example package"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.alexfmpe ]; + hydraPlatforms = lib.platforms.none; } ) { }; From 15ef3bf06d65acd641c83bf0c0f600ed58cad2d0 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 5 Oct 2025 12:13:58 +0200 Subject: [PATCH 67/84] pkgsCross.ghcjs.haskellPackages.reflex-dom: re-enable jobs This is possible since the platform configuration is applied after configuration-common.nix (which contains the dontDistributes). --- .../haskell-modules/configuration-ghcjs-9.x.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghcjs-9.x.nix b/pkgs/development/haskell-modules/configuration-ghcjs-9.x.nix index 10a399e73063a..3d2268de643f1 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs-9.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs-9.x.nix @@ -35,9 +35,16 @@ with haskellLib; patch = haskellLib.disableParallelBuilding super.patch; reflex-dom-core = haskellLib.disableParallelBuilding super.reflex-dom-core; - reflex-dom = super.reflex-dom.override (drv: { - jsaddle-webkit2gtk = null; - }); + # Marked as dontDistribute in -common because of jsaddle-webkit2gtk + # which requires an unmaintained version of libsoup. Since this dep + # is unnecessary for the JS backend, we can re-enable these jobs here. + reflex-dom = doDistribute ( + super.reflex-dom.override (drv: { + jsaddle-webkit2gtk = null; + }) + ); + reflex-localize-dom = doDistribute super.reflex-localize-dom; + trasa-reflex = doDistribute super.trasa-reflex; miso-examples = pkgs.lib.pipe super.miso-examples [ (addBuildDepends ( From 17e7702cea255a2c218a6c8359fad293877dd467 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 6 Oct 2025 12:32:48 +0200 Subject: [PATCH 68/84] haskellPackages.haxl: work around broken Setup.hs pkgs.codd depends on this package which wasn't previously apparent since it is not part of our haskell-updates jobset. --- .../haskell-modules/configuration-common.nix | 13 ++++++++++++- .../configuration-hackage2nix/broken.yaml | 1 - .../transitive-broken.yaml | 6 ------ .../haskell-modules/hackage-packages.nix | 8 -------- pkgs/top-level/release-haskell.nix | 3 ++- 5 files changed, 14 insertions(+), 17 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index dc8b2773dcfed..d5ef796e59834 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -911,6 +911,18 @@ with haskellLib; # https://github.com/ekmett/structures/issues/3 structures = dontCheck super.structures; + # ships broken Setup.hs https://github.com/facebook/Haxl/issues/165 + # https://github.com/facebook/Haxl/pull/164 + haxl = overrideCabal (drv: { + postPatch = '' + ${drv.postPatch or ""} + rm Setup.hs + ''; + # non-deterministic failure https://github.com/facebook/Haxl/issues/85 + # doesn't compile with text-2.1.2 in <2.5.1.2 + doCheck = false; + }) super.haxl; + # Disable test suites to fix the build. acme-year = dontCheck super.acme-year; # http://hydra.cryp.to/build/497858/log/raw aeson-lens = dontCheck super.aeson-lens; # http://hydra.cryp.to/build/496769/log/raw @@ -953,7 +965,6 @@ with haskellLib; hadoop-formats = dontCheck super.hadoop-formats; hashed-storage = dontCheck super.hashed-storage; hashring = dontCheck super.hashring; - haxl = dontCheck super.haxl; # non-deterministic failure https://github.com/facebook/Haxl/issues/85 haxl-facebook = dontCheck super.haxl-facebook; # needs facebook credentials for testing hdbi-postgresql = dontCheck super.hdbi-postgresql; hedis = dontCheck super.hedis; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 2f1bff24722b5..310a9ceec6c0e 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -2629,7 +2629,6 @@ broken-packages: - haven # failure in job https://hydra.nixos.org/build/233216806 at 2023-09-02 - haverer # failure in job https://hydra.nixos.org/build/233210491 at 2023-09-02 - hax # failure in job https://hydra.nixos.org/build/233212147 at 2023-09-02 - - haxl # failure in job https://hydra.nixos.org/build/233243740 at 2023-09-02 - haxparse # failure in job https://hydra.nixos.org/build/233205900 at 2023-09-02 - haxr-th # failure in job https://hydra.nixos.org/build/233250109 at 2023-09-02 - hayland # failure in job https://hydra.nixos.org/build/233201482 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index e5bdcb6107cd1..0eee4e13c48c9 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -480,7 +480,6 @@ dont-distribute-packages: - cless - cleveland - click-clack - - clickhouse-haskell - clifford - clippings - cloud-haskell @@ -1441,8 +1440,6 @@ dont-distribute-packages: - HaVSA - hawitter - Hawk - - haxl-amazonka - - haxl-facebook - haxy - Hayoo - hback @@ -2887,7 +2884,6 @@ dont-distribute-packages: - reddit - redHandlers - redis-io - - rediscaching-haxl - refh - reflex-animation - reflex-backend-wai @@ -3080,7 +3076,6 @@ dont-distribute-packages: - scotty-fay - scotty-form - scotty-hastache - - scotty-haxl - scotty-params-parser - scp-streams - scrabble-bot @@ -3139,7 +3134,6 @@ dont-distribute-packages: - servant-db-postgresql - servant-ede - servant-examples - - servant-haxl-client - servant-js - servant-matrix-param - servant-oauth2 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 687a0e3d4547f..adf59bd7f5223 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -144020,7 +144020,6 @@ self: { ]; description = "A Haskell library as database client for Clickhouse"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -313248,8 +313247,6 @@ self: { ]; description = "A Haskell library for efficient, concurrent, and concise data access"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -313281,7 +313278,6 @@ self: { ]; description = "Haxl data source for accessing AWS services through amazonka"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -313345,7 +313341,6 @@ self: { ]; description = "An example Haxl data source for accessing the Facebook Graph API"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -562482,7 +562477,6 @@ self: { ]; description = "Combine redis caching and haxl"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -589719,7 +589713,6 @@ self: { ]; description = "Combine scotty and haxl"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -598790,7 +598783,6 @@ self: { ]; description = "automatical derivation of querying functions for servant webservices"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 1f3d4be32d0c7..4e9b3558d5f61 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -256,9 +256,10 @@ let cachix # carp broken on 2024-04-09 changelog-d - cornelis cedille client-ip-echo + cornelis + codd darcs dconf2nix dhall From f26f3c6aa0bce3e811a5ddb8e89153f3dc2dc3e0 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 26 Sep 2025 12:31:20 +0200 Subject: [PATCH 69/84] haskellPackages: postgresqlTestHook overrides to configuration-nix.nix --- .../haskell-modules/configuration-common.nix | 100 +----------------- .../haskell-modules/configuration-nix.nix | 100 +++++++++++++++++- 2 files changed, 100 insertions(+), 100 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 12bd2839f569a..9ac0952076b6b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -757,18 +757,7 @@ with haskellLib; migrant-core = doJailbreak super.migrant-core; migrant-sqlite-simple = doJailbreak super.migrant-sqlite-simple; migrant-hdbc = doJailbreak super.migrant-hdbc; - migrant-postgresql-simple = lib.pipe super.migrant-postgresql-simple [ - (overrideCabal { - preCheck = '' - postgresqlTestUserOptions="LOGIN SUPERUSER" - ''; - }) - (addTestToolDepends [ - pkgs.postgresql - pkgs.postgresqlTestHook - ]) - doJailbreak - ]; + migrant-postgresql-simple = doJailbreak super.migrant-postgresql-simple; # https://github.com/froozen/kademlia/issues/2 kademlia = dontCheck super.kademlia; @@ -1574,33 +1563,6 @@ with haskellLib; # https://github.com/mgajda/json-autotype/issues/25 json-autotype = dontCheck super.json-autotype; - postgresql-simple-migration = overrideCabal (drv: { - preCheck = '' - PGUSER=test - PGDATABASE=test - ''; - testToolDepends = drv.testToolDepends or [ ] ++ [ - pkgs.postgresql - pkgs.postgresqlTestHook - ]; - }) (doJailbreak super.postgresql-simple-migration); - - postgresql-simple = addTestToolDepends [ - pkgs.postgresql - pkgs.postgresqlTestHook - ] super.postgresql-simple; - - beam-postgres = lib.pipe super.beam-postgres [ - # Requires pg_ctl command during tests - (addTestToolDepends [ pkgs.postgresql ]) - (dontCheckIf (!pkgs.postgresql.doInstallCheck || !self.testcontainers.doCheck)) - ]; - - users-postgresql-simple = addTestToolDepends [ - pkgs.postgresql - pkgs.postgresqlTestHook - ] super.users-postgresql-simple; - gargoyle-postgresql-nix = addBuildTool [ pkgs.postgresql ] super.gargoyle-postgresql-nix; # PortMidi needs an environment variable to have ALSA find its plugins: @@ -1631,31 +1593,6 @@ with haskellLib; # Fix build with attr-2.4.48 (see #53716) xattr = appendPatch ./patches/xattr-fix-build.patch super.xattr; - esqueleto = - overrideCabal - (drv: { - postPatch = drv.postPatch or "" + '' - # patch out TCP usage: https://nixos.org/manual/nixpkgs/stable/#sec-postgresqlTestHook-tcp - sed -i test/PostgreSQL/Test.hs \ - -e s^host=localhost^^ - ''; - # Match the test suite defaults (or hardcoded values?) - preCheck = drv.preCheck or "" + '' - PGUSER=esqutest - PGDATABASE=esqutest - ''; - testFlags = drv.testFlags or [ ] ++ [ - # We don't have a MySQL test hook yet - "--skip=/Esqueleto/MySQL" - ]; - testToolDepends = drv.testToolDepends or [ ] ++ [ - pkgs.postgresql - pkgs.postgresqlTestHook - ]; - }) - # https://github.com/NixOS/nixpkgs/issues/198495 - (dontCheckIf (pkgs.postgresqlTestHook.meta.broken) super.esqueleto); - # Requires API keys to run tests algolia = dontCheck super.algolia; openai-hs = dontCheck super.openai-hs; @@ -1714,27 +1651,6 @@ with haskellLib; # Test suite requires database persistent-mysql = dontCheck super.persistent-mysql; - persistent-postgresql = - # TODO: move this override to configuration-nix.nix - overrideCabal - (drv: { - postPatch = drv.postPath or "" + '' - # patch out TCP usage: https://nixos.org/manual/nixpkgs/stable/#sec-postgresqlTestHook-tcp - # NOTE: upstream host variable takes only two values... - sed -i test/PgInit.hs \ - -e s^'host=" <> host <> "'^^ - ''; - preCheck = drv.preCheck or "" + '' - PGDATABASE=test - PGUSER=test - ''; - testToolDepends = drv.testToolDepends or [ ] ++ [ - pkgs.postgresql - pkgs.postgresqlTestHook - ]; - }) - # https://github.com/NixOS/nixpkgs/issues/198495 - (dontCheckIf (pkgs.postgresqlTestHook.meta.broken) super.persistent-postgresql); dhall-lsp-server = appendPatches [ # Add support for lsp >= 2.7 @@ -2878,20 +2794,6 @@ with haskellLib; # https://github.com/brandonchinn178/tasty-autocollect/issues/54 tasty-autocollect = dontCheck super.tasty-autocollect; - postgres-websockets = lib.pipe super.postgres-websockets [ - (addTestToolDepends [ - pkgs.postgresql - pkgs.postgresqlTestHook - ]) - (dontCheckIf pkgs.postgresqlTestHook.meta.broken) - (overrideCabal { - preCheck = '' - export postgresqlEnableTCP=1 - export PGDATABASE=postgres_ws_test - ''; - }) - ]; - postgrest = lib.pipe (super.postgrest.overrideScope ( diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 6ebd6eb8a002e..2d32dbc5a6640 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -460,9 +460,21 @@ builtins.intersectAttrs super { ]; # Avoid compiling twice by providing executable as a separate output (with small closure size), + # add postgresqlTestHook to allow test executiion postgres-websockets = lib.pipe super.postgres-websockets [ enableSeparateBinOutput - (overrideCabal { passthru.tests = pkgs.nixosTests.postgres-websockets; }) + (overrideCabal { + passthru.tests = pkgs.nixosTests.postgres-websockets; + preCheck = '' + export postgresqlEnableTCP=1 + export PGDATABASE=postgres_ws_test + ''; + }) + (addTestToolDepends [ + pkgs.postgresql + pkgs.postgresqlTestHook + ]) + (dontCheckIf pkgs.postgresqlTestHook.meta.broken) ]; # Test suite requires a running postgresql server, @@ -1220,6 +1232,92 @@ builtins.intersectAttrs super { ]; }) super.haskell-pgmq; + migrant-postgresql-simple = lib.pipe super.migrant-postgresql-simple [ + (overrideCabal { + preCheck = '' + postgresqlTestUserOptions="LOGIN SUPERUSER" + ''; + }) + (addTestToolDepends [ + pkgs.postgresql + pkgs.postgresqlTestHook + ]) + ]; + + postgresql-simple-migration = overrideCabal (drv: { + preCheck = '' + PGUSER=test + PGDATABASE=test + ''; + testToolDepends = drv.testToolDepends or [ ] ++ [ + pkgs.postgresql + pkgs.postgresqlTestHook + ]; + }) (doJailbreak super.postgresql-simple-migration); + + postgresql-simple = addTestToolDepends [ + pkgs.postgresql + pkgs.postgresqlTestHook + ] super.postgresql-simple; + + beam-postgres = lib.pipe super.beam-postgres [ + # Requires pg_ctl command during tests + (addTestToolDepends [ pkgs.postgresql ]) + (dontCheckIf (!pkgs.postgresql.doInstallCheck || !self.testcontainers.doCheck)) + ]; + + users-postgresql-simple = addTestToolDepends [ + pkgs.postgresql + pkgs.postgresqlTestHook + ] super.users-postgresql-simple; + + esqueleto = + overrideCabal + (drv: { + postPatch = drv.postPatch or "" + '' + # patch out TCP usage: https://nixos.org/manual/nixpkgs/stable/#sec-postgresqlTestHook-tcp + sed -i test/PostgreSQL/Test.hs \ + -e s^host=localhost^^ + ''; + # Match the test suite defaults (or hardcoded values?) + preCheck = drv.preCheck or "" + '' + PGUSER=esqutest + PGDATABASE=esqutest + ''; + testFlags = drv.testFlags or [ ] ++ [ + # We don't have a MySQL test hook yet + "--skip=/Esqueleto/MySQL" + ]; + testToolDepends = drv.testToolDepends or [ ] ++ [ + pkgs.postgresql + pkgs.postgresqlTestHook + ]; + }) + # https://github.com/NixOS/nixpkgs/issues/198495 + (dontCheckIf (pkgs.postgresqlTestHook.meta.broken) super.esqueleto); + + persistent-postgresql = + # TODO: move this override to configuration-nix.nix + overrideCabal + (drv: { + postPatch = drv.postPath or "" + '' + # patch out TCP usage: https://nixos.org/manual/nixpkgs/stable/#sec-postgresqlTestHook-tcp + # NOTE: upstream host variable takes only two values... + sed -i test/PgInit.hs \ + -e s^'host=" <> host <> "'^^ + ''; + preCheck = drv.preCheck or "" + '' + PGDATABASE=test + PGUSER=test + ''; + testToolDepends = drv.testToolDepends or [ ] ++ [ + pkgs.postgresql + pkgs.postgresqlTestHook + ]; + }) + # https://github.com/NixOS/nixpkgs/issues/198495 + (dontCheckIf (pkgs.postgresqlTestHook.meta.broken) super.persistent-postgresql); + # https://gitlab.iscpif.fr/gargantext/haskell-bee/blob/19c8775f0d960c669235bf91131053cb6f69a1c1/README.md#redis haskell-bee-redis = overrideCabal (drv: { testToolDepends = drv.testToolDepends or [ ] ++ [ From 3104b066e88f8744de3a1dc677bb558e903c60ef Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 26 Sep 2025 12:39:03 +0200 Subject: [PATCH 70/84] haskellPackages.postgresql-simple-migration: refactor override --- pkgs/development/haskell-modules/configuration-nix.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 2d32dbc5a6640..6e3c0f042565f 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1253,7 +1253,8 @@ builtins.intersectAttrs super { pkgs.postgresql pkgs.postgresqlTestHook ]; - }) (doJailbreak super.postgresql-simple-migration); + jailbreak = true; + }) super.postgresql-simple-migration; postgresql-simple = addTestToolDepends [ pkgs.postgresql From f9cbdbceb5bd16a5edc643ff440fccf3ade36a57 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 26 Sep 2025 13:07:29 +0200 Subject: [PATCH 71/84] haskellPackages: only use postgresqlTestHook if available --- .../haskell-modules/configuration-nix.nix | 26 +++++++++++++------ 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 6e3c0f042565f..dc5a276ecd6df 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1218,6 +1218,7 @@ builtins.intersectAttrs super { pkgs.postgresql pkgs.postgresqlTestHook ]; + doCheck = drv.doCheck or true && !(pkgs.postgresqlTestHook.meta.broken); }) super.relocant; # https://gitlab.iscpif.fr/gargantext/haskell-pgmq/blob/9a869df2842eccc86a0f31a69fb8dc5e5ca218a8/README.md#running-test-cases @@ -1230,6 +1231,7 @@ builtins.intersectAttrs super { (lib.getBin (pkgs.postgresql.withPackages (ps: [ ps.pgmq ]))) pkgs.postgresqlTestHook ]; + doCheck = drv.doCheck or true && !(pkgs.postgresqlTestHook.meta.broken); }) super.haskell-pgmq; migrant-postgresql-simple = lib.pipe super.migrant-postgresql-simple [ @@ -1242,6 +1244,7 @@ builtins.intersectAttrs super { pkgs.postgresql pkgs.postgresqlTestHook ]) + (dontCheckIf pkgs.postgresqlTestHook.meta.broken) ]; postgresql-simple-migration = overrideCabal (drv: { @@ -1254,12 +1257,16 @@ builtins.intersectAttrs super { pkgs.postgresqlTestHook ]; jailbreak = true; + doCheck = drv.doCheck or true && !(pkgs.postgresqlTestHook.meta.broken); }) super.postgresql-simple-migration; - postgresql-simple = addTestToolDepends [ - pkgs.postgresql - pkgs.postgresqlTestHook - ] super.postgresql-simple; + postgresql-simple = lib.pipe super.postgresql-simple [ + (addTestToolDepends [ + pkgs.postgresql + pkgs.postgresqlTestHook + ]) + (dontCheckIf pkgs.postgresqlTestHook.meta.broken) + ]; beam-postgres = lib.pipe super.beam-postgres [ # Requires pg_ctl command during tests @@ -1267,10 +1274,13 @@ builtins.intersectAttrs super { (dontCheckIf (!pkgs.postgresql.doInstallCheck || !self.testcontainers.doCheck)) ]; - users-postgresql-simple = addTestToolDepends [ - pkgs.postgresql - pkgs.postgresqlTestHook - ] super.users-postgresql-simple; + users-postgresql-simple = lib.pipe super.users-postgresql-simple [ + (addTestToolDepends [ + pkgs.postgresql + pkgs.postgresqlTestHook + ]) + (dontCheckIf pkgs.postgresqlTestHook.meta.broken) + ]; esqueleto = overrideCabal From 3570093d39a8a4cbb81394daab3416a07809cbc0 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 6 Oct 2025 15:05:51 +0200 Subject: [PATCH 72/84] haskell.packages.ghc9{4,6}.toml-reader: disable unsupported tests skeletest only supports >= 9.6 for 0.1.0 and 9.4 not at all. Doesn't seem worth it trying to get it to work for this. --- pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix | 3 +++ pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix | 3 +++ 2 files changed, 6 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index 7673e54c2e74c..a22017cbca7ff 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -98,6 +98,9 @@ self: super: { # 2022-08-01: Tests are broken on ghc 9.2.4: https://github.com/wz1000/HieDb/issues/46 hiedb = dontCheck super.hiedb; + # Tests require skeletest which doesn't support GHC 9.4 + toml-reader = dontCheck super.toml-reader; + # 2022-10-06: https://gitlab.haskell.org/ghc/ghc/-/issues/22260 ghc-check = dontHaddock super.ghc-check; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index 351f10d84bae1..1d6277624b85d 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -148,6 +148,9 @@ in # Tests require nothunks < 0.3 (conflicting with Stackage) for GHC < 9.8 aeson = dontCheck super.aeson; + # Tests require skeletest which no longer supports GHC 9.6 + toml-reader = dontCheck super.toml-reader; + # Apply patch from PR with mtl-2.3 fix. ConfigFile = overrideCabal (drv: { editedCabalFile = null; From 485a99feffda97606584d2b1ab54f5812a6f9f69 Mon Sep 17 00:00:00 2001 From: Ben Orchard Date: Fri, 10 Oct 2025 12:27:58 +0100 Subject: [PATCH 73/84] haskellPackages.HsOpenSSL-x509-system: fix Mac runtime It's the same sort of platform-specific code as the {crypton-,}x509-system packages. Applying the same bandaid fixes. --- .../development/haskell-modules/configuration-darwin.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index f3387cd2ce7fb..494a7c03da410 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -108,6 +108,15 @@ self: super: + (drv.postPatch or ""); } ) super.crypton-x509-system; + HsOpenSSL-x509-system = overrideCabal ( + drv: + lib.optionalAttrs (!pkgs.stdenv.cc.nativeLibc) { + postPatch = '' + substituteInPlace OpenSSL/X509/SystemStore/MacOSX.hs --replace-fail security /usr/bin/security + '' + + (drv.postPatch or ""); + } + ) super.HsOpenSSL-x509-system; # https://github.com/haskell-foundation/foundation/pull/412 foundation = dontCheck super.foundation; From 4debea0de966f33505b745cfc681088c53e29921 Mon Sep 17 00:00:00 2001 From: Ben Orchard Date: Fri, 10 Oct 2025 12:33:43 +0100 Subject: [PATCH 74/84] haskellPackages: change darwin postPatch substitutes to use --replace-fail --- .../haskell-modules/configuration-darwin.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index 494a7c03da410..1eee042e93e04 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -94,7 +94,7 @@ self: super: drv: lib.optionalAttrs (!pkgs.stdenv.cc.nativeLibc) { postPatch = '' - substituteInPlace System/X509/MacOS.hs --replace security /usr/bin/security + substituteInPlace System/X509/MacOS.hs --replace-fail security /usr/bin/security '' + (drv.postPatch or ""); } @@ -103,7 +103,7 @@ self: super: drv: lib.optionalAttrs (!pkgs.stdenv.cc.nativeLibc) { postPatch = '' - substituteInPlace System/X509/MacOS.hs --replace security /usr/bin/security + substituteInPlace System/X509/MacOS.hs --replace-fail security /usr/bin/security '' + (drv.postPatch or ""); } @@ -133,7 +133,7 @@ self: super: # when called from GHC, probably because clang is version 7, but we are # using LLVM8. preCompileBuildDriver = '' - substituteInPlace Setup.hs --replace "addToLdLibraryPath libDir" "pure ()" + substituteInPlace Setup.hs --replace-fail "addToLdLibraryPath libDir" "pure ()" '' + (oldAttrs.preCompileBuildDriver or ""); }) super.llvm-hs; @@ -174,7 +174,7 @@ self: super: HTF = overrideCabal (drv: { # GNU find is not prefixed in stdenv postPatch = '' - substituteInPlace scripts/local-htfpp --replace "find=gfind" "find=find" + substituteInPlace scripts/local-htfpp --replace-fail "find=gfind" "find=find" '' + (drv.postPatch or ""); }) super.HTF; @@ -194,7 +194,7 @@ self: super: # however linking against it is also not necessary there GLHUI = overrideCabal (drv: { postPatch = '' - substituteInPlace GLHUI.cabal --replace " rt" "" + substituteInPlace GLHUI.cabal --replace-fail " rt" "" '' + (drv.postPatch or ""); }) super.GLHUI; @@ -203,7 +203,7 @@ self: super: # Prevent darwin-specific configuration code path being taken # which doesn't work with nixpkgs' SDL libraries postPatch = '' - substituteInPlace configure --replace xDarwin noDarwinSpecialCasing + substituteInPlace configure --replace-fail xDarwin noDarwinSpecialCasing '' + (drv.postPatch or ""); patches = [ @@ -216,7 +216,7 @@ self: super: # doesn't work with nixpkgs' SDL libraries SDL-mixer = overrideCabal (drv: { postPatch = '' - substituteInPlace configure --replace xDarwin noDarwinSpecialCasing + substituteInPlace configure --replace-fail xDarwin noDarwinSpecialCasing '' + (drv.postPatch or ""); }) super.SDL-mixer; @@ -322,7 +322,7 @@ self: super: # Remove a problematic assert, the length is sometimes 1 instead of 2 on darwin di-core = overrideCabal (drv: { preConfigure = '' - substituteInPlace test/Main.hs --replace \ + substituteInPlace test/Main.hs --replace-fail \ "2 @=? List.length (List.nub (List.sort (map Di.log_time logs)))" "" ''; }) super.di-core; From cac97ad6f645c2e6901ea31e031ceeff806f7d3d Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Mon, 13 Oct 2025 03:11:49 +0100 Subject: [PATCH 75/84] haskellPackages: fix executables built for ghcjs --- pkgs/development/compilers/ghc/common-hadrian.nix | 4 ++++ .../compilers/ghc/export-heap-methods.patch | 11 +++++++++++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/compilers/ghc/export-heap-methods.patch diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index 2ab244baf9f25..bac31615c6020 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -239,6 +239,10 @@ hash = "sha256-sb+AHdkGkCu8MW0xoQIpD5kEc0zYX8udAMDoC+TWc0Q="; }) ] + ++ lib.optionals stdenv.targetPlatform.isGhcjs [ + # https://gitlab.haskell.org/ghc/ghc/-/issues/26290 + ./export-heap-methods.patch + ] # Prevents passing --hyperlinked-source to haddock. Note that this can # be configured via a user defined flavour now. Unfortunately, it is # impossible to import an existing flavour in UserSettings, so patching diff --git a/pkgs/development/compilers/ghc/export-heap-methods.patch b/pkgs/development/compilers/ghc/export-heap-methods.patch new file mode 100644 index 0000000000000..ff4ce1263aee9 --- /dev/null +++ b/pkgs/development/compilers/ghc/export-heap-methods.patch @@ -0,0 +1,11 @@ +diff --git a/rts/js/mem.js b/rts/js/mem.js +index 44c5c37ac4..1f150c5d55 100644 +--- a/rts/js/mem.js ++++ b/rts/js/mem.js +@@ -1,5 +1,5 @@ + //#OPTIONS:CPP +-//#OPTIONS:EMCC:EXPORTED_RUNTIME_METHODS=addFunction,removeFunction,getEmptyTableSlot ++//#OPTIONS:EMCC:EXPORTED_RUNTIME_METHODS=addFunction,removeFunction,getEmptyTableSlot,HEAP8,HEAPU8 + + // #define GHCJS_TRACE_META 1 + From f538f7665572461ed9145c47602f4795a7f2db00 Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 7 Sep 2025 19:48:00 +0100 Subject: [PATCH 76/84] haskell-modules/configuration-hackage2nix: drop mentions of 8.10 --- .../haskell-modules/configuration-hackage2nix/main.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 24efeb61a7abb..396ea23257438 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -70,13 +70,13 @@ extra-packages: - ghc-exactprint == 1.7.* # 2025-03-09: needed for GHC == 9.6 - ghc-exactprint == 1.8.* # 2024-05-20: needed for GHC == 9.8 - ghc-exactprint == 1.9.* # 2024-08-27: needed for GHC == 9.10 - - ghc-lib == 9.2.* # 2022-02-17: preserve for GHC 8.10, 9.0 + - ghc-lib == 9.2.* # 2022-02-17: preserve for GHC 9.0 - ghc-lib == 9.6.* # 2022-02-17: preserve for GHC 9.2, 9.4 - ghc-lib == 9.10.* # 2024-12-30: preserve for GHC 9.10/ghc-tags 1.9 - - ghc-lib-parser == 9.2.* # 2022-02-17: preserve for GHC 8.10, 9.0 + - ghc-lib-parser == 9.2.* # 2022-02-17: preserve for GHC 9.0 - ghc-lib-parser == 9.6.* # 2024-05-19: preserve for GHC 9.2, 9.4 - ghc-lib-parser == 9.8.* # 2024-12-26: preserve for GHC 9.6, 9.8 - - ghc-lib-parser-ex == 9.2.* # 2022-07-13: preserve for GHC 8.10, 9.0 + - ghc-lib-parser-ex == 9.2.* # 2022-07-13: preserve for GHC 9.0 - ghc-lib-parser-ex == 9.6.* # 2024-05-19: preserve for GHC 9.2, 9.4 - ghc-lib-parser-ex == 9.8.* # 2024-12-26: preserve for GHC 9.6, 9.8 - ghc-tags == 1.5.* # 2023-02-18: preserve for ghc-lib == 9.2.* From 72a9e526cca97ae6005c1e330d30bcbd9213b448 Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Sat, 11 Oct 2025 03:13:38 +0100 Subject: [PATCH 77/84] haskellPackages: fix build of cabal-macosx --- pkgs/development/haskell-modules/configuration-common.nix | 8 ++++++++ .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 9ac0952076b6b..243609aecb2e8 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1712,6 +1712,14 @@ with haskellLib; } ); + # https://github.com/danfran/cabal-macosx/pull/19 + cabal-macosx = appendPatch (fetchpatch { + name = "support-cabal-3.14.patch"; + url = "https://github.com/danfran/cabal-macosx/commit/24ef850a4c743e525433a6f9eaa3f8924408db10.patch"; + excludes = [ ".gitignore" ]; + sha256 = "sha256-ORonk31yStWH0I83B4hCpnap7KK4o49UVrwdrZjCRaU="; + }) super.cabal-macosx; + # 2020-06-24: Jailbreaking because of restrictive test dep bounds # Upstream issue: https://github.com/kowainik/trial/issues/62 trial = doJailbreak super.trial; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 1012f06cdb831..4c55d4ed1c627 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -672,7 +672,6 @@ broken-packages: - cabal-install-bundle # failure in job https://hydra.nixos.org/build/233194629 at 2023-09-02 - cabal-install-ghc72 # failure in job https://hydra.nixos.org/build/233246160 at 2023-09-02 - cabal-install-ghc74 # failure in job https://hydra.nixos.org/build/233226625 at 2023-09-02 - - cabal-macosx # failure in job https://hydra.nixos.org/build/307517203 at 2025-09-19 - cabal-meta # failure in job https://hydra.nixos.org/build/233194466 at 2023-09-02 - cabal-mon # failure in job https://hydra.nixos.org/build/233217320 at 2023-09-02 - cabal-nirvana # failure in job https://hydra.nixos.org/build/233222083 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index cd719b95d2f84..e87c28b11b8b4 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -124899,9 +124899,7 @@ self: { ]; description = "Cabal support for creating Mac OSX application bundles"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "macosx-app"; - broken = true; } ) { }; From ec5a9db64aaeb99e13326216a03b1b3753b40a05 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 18 Sep 2025 20:19:59 +0200 Subject: [PATCH 78/84] emanote: remove at 1.4.0.0 The former maintainer and upstream author of this package has been banned from Nixpkgs f03d404df9c59a2cbb7f6f902247841245c97c3c6ad90. I have zero interest in keeping this working. ema happens to work without overrides, so let's leave that enabled until it breaks. --- pkgs/development/haskell-modules/configuration-common.nix | 3 --- .../haskell-modules/configuration-hackage2nix/main.yaml | 1 - pkgs/development/haskell-modules/configuration-nix.nix | 2 -- pkgs/development/haskell-modules/hackage-packages.nix | 1 - pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 3 --- pkgs/top-level/release-haskell.nix | 1 - 7 files changed, 1 insertion(+), 11 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 9ac0952076b6b..b0661e9fcb03e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2454,9 +2454,6 @@ with haskellLib; )) ]; - # 2025-02-11: Too strict bounds on base < 4.17 - ema = doJailbreak super.ema; - # Too strict bounds on text and tls # https://github.com/barrucadu/irc-conduit/issues/54 # Use crypton-connection instead of connection diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 396ea23257438..7fe0f4f2366a3 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -698,7 +698,6 @@ unsupported-platforms: Codec-Image-DevIL: [ platforms.darwin ] # depends on mesa coinor-clp: [ aarch64-linux ] # aarch64-linux is not supported by required system dependency clp cut-the-crap: [ platforms.darwin ] - emanote: [ x86_64-darwin ] # Depends on stork which is broken on macOS sdk < 10.14 essence-of-live-coding-PortMidi: [ platforms.darwin ] Euterpea: [ platforms.darwin ] follow-file: [ platforms.darwin ] diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index dc5a276ecd6df..aa50419b3c7aa 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1824,8 +1824,6 @@ builtins.intersectAttrs super { })) super.tailwind; - emanote = addBuildDepend pkgs.stork super.emanote; - keid-render-basic = addBuildTool pkgs.glslang super.keid-render-basic; # Disable checks to break dependency loop with SCalendar diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index cd719b95d2f84..c6d66c4c6c4c2 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -213621,7 +213621,6 @@ self: { ]; description = "Emanate a structured view of your plain-text notes"; license = lib.licenses.agpl3Only; - badPlatforms = [ "x86_64-darwin" ]; hydraPlatforms = lib.platforms.none; mainProgram = "emanote"; broken = true; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9ba7cf1ac2068..4ba17489d45ef 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -858,6 +858,7 @@ mapAliases { emacsNativeComp = emacs; # Added 2022-06-08 emacsWithPackages = throw "'emacsWithPackages' has been renamed to/replaced by 'emacs.pkgs.withPackages'"; # Converted to throw 2024-10-17 emacsPackages = emacs.pkgs; # Added 2025-03-02 + emanote = throw "'emanote' has been removed due to lack of a Nixpkgs maintainer"; # Added 2025-09-18 embree2 = throw "embree2 has been removed, as it is unmaintained upstream and depended on tbb_2020"; # Added 2025-09-14 EmptyEpsilon = empty-epsilon; # Added 2024-07-14 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8281b6bd355f7..aa4b5063f916e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7178,9 +7178,6 @@ with pkgs; vapoursynth-editor = libsForQt5.callPackage ../by-name/va/vapoursynth/editor.nix { }; - # TODO: Fix references and add justStaticExecutables https://github.com/NixOS/nixpkgs/issues/318013 - emanote = haskellPackages.emanote; - enchant2 = callPackage ../development/libraries/enchant/2.x.nix { }; enchant = enchant2; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 05ba89e2706a5..a41d6a042079b 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -271,7 +271,6 @@ let diagrams-builder echidna elm2nix - emanote fffuu futhark ghcid From 8d1ec1d03da6b62d67ea1d3bb884275b5958a843 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Sun, 12 Oct 2025 22:38:38 +0800 Subject: [PATCH 79/84] haskellPackages.gi-gtk-hs: use gi-gtk3 and gi-gdk3 to fix build Upstream change that makes this change hasn't been released yet. Co-authored-by: sternenseemann --- .../haskell-modules/configuration-common.nix | 19 +++++++++++++++++++ .../configuration-hackage2nix/broken.yaml | 1 - .../transitive-broken.yaml | 1 - .../haskell-modules/hackage-packages.nix | 2 -- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 9ac0952076b6b..cfa210d9b2180 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -3363,6 +3363,25 @@ with haskellLib; stripe-signature = doJailbreak super.stripe-signature; stripe-wreq = doJailbreak super.stripe-wreq; + # 2025-10-12: gi-gtk was renamed to gi-gtk3 + # https://github.com/haskell-gi/haskell-gi/issues/478 + gi-gtk-hs = + appendPatches + [ + (pkgs.fetchpatch { + name = "gi-gtk-hs-use-gtk3.patch"; + url = "https://github.com/haskell-gi/haskell-gi/commit/e2ed85835499f70e119f050a2f37f22481f93886.patch"; + sha256 = "sha256-MzxXtBNBbJJaNwTOrq/CYqK4yGfS4Yk5fQ38ihFcclA="; + relative = "gi-gtk-hs"; + }) + ] + ( + super.gi-gtk-hs.override { + gi-gdk = self.gi-gdk3; + gi-gtk = self.gi-gtk3; + } + ); + # 2025-08-04: Disable failing testcases. It would feel bad to disable all the # checks in a cryptography related package. botan-low = overrideCabal (drv: { diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 1012f06cdb831..496b82342f409 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -2169,7 +2169,6 @@ broken-packages: - gi-gstapp # failure in job https://hydra.nixos.org/build/253686159 at 2024-03-31 - gi-gsttag # failure in job https://hydra.nixos.org/build/233197576 at 2023-09-02 - gi-gtk-declarative # failure in job https://hydra.nixos.org/build/307610571 at 2025-09-19 - - gi-gtk-hs # failure in job https://hydra.nixos.org/build/307610574 at 2025-09-19 - gi-gtk4-layer-shell # failure in job https://hydra.nixos.org/build/302803068 at 2025-07-27 - gi-gtksheet # failure in job https://hydra.nixos.org/build/233211386 at 2023-09-02 - gi-ibus # failure in job https://hydra.nixos.org/build/233220272 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 4f70b7e6cdef8..04eaedcec9e08 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -679,7 +679,6 @@ dont-distribute-packages: - datadog-tracing - datafix - dataflow - - dataframe_0_3_0_4 - datasets - date-conversions - dbjava diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index cd719b95d2f84..e179bb5a7c600 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -264668,8 +264668,6 @@ self: { ]; description = "A wrapper for gi-gtk, adding a few more idiomatic API parts on top"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; From 828f4ff9cc1e51c8ed30606e2f90835f40e1fae3 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 13 Oct 2025 17:52:43 +0200 Subject: [PATCH 80/84] haskellPackages: unbreak various packages Created with unbreak.nu. --- .../configuration-hackage2nix/broken.yaml | 16 --------- .../transitive-broken.yaml | 3 -- .../haskell-modules/hackage-packages.nix | 34 ------------------- 3 files changed, 53 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 4c55d4ed1c627..27ae5cce97ce7 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -66,7 +66,6 @@ broken-packages: - adaptive-containers # failure in job https://hydra.nixos.org/build/233243181 at 2023-09-02 - adaptive-tuple # failure in job https://hydra.nixos.org/build/233244881 at 2023-09-02 - adb # failure in job https://hydra.nixos.org/build/233193888 at 2023-09-02 - - adblock2privoxy # failure in job https://hydra.nixos.org/build/307609942 at 2025-09-19 - addy # failure in job https://hydra.nixos.org/build/233240594 at 2023-09-02 - adhoc-fixtures-hspec # failure in job https://hydra.nixos.org/build/252725981 at 2024-03-16 - adjunction # failure in job https://hydra.nixos.org/build/233237774 at 2023-09-02 @@ -76,7 +75,6 @@ broken-packages: - AERN-Basics # failure in job https://hydra.nixos.org/build/233246999 at 2023-09-02 - aeson-applicative # failure in job https://hydra.nixos.org/build/233213824 at 2023-09-02 - aeson-bson # failure in job https://hydra.nixos.org/build/233201964 at 2023-09-02 - - aeson-combinators # failure in job https://hydra.nixos.org/build/307516309 at 2025-09-19 - aeson-commit # failure in job https://hydra.nixos.org/build/233198515 at 2023-09-02 - aeson-compat # failure in job https://hydra.nixos.org/build/233208257 at 2023-09-02 - aeson-decode # failure in job https://hydra.nixos.org/build/233251197 at 2023-09-02 @@ -94,7 +92,6 @@ broken-packages: - aeson-iproute # failure in job https://hydra.nixos.org/build/295091261 at 2025-04-22 - aeson-json-ast # failure in job https://hydra.nixos.org/build/233249406 at 2023-09-02 - aeson-lens # failure in job https://hydra.nixos.org/build/233235357 at 2023-09-02 - - aeson-match-qq # failure in job https://hydra.nixos.org/build/295091245 at 2025-04-22 - aeson-modern-tojson # failure in job https://hydra.nixos.org/build/233202149 at 2023-09-02 - aeson-options # failure in job https://hydra.nixos.org/build/233245051 at 2023-09-02 - aeson-parsec-picky # failure in job https://hydra.nixos.org/build/233222117 at 2023-09-02 @@ -330,7 +327,6 @@ broken-packages: - autoproc # failure in job https://hydra.nixos.org/build/252730569 at 2024-03-16 - avatar-generator # failure in job https://hydra.nixos.org/build/233214253 at 2023-09-02 - aviation-units # failure in job https://hydra.nixos.org/build/233245762 at 2023-09-02 - - avl-static # failure in job https://hydra.nixos.org/build/233199062 at 2023-09-02 - avr-shake # failure in job https://hydra.nixos.org/build/233223187 at 2023-09-02 - avro # failure in job https://hydra.nixos.org/build/307610307 at 2025-09-19 - avro-piper # failure in job https://hydra.nixos.org/build/233197510 at 2023-09-02 @@ -459,7 +455,6 @@ broken-packages: - bindings-cctools # failure in job https://hydra.nixos.org/build/233216939 at 2023-09-02 - bindings-common # failure in job https://hydra.nixos.org/build/233217363 at 2023-09-02 - bindings-dc1394 # failure in job https://hydra.nixos.org/build/233200022 at 2023-09-02 - - bindings-directfb # failure in job https://hydra.nixos.org/build/295091945 at 2025-04-22 - bindings-eskit # failure in job https://hydra.nixos.org/build/233223517 at 2023-09-02 - bindings-EsounD # failure in job https://hydra.nixos.org/build/233245565 at 2023-09-02 - bindings-fann # failure in job https://hydra.nixos.org/build/233232900 at 2023-09-02 @@ -538,7 +533,6 @@ broken-packages: - blosum # failure in job https://hydra.nixos.org/build/233198029 at 2023-09-02 - blubber-server # failure in job https://hydra.nixos.org/build/233199530 at 2023-09-02 - bludigon # failure in job https://hydra.nixos.org/build/233248190 at 2023-09-02 - - bluefin-algae # failure in job https://hydra.nixos.org/build/307517064 at 2025-09-19 - bluefin-random # failure in job https://hydra.nixos.org/build/307517069 at 2025-09-19 - Blueprint # failure in job https://hydra.nixos.org/build/233252987 at 2023-09-02 - bluetileutils # failure in job https://hydra.nixos.org/build/233197334 at 2023-09-02 @@ -1850,7 +1844,6 @@ broken-packages: - fingertree-psqueue # failure in job https://hydra.nixos.org/build/233224766 at 2023-09-02 - fingertree-tf # failure in job https://hydra.nixos.org/build/233259910 at 2023-09-02 - finitary-optics # constraint issues https://hydra.nixos.org/build/295428386 - - finite # failure in job https://hydra.nixos.org/build/233226313 at 2023-09-02 - finite-field # failure in job https://hydra.nixos.org/build/295093309 at 2025-04-22 - finite-fields # failure in job https://hydra.nixos.org/build/233191530 at 2023-09-02 - FiniteCategoriesGraphViz # failure in job https://hydra.nixos.org/build/295090973 at 2025-04-22 @@ -1858,7 +1851,6 @@ broken-packages: - firefly-example # failure in job https://hydra.nixos.org/build/233259350 at 2023-09-02 - firestore # failure in job https://hydra.nixos.org/build/295093356 at 2025-04-22 - first-and-last # failure in job https://hydra.nixos.org/build/233256888 at 2023-09-02 - - first-class-instances # failure in job https://hydra.nixos.org/build/233207181 at 2023-09-02 - first-class-patterns # failure in job https://hydra.nixos.org/build/252739352 at 2024-03-16 - FirstPrelude # failure in job https://hydra.nixos.org/build/233256065 at 2023-09-02 - fit # failure in job https://hydra.nixos.org/build/233239893 at 2023-09-02 @@ -2391,7 +2383,6 @@ broken-packages: - hadoop-rpc # failure in job https://hydra.nixos.org/build/233247222 at 2023-09-02 - hadoop-streaming # failure in job https://hydra.nixos.org/build/233229895 at 2023-09-02 - hafar # failure in job https://hydra.nixos.org/build/233231237 at 2023-09-02 - - haggle # failure in job https://hydra.nixos.org/build/233198660 at 2023-09-02 - Haggressive # failure in job https://hydra.nixos.org/build/233235332 at 2023-09-02 - HaGL # failure in job https://hydra.nixos.org/build/234457220 at 2023-09-13 - hahp # failure in job https://hydra.nixos.org/build/233250101 at 2023-09-02 @@ -2526,7 +2517,6 @@ broken-packages: - haskell-go-checkers # failure in job https://hydra.nixos.org/build/234459896 at 2023-09-13 - haskell-halogen-core # failure in job https://hydra.nixos.org/build/299138362 at 2025-06-23 - haskell-holes-th # failure in job https://hydra.nixos.org/build/233238457 at 2023-09-02 - - haskell-igraph # failure in job https://hydra.nixos.org/build/233201209 at 2023-09-02 - haskell-import-graph # failure in job https://hydra.nixos.org/build/233225328 at 2023-09-02 - haskell-in-space # failure in job https://hydra.nixos.org/build/233207121 at 2023-09-02 - haskell-kubernetes # failure in job https://hydra.nixos.org/build/233214499 at 2023-09-02 @@ -2820,7 +2810,6 @@ broken-packages: - hledger-api # failure in job https://hydra.nixos.org/build/295094278 at 2025-04-22 - hledger-chart # failure in job https://hydra.nixos.org/build/233205387 at 2023-09-02 - hledger-diff # failure in job https://hydra.nixos.org/build/233199639 at 2023-09-02 - - hledger-flow # failure in job https://hydra.nixos.org/build/233252169 at 2023-09-02 - hledger-irr # failure in job https://hydra.nixos.org/build/233230276 at 2023-09-02 - hledger-makeitso # failure in job https://hydra.nixos.org/build/233213046 at 2023-09-02 - hledger-vty # failure in job https://hydra.nixos.org/build/233191782 at 2023-09-02 @@ -2872,7 +2861,6 @@ broken-packages: - Hmpf # failure in job https://hydra.nixos.org/build/233212948 at 2023-09-02 - hmumps # failure in job https://hydra.nixos.org/build/233209336 at 2023-09-02 - hnetcdf # failure in job https://hydra.nixos.org/build/252727915 at 2024-03-16 - - hnix-store-db # failure in job https://hydra.nixos.org/build/307610909 at 2025-09-19 - hnn # failure in job https://hydra.nixos.org/build/233253882 at 2023-09-02 - hnock # failure in job https://hydra.nixos.org/build/233247419 at 2023-09-02 - hnop # failure in job https://hydra.nixos.org/build/233214340 at 2023-09-02 @@ -3614,7 +3602,6 @@ broken-packages: - language-webidl # failure in job https://hydra.nixos.org/build/233194656 at 2023-09-02 - laop # failure in job https://hydra.nixos.org/build/233204106 at 2023-09-02 - large-anon # base >=4.14 && <4.19, ghc >=8.10 && <9.7 https://hydra.nixos.org/build/295428414 - - large-records # failure in job https://hydra.nixos.org/build/295094961 at 2025-04-22 - LargeCardinalHierarchy # failure in job https://hydra.nixos.org/build/233250339 at 2023-09-02 - Lastik # failure in job https://hydra.nixos.org/build/233194460 at 2023-09-02 - latest-npm-version # failure in job https://hydra.nixos.org/build/233239108 at 2023-09-02 @@ -5280,7 +5267,6 @@ broken-packages: - regex-do # failure in job https://hydra.nixos.org/build/307521538 at 2025-09-19 - regex-generator # failure in job https://hydra.nixos.org/build/233239502 at 2023-09-02 - regex-parsec # failure in job https://hydra.nixos.org/build/233223781 at 2023-09-02 - - regex-pcre2 # failure in job https://hydra.nixos.org/build/295096563 at 2025-04-22 - regex-posix-unittest # failure in job https://hydra.nixos.org/build/233249685 at 2023-09-02 - regex-tdfa-pipes # failure in job https://hydra.nixos.org/build/233247416 at 2023-09-02 - regex-tdfa-quasiquoter # failure in job https://hydra.nixos.org/build/233234166 at 2023-09-02 @@ -5310,7 +5296,6 @@ broken-packages: - relational-query-postgresql-pure # failure in job https://hydra.nixos.org/build/296063076 at 2025-05-02 - relevant-time # failure in job https://hydra.nixos.org/build/233190794 at 2023-09-02 - reload # failure in job https://hydra.nixos.org/build/233212925 at 2023-09-02 - - relocant # failure in job https://hydra.nixos.org/build/295096588 at 2025-04-22 - remark # failure in job https://hydra.nixos.org/build/233240981 at 2023-09-02 - remarks # failure in job https://hydra.nixos.org/build/233256889 at 2023-09-02 - rematch-text # failure in job https://hydra.nixos.org/build/307521518 at 2025-09-19 @@ -7019,7 +7004,6 @@ broken-packages: - xmonad-vanessa # failure in job https://hydra.nixos.org/build/233214303 at 2023-09-02 - xmonad-wallpaper # failure in job https://hydra.nixos.org/build/233217165 at 2023-09-02 - xmonad-windownames # failure in job https://hydra.nixos.org/build/233258043 at 2023-09-02 - - xnobar # failure in job https://hydra.nixos.org/build/302807518 at 2025-07-27 - xorshift-plus # failure in job https://hydra.nixos.org/build/233255176 at 2023-09-02 - Xorshift128Plus # failure in job https://hydra.nixos.org/build/233225679 at 2023-09-02 - xsact # failure in job https://hydra.nixos.org/build/233221821 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 4f70b7e6cdef8..1f69c8b483492 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -225,7 +225,6 @@ dont-distribute-packages: - bbi - bdcs - bdcs-api - - beam-large-records - beam-th - beautifHOL - bech32-th @@ -679,7 +678,6 @@ dont-distribute-packages: - datadog-tracing - datafix - dataflow - - dataframe_0_3_0_4 - datasets - date-conversions - dbjava @@ -2762,7 +2760,6 @@ dont-distribute-packages: - proplang - prosidyc - proto-lens-descriptors - - proto3-suite - protobuf-native - protocol-buffers-descriptor - protocol-buffers-descriptor-fork diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index b07ef83e76f2a..11fb61974bf31 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -52789,9 +52789,7 @@ self: { ]; description = "Convert adblock config files to privoxy format"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; mainProgram = "adblock2privoxy"; - broken = true; } ) { }; @@ -53999,8 +53997,6 @@ self: { ]; description = "Aeson combinators for dead simple JSON decoding"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -55057,8 +55053,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Declarative JSON matchers"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -91323,8 +91317,6 @@ self: { ]; description = "A compile-time balanced AVL tree"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -99957,7 +99949,6 @@ self: { ]; description = "Integration of large-records with beam-core"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -104580,8 +104571,6 @@ self: { description = "Low level bindings to DirectFB"; license = lib.licenses.bsd3; badPlatforms = lib.platforms.darwin; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { inherit (pkgs) directfb; }; @@ -111980,8 +111969,6 @@ self: { ]; description = "Algebraic effects and named handlers in Bluefin"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -233473,8 +233460,6 @@ self: { ]; description = "Finite ranges via types"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -234023,8 +234008,6 @@ self: { ]; description = "First-class typeclass instances"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -291518,8 +291501,6 @@ self: { ]; description = "A graph library offering mutable, immutable, and inductive graphs"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -302660,8 +302641,6 @@ self: { ]; description = "Bindings to the igraph C library (v0.8.5)."; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -330712,9 +330691,7 @@ self: { ]; description = "An hledger workflow focusing on automated statement import and classification"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; mainProgram = "hledger-flow"; - broken = true; } ) { }; @@ -336111,8 +336088,6 @@ self: { testHaskellDepends = [ base ]; description = "Nix store database support"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -409768,9 +409743,7 @@ self: { ]; description = "Efficient compilation for large records, linear in the size of the record"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.alexfmpe ]; - broken = true; } ) { }; @@ -544010,7 +543983,6 @@ self: { ]; description = "A higher-level API to the proto3-wire library"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.alexfmpe ]; } ) { }; @@ -566515,8 +566487,6 @@ self: { testPkgconfigDepends = [ pcre2 ]; description = "PCRE2 Backend for \"Text.Regex\" (regex-base)"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { inherit (pkgs) pcre2; }; @@ -568932,9 +568902,7 @@ self: { ]; description = "A PostgreSQL migration CLI tool and library"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; mainProgram = "relocant"; - broken = true; } ) { }; @@ -733981,9 +733949,7 @@ self: { description = "Text-based notification server for XMobar"; license = lib.licenses.bsd3; badPlatforms = lib.platforms.darwin; - hydraPlatforms = lib.platforms.none; mainProgram = "Echo"; - broken = true; } ) { }; From e1a3a9d50a9412a716451506b981ed5c4544b035 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Tue, 14 Oct 2025 10:47:47 +0200 Subject: [PATCH 81/84] haskellPackages.hledger_1_50_1: fix eval Introduced via merge from master. --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index a06b14fe46ad0..39ead0613bd72 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1638,8 +1638,8 @@ with haskellLib; # https://github.com/haskell-servant/servant-ekg/issues/15 servant-ekg = doJailbreak super.servant-ekg; - hledger_1_50 = super.hledger_1_50.override { - hledger-lib = self.hledger-lib_1_50; + hledger_1_50_1 = super.hledger_1_50_1.override { + hledger-lib = self.hledger-lib_1_50_1; }; # it wants to build a statically linked binary by default From 1a0f23baf8ed2018ecc6e1059107421a2b22c57c Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Tue, 14 Oct 2025 11:18:01 +0200 Subject: [PATCH 82/84] haskell-modules/HACKING: remove outdated reference to update hackage Hackage is only updated directly from master, but not when merging the PR anymore. --- pkgs/development/haskell-modules/HACKING.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/haskell-modules/HACKING.md b/pkgs/development/haskell-modules/HACKING.md index 0cadbefea0c9f..56f72e92abb1b 100644 --- a/pkgs/development/haskell-modules/HACKING.md +++ b/pkgs/development/haskell-modules/HACKING.md @@ -199,10 +199,6 @@ opening the next one. When you want to merge the currently open $ gh auth status ``` -1. Make sure you have setup your `~/.cabal/config` file for authentication - for uploading the NixOS package versions to Hackage. See the following - section for details on how to do this. - 1. Make sure you have correctly marked packages broken. One of the previous sections explains how to do this. @@ -237,8 +233,6 @@ opening the next one. When you want to merge the currently open 1. Merges the currently open `haskell-updates` PR. - 1. Updates the version of Haskell packages in NixOS on Hackage. - 1. Updates Stackage and Hackage snapshots. Regenerates the Haskell package set. 1. Pushes the commits updating Stackage and Hackage and opens a new From e915fbe083528c66db641389ef70ca4034c77955 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Wed, 15 Oct 2025 11:15:31 +0200 Subject: [PATCH 83/84] haskellPackages: mark builds failing on hydra as broken This commit has been generated by maintainers/scripts/haskell/mark-broken.sh based on *evaluation [1819351](https://hydra.nixos.org/eval/1819351) of nixpkgs commit [e1a3a9d](https://github.com/NixOS/nixpkgs/commits/e1a3a9d50a9412a716451506b981ed5c4544b035) as of 2025-10-15 09:00 UTC* from the haskell-updates jobset on hydra under https://hydra.nixos.org/jobset/nixpkgs/haskell-updates --- .../configuration-hackage2nix/broken.yaml | 45 ++++++++ .../transitive-broken.yaml | 14 +++ .../haskell-modules/hackage-packages.nix | 104 ++++++++++++++++++ 3 files changed, 163 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 2df19bca4a124..7345e8a79aa45 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -73,6 +73,7 @@ broken-packages: - adp-multi # failure in job https://hydra.nixos.org/build/233256331 at 2023-09-02 - adtrees # failure in job https://hydra.nixos.org/build/233192320 at 2023-09-02 - AERN-Basics # failure in job https://hydra.nixos.org/build/233246999 at 2023-09-02 + - aes-gcm # failure in job https://hydra.nixos.org/build/309811668 at 2025-10-15 - aeson-applicative # failure in job https://hydra.nixos.org/build/233213824 at 2023-09-02 - aeson-bson # failure in job https://hydra.nixos.org/build/233201964 at 2023-09-02 - aeson-commit # failure in job https://hydra.nixos.org/build/233198515 at 2023-09-02 @@ -144,6 +145,7 @@ broken-packages: - alloy # failure in job https://hydra.nixos.org/build/252726555 at 2024-03-16 - ally-invest # failure in job https://hydra.nixos.org/build/233236224 at 2023-09-02 - alpaca-netcode # failure in job https://hydra.nixos.org/build/233239392 at 2023-09-02 + - alpha # failure in job https://hydra.nixos.org/build/309811728 at 2025-10-15 - alphachar # failure in job https://hydra.nixos.org/build/252722667 at 2024-03-16 - alpino-tools # failure in job https://hydra.nixos.org/build/233236168 at 2023-09-02 - alsa # failure in job https://hydra.nixos.org/build/233250059 at 2023-09-02 @@ -155,6 +157,7 @@ broken-packages: - alure # failure in job https://hydra.nixos.org/build/233230238 at 2023-09-02 - amazon-emailer # failure in job https://hydra.nixos.org/build/233220018 at 2023-09-02 - amazon-products # failure in job https://hydra.nixos.org/build/233193877 at 2023-09-02 + - amazonka-appconfigdata # failure in job https://hydra.nixos.org/build/309811755 at 2025-10-15 - amazonka-contrib-rds-utils # failure building library in job https://hydra.nixos.org/build/237240275 at 2023-10-21 - amazonka-dynamodb # failure in job https://hydra.nixos.org/build/295091412 at 2025-04-22 - amazonka-dynamodb-streams # failure in job https://hydra.nixos.org/build/295091422 at 2025-04-22 @@ -474,6 +477,7 @@ broken-packages: - bindings-libv4l2 # failure in job https://hydra.nixos.org/build/233236316 at 2023-09-02 - bindings-monetdb-mapi # failure in job https://hydra.nixos.org/build/233219584 at 2023-09-02 - bindings-mpdecimal # failure in job https://hydra.nixos.org/build/233235379 at 2023-09-02 + - bindings-nettle # failure in job https://hydra.nixos.org/build/309812334 at 2025-10-15 - bindings-sc3 # failure in job https://hydra.nixos.org/build/233198459 at 2023-09-02 - bindings-sipc # failure in job https://hydra.nixos.org/build/233219411 at 2023-09-02 - bindings-wlc # failure in job https://hydra.nixos.org/build/233332720 at 2023-09-02 @@ -699,6 +703,7 @@ broken-packages: - cake3 # failure in job https://hydra.nixos.org/build/233231662 at 2023-09-02 - cal-layout # failure in job https://hydra.nixos.org/build/233191194 at 2023-09-02 - cal3d # failure in job https://hydra.nixos.org/build/233200357 at 2023-09-02 + - calamity # failure in job https://hydra.nixos.org/build/309812724 at 2025-10-15 - caledon # failure in job https://hydra.nixos.org/build/233209888 at 2023-09-02 - calenderweek # failure in job https://hydra.nixos.org/build/233209930 at 2023-09-02 - call-alloy # failure in job https://hydra.nixos.org/build/233249056 at 2023-09-02 @@ -821,6 +826,7 @@ broken-packages: - cipher-des # failure in job https://hydra.nixos.org/build/233232112 at 2023-09-02 - circle # failure in job https://hydra.nixos.org/build/252722965 at 2024-03-16 - circlehs # failure in job https://hydra.nixos.org/build/233246591 at 2023-09-02 + - circuit-notation # failure in job https://hydra.nixos.org/build/309812708 at 2025-10-15 - citeproc-hs # failure in job https://hydra.nixos.org/build/233254388 at 2023-09-02 - cj-token # failure in job https://hydra.nixos.org/build/233253928 at 2023-09-02 - cjk # failure in job https://hydra.nixos.org/build/233258734 at 2023-09-02 @@ -832,6 +838,7 @@ broken-packages: - clarifai # failure in job https://hydra.nixos.org/build/233229480 at 2023-09-02 - CLASE # failure in job https://hydra.nixos.org/build/233234459 at 2023-09-02 - clash-finite # failure in job https://hydra.nixos.org/build/295092297 at 2025-04-22 + - clash-lib # failure in job https://hydra.nixos.org/build/309812683 at 2025-10-15 - clash-lib-hedgehog # failure in job https://hydra.nixos.org/build/295122808 at 2025-04-22 - clash-multisignal # failure in job https://hydra.nixos.org/build/273463331 at 2024-10-01 - clash-prelude-quickcheck # failure in job https://hydra.nixos.org/build/273453747 at 2024-10-01 @@ -866,6 +873,7 @@ broken-packages: - cloben # failure in job https://hydra.nixos.org/build/233194390 at 2023-09-02 - clock-extras # failure in job https://hydra.nixos.org/build/233190748 at 2023-09-02 - clocked # failure in job https://hydra.nixos.org/build/233241524 at 2023-09-02 + - clod # failure in job https://hydra.nixos.org/build/309812703 at 2025-10-15 - clogparse # failure in job https://hydra.nixos.org/build/233220294 at 2023-09-02 - clone-all # failure in job https://hydra.nixos.org/build/233234063 at 2023-09-02 - closed-classes # failure in job https://hydra.nixos.org/build/233250965 at 2023-09-02 @@ -1051,6 +1059,7 @@ broken-packages: - contstuff-monads-tf # failure in job https://hydra.nixos.org/build/233224064 at 2023-09-02 - contstuff-transformers # failure in job https://hydra.nixos.org/build/233244153 at 2023-09-02 - conversion-bytestring # failure in job https://hydra.nixos.org/build/295092506 at 2025-04-22 + - convert-annotation # failure in job https://hydra.nixos.org/build/310117221 at 2025-10-15 - convex-schema-parser # failure in job https://hydra.nixos.org/build/302801971 at 2025-07-27 - convexHullNd # failure in job https://hydra.nixos.org/build/307517560 at 2025-09-19 - cookie-tray # failure in job https://hydra.nixos.org/build/295092527 at 2025-04-22 @@ -1172,6 +1181,7 @@ broken-packages: - daemonize-doublefork # failure in job https://hydra.nixos.org/build/252714429 at 2024-03-16 - dag # failure in job https://hydra.nixos.org/build/233220719 at 2023-09-02 - DAG-Tournament # failure in job https://hydra.nixos.org/build/233218747 at 2023-09-02 + - dahdit # failure in job https://hydra.nixos.org/build/309813014 at 2025-10-15 - damnpacket # failure in job https://hydra.nixos.org/build/233235248 at 2023-09-02 - danibot # failure in job https://hydra.nixos.org/build/233197740 at 2023-09-02 - Dao # failure in job https://hydra.nixos.org/build/233207745 at 2023-09-02 @@ -1214,6 +1224,7 @@ broken-packages: - data-fin # failure in job https://hydra.nixos.org/build/233216426 at 2023-09-02 - data-fin-simple # failure in job https://hydra.nixos.org/build/233191648 at 2023-09-02 - data-flagset # failure in job https://hydra.nixos.org/build/233211231 at 2023-09-02 + - data-foldapp # failure in job https://hydra.nixos.org/build/309813054 at 2025-10-15 - data-forced # failure in job https://hydra.nixos.org/build/307517739 at 2025-09-19 - data-forest # failure in job https://hydra.nixos.org/build/307517728 at 2025-09-19 - data-index # failure in job https://hydra.nixos.org/build/233197067 at 2023-09-02 @@ -1221,6 +1232,7 @@ broken-packages: - data-kiln # failure in job https://hydra.nixos.org/build/233220764 at 2023-09-02 - data-lens-fd # failure in job https://hydra.nixos.org/build/233252537 at 2023-09-02 - data-lens-template # failure in job https://hydra.nixos.org/build/233194446 at 2023-09-02 + - data-list-zigzag # failure in job https://hydra.nixos.org/build/309813043 at 2025-10-15 - data-map-multikey # failure in job https://hydra.nixos.org/build/233223141 at 2023-09-02 - data-named # failure in job https://hydra.nixos.org/build/233196088 at 2023-09-02 - data-nat # failure in job https://hydra.nixos.org/build/233226801 at 2023-09-02 @@ -1324,6 +1336,7 @@ broken-packages: - derive-monoid # failure in job https://hydra.nixos.org/build/233205670 at 2023-09-02 - derive-prim # failure in job https://hydra.nixos.org/build/307517819 at 2025-09-19 - derive-storable-plugin # failure in job https://hydra.nixos.org/build/295092800 at 2025-04-22 + - derive-topdown # failure in job https://hydra.nixos.org/build/309813202 at 2025-10-15 - derive-trie # failure in job https://hydra.nixos.org/build/233207961 at 2023-09-02 - deriveJsonNoPrefix # failure in job https://hydra.nixos.org/build/233242453 at 2023-09-02 - deriving-openapi3 # failure in job https://hydra.nixos.org/build/252718489 at 2024-03-16 @@ -1622,6 +1635,7 @@ broken-packages: - encryptable # failure in job https://hydra.nixos.org/build/233215911 at 2023-09-02 - endo # failure in job https://hydra.nixos.org/build/233222561 at 2023-09-02 - engine-io # failure in job https://hydra.nixos.org/build/233234034 at 2023-09-02 + - engineering-units # failure in job https://hydra.nixos.org/build/309813391 at 2025-10-15 - entwine # failure in job https://hydra.nixos.org/build/233239261 at 2023-09-02 - enum-text # failure in job https://hydra.nixos.org/build/233194373 at 2023-09-02 - enum-utf8 # failure in job https://hydra.nixos.org/build/233234628 at 2023-09-02 @@ -1773,6 +1787,7 @@ broken-packages: - faster-megaparsec # failure in job https://hydra.nixos.org/build/252713238 at 2024-03-16 - fastly # failure in job https://hydra.nixos.org/build/233213136 at 2023-09-02 - fastmemo # failure in job https://hydra.nixos.org/build/252739389 at 2024-03-16 + - fastparser # failure in job https://hydra.nixos.org/build/309813509 at 2025-10-15 - fastpbkdf2 # failure in job https://hydra.nixos.org/build/233218574 at 2023-09-02 - FastPush # failure in job https://hydra.nixos.org/build/233224507 at 2023-09-02 - fastsum # failure in job https://hydra.nixos.org/build/252716407 at 2024-03-16 @@ -2029,6 +2044,7 @@ broken-packages: - fwgl # failure in job https://hydra.nixos.org/build/233246210 at 2023-09-02 - fwgl-javascript # broken by fwgl, manually entered here, because it does not appear in transitive-broken.yaml at 2024-07-09 - fx # failure in job https://hydra.nixos.org/build/295093438 at 2025-04-22 + - fxpak # failure in job https://hydra.nixos.org/build/309813706 at 2025-10-15 - g-npm # failure in job https://hydra.nixos.org/build/233215965 at 2023-09-02 - g4ip # failure in job https://hydra.nixos.org/build/233248315 at 2023-09-02 - gambler # failure in job https://hydra.nixos.org/build/252732701 at 2024-03-16 @@ -2228,6 +2244,7 @@ broken-packages: - glualint # failure in job https://hydra.nixos.org/build/295093757 at 2025-04-22 - glue # failure in job https://hydra.nixos.org/build/233233587 at 2023-09-02 - glue-ekg # failure in job https://hydra.nixos.org/build/307518731 at 2025-09-19 + - gmap # failure in job https://hydra.nixos.org/build/309814029 at 2025-10-15 - gnutls # failure in job https://hydra.nixos.org/build/252734570 at 2024-03-16 - goa # failure in job https://hydra.nixos.org/build/233193916 at 2023-09-02 - goal-core # failure in job https://hydra.nixos.org/build/233242261 at 2023-09-02 @@ -2611,10 +2628,13 @@ broken-packages: - haven # failure in job https://hydra.nixos.org/build/233216806 at 2023-09-02 - haverer # failure in job https://hydra.nixos.org/build/233210491 at 2023-09-02 - hax # failure in job https://hydra.nixos.org/build/233212147 at 2023-09-02 + - haxl-amazonka # failure in job https://hydra.nixos.org/build/310117233 at 2025-10-15 + - haxl-facebook # failure in job https://hydra.nixos.org/build/310117231 at 2025-10-15 - haxparse # failure in job https://hydra.nixos.org/build/233205900 at 2023-09-02 - haxr-th # failure in job https://hydra.nixos.org/build/233250109 at 2023-09-02 - hayland # failure in job https://hydra.nixos.org/build/233201482 at 2023-09-02 - hayoo-cli # failure in job https://hydra.nixos.org/build/233245478 at 2023-09-02 + - hbcd # failure in job https://hydra.nixos.org/build/309814355 at 2025-10-15 - hBDD # failure in job https://hydra.nixos.org/build/307518994 at 2025-09-19 - hBDD-CMUBDD # failure in job https://hydra.nixos.org/build/233210132 at 2023-09-02 - hBDD-CUDD # failure in job https://hydra.nixos.org/build/233243982 at 2023-09-02 @@ -2728,6 +2748,7 @@ broken-packages: - hgearman # failure in job https://hydra.nixos.org/build/233231063 at 2023-09-02 - hGelf # failure in job https://hydra.nixos.org/build/233203909 at 2023-09-02 - hgeometric # failure in job https://hydra.nixos.org/build/233197856 at 2023-09-02 + - hgettext # failure in job https://hydra.nixos.org/build/309814473 at 2025-10-15 - hgis # failure in job https://hydra.nixos.org/build/233200418 at 2023-09-02 - hgmp # failure in job https://hydra.nixos.org/build/307519217 at 2025-09-19 - hgom # failure in job https://hydra.nixos.org/build/233255569 at 2023-09-02 @@ -2772,6 +2793,7 @@ broken-packages: - hinotify-conduit # failure in job https://hydra.nixos.org/build/252710760 at 2024-03-16 - hinquire # failure in job https://hydra.nixos.org/build/233235549 at 2023-09-02 - hinstaller # failure in job https://hydra.nixos.org/build/233244650 at 2023-09-02 + - hint-nix # failure in job https://hydra.nixos.org/build/309814463 at 2025-10-15 - hint-server # failure in job https://hydra.nixos.org/build/233240346 at 2023-09-02 - hinter # failure in job https://hydra.nixos.org/build/233245954 at 2023-09-02 - hinterface # failure in job https://hydra.nixos.org/build/233250383 at 2023-09-02 @@ -3217,6 +3239,7 @@ broken-packages: - ib-api # failure in job https://hydra.nixos.org/build/233223054 at 2023-09-02 - iban # failure in job https://hydra.nixos.org/build/233236424 at 2023-09-02 - ical # failure in job https://hydra.nixos.org/build/233200229 at 2023-09-02 + - ice40-prim # failure in job https://hydra.nixos.org/build/309814812 at 2025-10-15 - icepeak # failure in job https://hydra.nixos.org/build/233242326 at 2023-09-02 - icfpc2020-galaxy # failure in job https://hydra.nixos.org/build/233208746 at 2023-09-02 - IcoGrid # failure in job https://hydra.nixos.org/build/233202038 at 2023-09-02 @@ -3428,6 +3451,7 @@ broken-packages: - json-pointy # failure in job https://hydra.nixos.org/build/233255533 at 2023-09-02 - json-python # failure in job https://hydra.nixos.org/build/233200964 at 2023-09-02 - json-qq # failure in job https://hydra.nixos.org/build/233196259 at 2023-09-02 + - json-rpc # failure in job https://hydra.nixos.org/build/309815009 at 2025-10-15 - json-rpc-generic # failure in job https://hydra.nixos.org/build/233201371 at 2023-09-02 - json-rpc-server # failure in job https://hydra.nixos.org/build/233201284 at 2023-09-02 - json-schema # failure in job https://hydra.nixos.org/build/303231342 at 2025-07-27 @@ -3564,6 +3588,7 @@ broken-packages: - Lambdaya # failure in job https://hydra.nixos.org/build/233227702 at 2023-09-02 - lame # failure in job https://hydra.nixos.org/build/233250932 at 2023-09-02 - laminar # failure in job https://hydra.nixos.org/build/241426331 at 2023-11-19 + - langchain-hs # failure in job https://hydra.nixos.org/build/309815178 at 2025-10-15 - language-asn # failure in job https://hydra.nixos.org/build/233227929 at 2023-09-02 - language-c-comments # failure in job https://hydra.nixos.org/build/233234112 at 2023-09-02 - language-c-inline # failure in job https://hydra.nixos.org/build/233245990 at 2023-09-02 @@ -3786,6 +3811,7 @@ broken-packages: - local-address # failure in job https://hydra.nixos.org/build/233247765 at 2023-09-02 - located # failure in job https://hydra.nixos.org/build/233234945 at 2023-09-02 - located-monad-logger # failure in job https://hydra.nixos.org/build/233194551 at 2023-09-02 + - locators # failure in job https://hydra.nixos.org/build/309815296 at 2025-10-15 - loch # failure in job https://hydra.nixos.org/build/233248876 at 2023-09-02 - log-effect # failure in job https://hydra.nixos.org/build/233211329 at 2023-09-02 - log-warper # failure in job https://hydra.nixos.org/build/233220417 at 2023-09-02 @@ -3829,6 +3855,7 @@ broken-packages: - lsfrom # failure in job https://hydra.nixos.org/build/233211705 at 2023-09-02 - lsh # failure in job https://hydra.nixos.org/build/233256686 at 2023-09-02 - lsql-csv # failure in job https://hydra.nixos.org/build/307520164 at 2025-09-19 + - ltext # failure in job https://hydra.nixos.org/build/309815332 at 2025-10-15 - lti13 # failure in job https://hydra.nixos.org/build/252715722 at 2024-03-16 - ltiv1p1 # failure in job https://hydra.nixos.org/build/233200883 at 2023-09-02 - ltk # failure in job https://hydra.nixos.org/build/233244152 at 2023-09-02 @@ -4045,6 +4072,7 @@ broken-packages: - moffy-samples-gtk4-run # failure in job https://hydra.nixos.org/build/295095458 at 2025-04-22 - mohws # failure in job https://hydra.nixos.org/build/233246088 at 2023-09-02 - mollie-api-haskell # failure in job https://hydra.nixos.org/build/233200867 at 2023-09-02 + - monad-abort-fd # failure in job https://hydra.nixos.org/build/309815545 at 2025-10-15 - monad-atom # failure in job https://hydra.nixos.org/build/233243367 at 2023-09-02 - monad-atom-simple # failure in job https://hydra.nixos.org/build/233259038 at 2023-09-02 - monad-branch # failure in job https://hydra.nixos.org/build/233251253 at 2023-09-02 @@ -4185,6 +4213,7 @@ broken-packages: - multiwalk # failure in job https://hydra.nixos.org/build/295095540 at 2025-04-22 - Munkres # failure in job https://hydra.nixos.org/build/233237379 at 2023-09-02 - muon # failure in job https://hydra.nixos.org/build/233238364 at 2023-09-02 + - murder # failure in job https://hydra.nixos.org/build/309815678 at 2025-10-15 - murmur # failure in job https://hydra.nixos.org/build/233244309 at 2023-09-02 - music-util # failure in job https://hydra.nixos.org/build/233234440 at 2023-09-02 - musicScroll # failure in job https://hydra.nixos.org/build/233197933 at 2023-09-02 @@ -4239,6 +4268,7 @@ broken-packages: - NaturalLanguageAlphabets # failure in job https://hydra.nixos.org/build/245539294 at 2024-01-02 - NaturalSort # failure in job https://hydra.nixos.org/build/233213239 at 2023-09-02 - naver-translate # failure in job https://hydra.nixos.org/build/233225934 at 2023-09-02 + - nbparts # failure in job https://hydra.nixos.org/build/309815729 at 2025-10-15 - nbt # failure in job https://hydra.nixos.org/build/233253509 at 2023-09-02 - ncurses # failure in job https://hydra.nixos.org/build/233238895 at 2023-09-02 - ndjson-conduit # failure in job https://hydra.nixos.org/build/295095605 at 2025-04-22 @@ -4400,6 +4430,7 @@ broken-packages: - oi # failure in job https://hydra.nixos.org/build/233190838 at 2023-09-02 - okapi # failure in job https://hydra.nixos.org/build/233193822 at 2023-09-02 - old-version # failure in job https://hydra.nixos.org/build/233198538 at 2023-09-02 + - ollama-holes-plugin # failure in job https://hydra.nixos.org/build/309815905 at 2025-10-15 - om-actor # failure in job https://hydra.nixos.org/build/233231027 at 2023-09-02 - om-http # failure in job https://hydra.nixos.org/build/233245328 at 2023-09-02 - om-http-logging # failure in job https://hydra.nixos.org/build/233218069 at 2023-09-02 @@ -5252,6 +5283,7 @@ broken-packages: - reflex-sdl2 # failure in job https://hydra.nixos.org/build/307521569 at 2025-09-19 - reflex-transformers # failure in job https://hydra.nixos.org/build/233243647 at 2023-09-02 - reflex-vty # failure in job https://hydra.nixos.org/build/295096544 at 2025-04-22 + - reform-blaze # failure in job https://hydra.nixos.org/build/309816655 at 2025-10-15 - reform-hamlet # failure in job https://hydra.nixos.org/build/233230013 at 2023-09-02 - reform-hsp # failure in job https://hydra.nixos.org/build/233228737 at 2023-09-02 - reform-lucid # failure in job https://hydra.nixos.org/build/233257636 at 2023-09-02 @@ -5374,6 +5406,8 @@ broken-packages: - RLP # failure in job https://hydra.nixos.org/build/233222770 at 2023-09-02 - rme-what4 # failure in job https://hydra.nixos.org/build/307611281 at 2025-09-19 - robin # failure in job https://hydra.nixos.org/build/233205010 at 2023-09-02 + - robin-hood-profit # failure in job https://hydra.nixos.org/build/309816727 at 2025-10-15 + - roboservant # failure in job https://hydra.nixos.org/build/309816799 at 2025-10-15 - robots-txt # failure in job https://hydra.nixos.org/build/233243090 at 2023-09-02 - roc-cluster # failure in job https://hydra.nixos.org/build/233202517 at 2023-09-02 - roguestar # failure in job https://hydra.nixos.org/build/233233677 at 2023-09-02 @@ -5451,6 +5485,7 @@ broken-packages: - sandwatch # failure in job https://hydra.nixos.org/build/295096742 at 2025-04-22 - sandwich-contexts # failure in job https://hydra.nixos.org/build/282178661 at 2024-12-23 - sarasvati # failure in job https://hydra.nixos.org/build/233208235 at 2023-09-02 + - sasha # failure in job https://hydra.nixos.org/build/309816856 at 2025-10-15 - sat # failure in job https://hydra.nixos.org/build/233225713 at 2023-09-02 - sat-simple # failure in job https://hydra.nixos.org/build/307521671 at 2025-09-19 - satchmo-backends # failure in job https://hydra.nixos.org/build/233228506 at 2023-09-02 @@ -5829,6 +5864,7 @@ broken-packages: - snaplet-ses-html # failure in job https://hydra.nixos.org/build/252718019 at 2024-03-16 - snaplet-sqlite-simple # failure in job https://hydra.nixos.org/build/252738602 at 2024-03-16 - snaplet-typed-sessions # failure in job https://hydra.nixos.org/build/252724459 at 2024-03-16 + - snappy # failure in job https://hydra.nixos.org/build/309817105 at 2025-10-15 - snappy-conduit # failure in job https://hydra.nixos.org/build/233196865 at 2023-09-02 - snelstart-import # failure in job https://hydra.nixos.org/build/295097114 at 2025-04-22 - SNet # failure in job https://hydra.nixos.org/build/233225638 at 2023-09-02 @@ -5905,6 +5941,7 @@ broken-packages: - sqlcipher # failure in job https://hydra.nixos.org/build/233259217 at 2023-09-02 - sqlcli # failure in job https://hydra.nixos.org/build/252719841 at 2024-03-16 - sqlite # failure in job https://hydra.nixos.org/build/233215839 at 2023-09-02 + - sqlite-easy # failure in job https://hydra.nixos.org/build/309817187 at 2025-10-15 - sqlite-simple-errors # failure in job https://hydra.nixos.org/build/233232977 at 2023-09-02 - sqlvalue-list # failure in job https://hydra.nixos.org/build/233197313 at 2023-09-02 - sqsd-local # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237237046 at 2023-10-21 @@ -6017,6 +6054,7 @@ broken-packages: - streamly-binary # failure in job https://hydra.nixos.org/build/233240602 at 2023-09-02 - streamly-cassava # failure in job https://hydra.nixos.org/build/233237843 at 2023-09-02 - streamly-examples # failure in job https://hydra.nixos.org/build/252721153 at 2024-03-16 + - streamly-filepath # failure in job https://hydra.nixos.org/build/309817285 at 2025-10-15 - streamly-fsevents # failure in job https://hydra.nixos.org/build/307611411 at 2025-09-19 - streamly-lmdb # failure in job https://hydra.nixos.org/build/252731414 at 2024-03-16 - streamly-lz4 # failure in job https://hydra.nixos.org/build/233219321 at 2023-09-02 @@ -6132,6 +6170,7 @@ broken-packages: - syntactic # failure in job https://hydra.nixos.org/build/233210123 at 2023-09-02 - syntax-trees # failure in job https://hydra.nixos.org/build/233209576 at 2023-09-02 - syntax-trees-fork-bairyn # failure in job https://hydra.nixos.org/build/233216989 at 2023-09-02 + - SyntaxMacros # failure in job https://hydra.nixos.org/build/309811610 at 2025-10-15 - synthesizer # failure in job https://hydra.nixos.org/build/233259139 at 2023-09-02 - synthesizer-filter # failure in job https://hydra.nixos.org/build/252718079 at 2024-03-16 - synthesizer-llvm # failure in job https://hydra.nixos.org/build/266355681 at 2024-07-14 @@ -6213,6 +6252,7 @@ broken-packages: - telega # failure in job https://hydra.nixos.org/build/233239016 at 2023-09-02 - telegram # failure in job https://hydra.nixos.org/build/233203974 at 2023-09-02 - telegram-api # failure in job https://hydra.nixos.org/build/233255927 at 2023-09-02 + - telegram-bot-simple # failure in job https://hydra.nixos.org/build/309817498 at 2025-10-15 - telegram-types # failure in job https://hydra.nixos.org/build/233598183 at 2023-09-02 - telegraph # failure in job https://hydra.nixos.org/build/233213772 at 2023-09-02 - teleport # failure in job https://hydra.nixos.org/build/233194305 at 2023-09-02 @@ -6366,6 +6406,7 @@ broken-packages: - timecalc # failure in job https://hydra.nixos.org/build/233207970 at 2023-09-02 - timemap # failure in job https://hydra.nixos.org/build/233250038 at 2023-09-02 - timeout # failure in job https://hydra.nixos.org/build/233193307 at 2023-09-02 + - timeout-snooze # failure in job https://hydra.nixos.org/build/309817674 at 2025-10-15 - timeout-with-results # failure in job https://hydra.nixos.org/build/233212129 at 2023-09-02 - timeparsers # failure in job https://hydra.nixos.org/build/233250789 at 2023-09-02 - TimePiece # failure in job https://hydra.nixos.org/build/233213400 at 2023-09-02 @@ -6548,6 +6589,7 @@ broken-packages: - typed-admin # failure in job https://hydra.nixos.org/build/296063081 at 2025-05-02 - typed-digits # failure in job https://hydra.nixos.org/build/233198266 at 2023-09-02 - typed-encoding # failure in job https://hydra.nixos.org/build/233208093 at 2023-09-02 + - typed-gui # failure in job https://hydra.nixos.org/build/309817848 at 2025-10-15 - typed-process-effectful # failure in job https://hydra.nixos.org/build/236684332 at 2023-10-04 - typed-protocols # failure in job https://hydra.nixos.org/build/307522744 at 2025-09-19 - typed-session # failure in job https://hydra.nixos.org/build/270089993 at 2024-08-31 @@ -6825,6 +6867,7 @@ broken-packages: - warc # failure in job https://hydra.nixos.org/build/233215734 at 2023-09-02 - warp-dynamic # failure in job https://hydra.nixos.org/build/233220479 at 2023-09-02 - warp-static # failure in job https://hydra.nixos.org/build/233239581 at 2023-09-02 + - warp-tls-simple # failure in job https://hydra.nixos.org/build/309818122 at 2025-10-15 - warp-tls-uid # failure in job https://hydra.nixos.org/build/252725883 at 2024-03-16 - wasm # failure in job https://hydra.nixos.org/build/233249877 at 2023-09-02 - watcher # failure in job https://hydra.nixos.org/build/233245056 at 2023-09-02 @@ -6886,6 +6929,7 @@ broken-packages: - wild-bind-indicator # failure in job https://hydra.nixos.org/build/307611565 at 2025-09-19 - willow # failure in job https://hydra.nixos.org/build/233215807 at 2023-09-02 - windns # failure in job https://hydra.nixos.org/build/233242724 at 2023-09-02 + - winio # failure in job https://hydra.nixos.org/build/309818237 at 2025-10-15 - wire-streams # failure in job https://hydra.nixos.org/build/299186735 at 2025-06-23 - wireguard-hs # failure in job https://hydra.nixos.org/build/233218722 at 2023-09-02 - wires # failure in job https://hydra.nixos.org/build/233192321 at 2023-09-02 @@ -7010,6 +7054,7 @@ broken-packages: - xxhash # failure in job https://hydra.nixos.org/build/233240335 at 2023-09-02 - xz # failure in job https://hydra.nixos.org/build/307523211 at 2025-09-19 - y0l0bot # failure in job https://hydra.nixos.org/build/233212722 at 2023-09-02 + - yabi # failure in job https://hydra.nixos.org/build/309818284 at 2025-10-15 - yabi-muno # failure in job https://hydra.nixos.org/build/233246871 at 2023-09-02 - yackage # failure in job https://hydra.nixos.org/build/233213393 at 2023-09-02 - YACPong # failure in job https://hydra.nixos.org/build/233203317 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 8489883a9a4d8..e2b564c05b026 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -294,6 +294,7 @@ dont-distribute-packages: - bits-extra - bittorrent - bla + - blacktip - blakesum-demo - Blammo - Blammo-wai @@ -458,6 +459,8 @@ dont-distribute-packages: - claferIG - claferwiki - clash + - clash-ghc + - clash-shake - classify-frog - classy-effects - classy-effects-th @@ -648,6 +651,7 @@ dont-distribute-packages: - cypher - dahdit-audio - dahdit-midi + - dahdit-network - dahdit-test - daino - Dangerous @@ -906,6 +910,7 @@ dont-distribute-packages: - exference - exist - exist-instances + - expand - expat-enumerator - expiring-containers - explicit-iomodes-bytestring @@ -1930,6 +1935,7 @@ dont-distribute-packages: - karakuri - katip-rollbar - keelung + - keera-hails-i18n - keera-hails-mvc-environment-gtk - keera-hails-mvc-model-lightmodel - keera-hails-mvc-model-protectedmodel @@ -2062,6 +2068,7 @@ dont-distribute-packages: - librato - libxml-enumerator - lifted-base-tf + - lifted-stm - lightning-haskell - lightstep-haskell - lighttpd-conf @@ -2077,6 +2084,7 @@ dont-distribute-packages: - linnet-conduit - linux-ptrace - lio-eci11 + - lion - liquid-base - liquid-bytestring - liquid-containers @@ -2273,6 +2281,7 @@ dont-distribute-packages: - mole - monad-connect - monad-exception + - monad-finally - monad-http - monad-state - monad-stlike-stm @@ -2478,6 +2487,7 @@ dont-distribute-packages: - oath - oauth2-jwt-bearer - obdd + - oberon0 - obj - objectid - objective @@ -3259,7 +3269,9 @@ dont-distribute-packages: - snaplet-stripe - snaplet-tasks - snaplet-wordpress + - snappy-framing - snappy-iteratee + - snappy-lazy - sndfile-enumerators - sneakyterm - sneathlane-haste @@ -3459,6 +3471,8 @@ dont-distribute-packages: - telegram-raw-api - ten-lens - ten-unordered-containers + - tensorflow-records + - tensorflow-records-conduit - terminal-text - terrahs - test-sandbox-compose diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index d4e8ecbe1b2d1..02b43e2c56b05 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -43233,6 +43233,8 @@ self: { ]; description = "Syntax Macros in the form of an EDSL"; license = "LGPL"; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -53616,6 +53618,8 @@ self: { ]; description = "AES Galois/Counter Mode (GCM) AEAD Cipher"; license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { libcrypto = null; }; @@ -59953,7 +59957,9 @@ self: { ]; description = "A compiler for the Alpha language"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "alpha"; + broken = true; } ) { }; @@ -61268,6 +61274,8 @@ self: { ]; description = "Amazon AppConfig Data SDK"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -105226,6 +105234,8 @@ self: { ]; description = "bindings to nettle crypto library"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { inherit (pkgs) nettle; }; @@ -109300,6 +109310,7 @@ self: { ]; description = "Decentralized, k-ordered unique ID generator"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -127779,6 +127790,8 @@ self: { ]; description = "A library for writing discord bots in haskell"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -139849,6 +139862,8 @@ self: { ]; description = "A source plugin for manipulating circuits in clash with a arrow notation"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -141222,6 +141237,7 @@ self: { executableHaskellDepends = [ base ]; description = "Clash: a functional hardware description language - GHC frontend"; license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -141389,7 +141405,9 @@ self: { ]; description = "Clash: a functional hardware description language - As a library"; license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; mainProgram = "v16-upgrade-primitives"; + broken = true; } ) { }; @@ -141686,6 +141704,7 @@ self: { ]; description = "Shake rules for building Clash programs"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -144699,6 +144718,8 @@ self: { ]; description = "Project file manager for Claude AI integrations"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -161509,7 +161530,9 @@ self: { ]; description = "Convert the annotation of a gene to another in a delimited file using a variety of different databases"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; mainProgram = "convert-annotation"; + broken = true; } ) { }; @@ -174412,6 +174435,8 @@ self: { ]; description = "Binary parsing and serialization with integrated size"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -174609,6 +174634,7 @@ self: { ]; description = "Network protocol helpers for Dahdit"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -177944,6 +177970,8 @@ self: { ]; description = "Fold function applications. Framework for variadic functions."; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -178465,6 +178493,8 @@ self: { libraryHaskellDepends = [ base ]; description = "A list but with a balanced enumeration of Cartesian product"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -187044,6 +187074,8 @@ self: { ]; description = "Derive type class instances"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -214533,6 +214565,8 @@ self: { libraryHaskellDepends = [ base ]; description = "A numeric type for managing and automating engineering units"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -223309,6 +223343,7 @@ self: { ]; description = "Extensible Pandoc"; license = "LGPL"; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -227388,6 +227423,8 @@ self: { ]; description = "A fast, but bare bones, bytestring parser combinators library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -248810,6 +248847,8 @@ self: { ]; description = "Interface to the FXPak/FXPak Pro USB interface"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -273580,6 +273619,8 @@ self: { ]; description = "Composable maps and generic tries"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -313350,6 +313391,8 @@ self: { ]; description = "Haxl data source for accessing AWS services through amazonka"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -313413,6 +313456,8 @@ self: { ]; description = "An example Haxl data source for accessing the Facebook Graph API"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -313883,6 +313928,8 @@ self: { ]; description = "Packed binary-coded decimal (BCD) serialization"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -324541,7 +324588,9 @@ self: { ]; description = "Bindings to libintl.h (gettext, bindtextdomain)"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "hgettext"; + broken = true; } ) { }; @@ -327840,6 +327889,8 @@ self: { ]; description = "Helper for using hint with Nix package databases"; license = lib.licenses.agpl3Plus; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -371088,6 +371139,8 @@ self: { ]; description = "Lattice iCE40 Primitive IP"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -392266,6 +392319,8 @@ self: { ]; description = "Fully-featured JSON-RPC 2.0 library"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -397974,6 +398029,7 @@ self: { ]; description = "Rapid Gtk Application Development - I18N"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -405888,6 +405944,8 @@ self: { ]; description = "Haskell implementation of Langchain"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -418816,6 +418874,7 @@ self: { ]; description = "STM operations lifted through monad transformer stacks"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -421866,6 +421925,7 @@ self: { ]; description = "RISC-V Core"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -426398,6 +426458,8 @@ self: { ]; description = "Human exchangable identifiers and locators"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -430807,7 +430869,9 @@ self: { ]; description = "Parameterized file evaluator"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "ltext"; + broken = true; } ) { }; @@ -453194,6 +453258,8 @@ self: { ]; description = "A better error monad transformer"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -453989,6 +454055,7 @@ self: { ]; description = "Guard monadic computations with cleanup actions"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -465821,6 +465888,8 @@ self: { ]; description = "MUtually Recursive Definitions Explicitly Represented"; license = "LGPL"; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -471202,7 +471271,9 @@ self: { testToolDepends = [ hspec-discover ]; description = "Unpack a Jupyter notebook into its sources, metadata and outputs"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; mainProgram = "nbparts"; + broken = true; } ) { }; @@ -485840,6 +485911,7 @@ self: { doHaddock = false; description = "Oberon0 Compiler"; license = "LGPL"; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -488473,6 +488545,8 @@ self: { ]; description = "A typed-hole plugin that uses LLMs to generate valid hole-fits"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -565376,6 +565450,8 @@ self: { ]; description = "Add support for using blaze-html with Reform"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -577507,7 +577583,9 @@ self: { testToolDepends = [ tasty-discover ]; description = "Calculate per instrument profit from Robin-Hood activity report"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "rhprofit"; + broken = true; } ) { }; @@ -577603,6 +577681,8 @@ self: { testToolDepends = [ markdown-unlit ]; description = "Automatic session-aware servant testing"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -585856,6 +585936,8 @@ self: { testToolDepends = [ alex ]; description = "A staged lexer generator"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -622555,6 +622637,8 @@ self: { ]; description = "Fast Haskell bindings to Google’s Snappy compression library"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { inherit (pkgs) snappy; }; @@ -622670,6 +622754,7 @@ self: { ]; description = "Snappy Framing Format in Haskell"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -622748,6 +622833,7 @@ self: { ]; description = "Lazy bytestring compression and decompression"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -629951,6 +630037,8 @@ self: { ]; description = "A primitive yet easy to use sqlite library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -640540,6 +640628,8 @@ self: { ]; description = "Streamly compatibility with filepath package"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -662176,6 +662266,8 @@ self: { ]; description = "Easy to use library for building Telegram bots"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -664192,6 +664284,7 @@ self: { ]; description = "Encoder and decoder for the TensorFlow \"TFRecords\" format"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -664223,6 +664316,7 @@ self: { ]; description = "Conduit wrappers for TensorFlow.Records."; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -675721,6 +675815,8 @@ self: { ]; description = "Efficient timeout with reset"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -691479,6 +691575,8 @@ self: { testHaskellDepends = [ base ]; description = "GUI framework based on typed-fsm"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -716870,6 +716968,8 @@ self: { ]; description = "Simple TLS configuration for Warp"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -724339,6 +724439,8 @@ self: { ]; description = "I/O library for Windows"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { @@ -734961,7 +735063,9 @@ self: { ]; description = "Yet Another Brainfuck Interpreter"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "yabi"; + broken = true; } ) { }; From 4b3b8a14565b2cf0555554551ac6c54bf1ac9ddb Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Wed, 15 Oct 2025 12:43:37 +0200 Subject: [PATCH 84/84] haskell.packages.{ghc94,ghc96,ghc98}.haskell-language-server: disallow inconsistent dependencies The diff is bigger than it needs to be, because I felt the urge to sort things as well. Key changes: - For GHC 9.8, fix `super` -> `lself` for `extensions`. - Add the `hls_overlay` to `apply-refact` as well. - Remove `allowInconsistentDependencies`. --- .../configuration-ghc-9.4.x.nix | 22 ++++++++------- .../configuration-ghc-9.6.x.nix | 26 +++++++++-------- .../configuration-ghc-9.8.x.nix | 28 ++++++++++--------- 3 files changed, 41 insertions(+), 35 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index a22017cbca7ff..347cf2dee5734 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -134,7 +134,6 @@ self: super: { relude = dontCheck super.relude; haddock-library = doJailbreak super.haddock-library; - apply-refact = addBuildDepend self.data-default-class super.apply-refact; path = self.path_0_9_5; inherit ( @@ -146,23 +145,26 @@ self: super: { }; in lib.mapAttrs (_: pkg: doDistribute (pkg.overrideScope hls_overlay)) { - haskell-language-server = allowInconsistentDependencies ( - addBuildDepends [ self.retrie self.floskell ] super.haskell-language-server - ); + apply-refact = addBuildDepend self.data-default-class super.apply-refact; + floskell = doJailbreak super.floskell; fourmolu = doJailbreak (dontCheck self.fourmolu_0_14_0_0); # ansi-terminal, Diff - ormolu = doJailbreak self.ormolu_0_7_2_0; # ansi-terminal + haskell-language-server = addBuildDepends [ + self.retrie + self.floskell + ] super.haskell-language-server; hlint = self.hlint_3_6_1; - stylish-haskell = self.stylish-haskell_0_14_5_0; + ormolu = doJailbreak self.ormolu_0_7_2_0; # ansi-terminal retrie = doJailbreak (unmarkBroken super.retrie); - floskell = doJailbreak super.floskell; + stylish-haskell = self.stylish-haskell_0_14_5_0; } ) - retrie + apply-refact floskell - haskell-language-server fourmolu - ormolu + haskell-language-server hlint + ormolu + retrie stylish-haskell ; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index 7c948c42ba364..4e479de6d0872 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -203,7 +203,6 @@ in 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; - apply-refact = addBuildDepend self.data-default-class super.apply-refact; inherit ( let @@ -214,23 +213,26 @@ in }; in lib.mapAttrs (_: pkg: doDistribute (pkg.overrideScope hls_overlay)) { - haskell-language-server = allowInconsistentDependencies ( - addBuildDepends [ self.retrie self.floskell ] super.haskell-language-server - ); - ormolu = doDistribute self.ormolu_0_7_4_0; - fourmolu = doDistribute (dontCheck (doJailbreak self.fourmolu_0_15_0_0)); - hlint = doDistribute self.hlint_3_8; - stylish-haskell = self.stylish-haskell_0_14_6_0; - retrie = doJailbreak (unmarkBroken super.retrie); + apply-refact = addBuildDepend self.data-default-class super.apply-refact; floskell = doJailbreak super.floskell; + fourmolu = dontCheck (doJailbreak self.fourmolu_0_15_0_0); + haskell-language-server = addBuildDepends [ + self.retrie + self.floskell + ] super.haskell-language-server; + hlint = self.hlint_3_8; + ormolu = self.ormolu_0_7_4_0; + retrie = doJailbreak (unmarkBroken super.retrie); + stylish-haskell = self.stylish-haskell_0_14_6_0; } ) - retrie + apply-refact floskell - haskell-language-server fourmolu - ormolu + haskell-language-server hlint + ormolu + retrie stylish-haskell ; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix index f739c9ddea641..82e1aa15642e3 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix @@ -105,7 +105,6 @@ in ghc-exactprint = doDistribute super.ghc-exactprint_1_8_0_0; haddock-library = doJailbreak super.haddock-library; - apply-refact = addBuildDepend self.data-default-class super.apply-refact; 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 @@ -114,27 +113,30 @@ in hls_overlay = lself: lsuper: { Cabal-syntax = lself.Cabal-syntax_3_10_3_0; Cabal = lself.Cabal_3_10_3_0; - extensions = dontCheck (doJailbreak super.extensions_0_1_0_1); + extensions = dontCheck (doJailbreak lself.extensions_0_1_0_1); }; in lib.mapAttrs (_: pkg: doDistribute (pkg.overrideScope hls_overlay)) { - haskell-language-server = allowInconsistentDependencies ( - addBuildDepends [ self.retrie self.floskell ] super.haskell-language-server - ); - ormolu = doDistribute self.ormolu_0_7_4_0; - fourmolu = doDistribute (dontCheck (doJailbreak self.fourmolu_0_15_0_0)); - hlint = doDistribute self.hlint_3_8; - stylish-haskell = self.stylish-haskell_0_14_6_0; - retrie = doJailbreak (unmarkBroken super.retrie); + apply-refact = addBuildDepend self.data-default-class super.apply-refact; floskell = doJailbreak super.floskell; + fourmolu = dontCheck (doJailbreak self.fourmolu_0_15_0_0); + haskell-language-server = addBuildDepends [ + self.retrie + self.floskell + ] super.haskell-language-server; + hlint = self.hlint_3_8; + ormolu = self.ormolu_0_7_4_0; + retrie = doJailbreak (unmarkBroken super.retrie); + stylish-haskell = self.stylish-haskell_0_14_6_0; } ) - retrie + apply-refact floskell - haskell-language-server fourmolu - ormolu + haskell-language-server hlint + ormolu + retrie stylish-haskell ; }