Commit Graph

11765 Commits

Author SHA1 Message Date
sternenseemann
659b40e387 haskellPackages: reflect removal of pkgs.webkitgtk_4_0
hackage2nix can't run if there are unrecoverable errors while generating
the nixpkgs package Nix. To create this change, I temporarily added
webkitgtk_4_0 = null to all-packages.nix to solve those errors. Then
running ./maintainers/scripts/haskell/regenerate-hackage-packages.sh --fast
effects the desired change.

See also https://github.com/NixOS/cabal2nix/pull/674.
2025-10-18 03:05:01 +02:00
h7x4
5f36e60ee8 nixos/tests/hoogle: init 2025-10-18 04:18:33 +09:00
Wolfgang Walther
5040aa4e74 haskellPackages.digit: remove outdated override
Setup.lhs has now been deleted upstream.
2025-10-17 09:04:24 +02:00
Wolfgang Walther
2f67d7b8a9 haskellPackages.pandoc: update test fixture for djot >= 0.1.2.3 (#452699) 2025-10-16 19:52:21 +00:00
sternenseemann
36b254f34b haskellPackages.hs-opentelemetry-api: drop released patches 2025-10-16 21:50:25 +02:00
sternenseemann
4751f8141a haskellPackages.pandoc: update test fixture for djot >= 0.1.2.3 2025-10-16 21:46:41 +02:00
Emily
16334308cf haskell.packages.ghc902Binary: strip down for bootstrap
This should only be used to bootstrap source‐built GHCs.
2025-10-15 23:33:14 +01:00
Emily
ff54571c01 haskellPackages: drop packages only used for removed GHC versions 2025-10-15 23:33:14 +01:00
Emily
3419bd7fd0 haskellPackages: remove dead code for removed GHC versions 2025-10-15 23:33:14 +01:00
Emily
b07052d9d2 haskellPackages: drop unused patch file 2025-10-15 23:23:22 +01:00
Emily
b6be8a03a7 haskell.compiler.ghc{948,967,984,9102,9103,9121,9122}: backport patches for LLVM support
LLVM 12–17 have been dropped for Nixpkgs 25.11. As discussed recently
on Matrix, this backports upstream changes to allow the use of
LLVM 20 for all GHC versions from 9.4.8 onward.

I looked over GHC commits mentioning LLVM since the release of 9.4.8,
and read the discussions and issues around the relevant bumps, and
attempted to be quite thorough, but I obviously cannot guarantee that
this is wholly comprehensive. It seems like upstream generally bumps
the upper bound on the basis of “it builds successfully for me”,
with specific adaptations for new versions being fairly uncommon and
only coming for obvious build blockers or reactively in response to
bug reports. I have backported both kinds of changes here.

For some commits, trivial conflict resolutions and adaptations
were required. It would be possible to pass the affected files to
`fetchpatch` as `excludes` and keep smaller fix‐up patches in tree in
some cases, but I opted to keep it simple and vendor complete backport
patches instead. I did not attempt to backport every single change to
the LLVM backend, only those that seemed directly relevant to support
for newer versions; if you’d get the same issue with the older LLVM,
that’s just a GHC bug.

These changes should actually make it easier to cross‐compile for
new architectures, as more recent LLVMs will have better support for
newer platforms, and it will be easier to backport GHC changes to
enable new platforms with less drift in the backend.

These patches do result in two breaking changes. Firstly, the minimum
LLVM version is bumped to 13 across the board. This is irrelevant for
Nixpkgs as we pin a specific LLVM version anyway, and versions below
LLVM 18 will be removed imminently. Secondly, support for the hidden
`-fno-llvm-tbaa` flag is dropped. This can be replaced with custom
`-optlo` flags to control the passes more directly, but the main
use of this undocumented flag appears to have been to [work around]
the lack of support for newer LLVM versions, anyway.

[work around]: <https://gitlab.haskell.org/ghc/ghc/-/issues/22220>

I successfully built the following on `aarch64-linux`:

* `pkgsCross.armv7l-hf-multiplatform.buildPackages.haskell.compiler.ghc948`
* `pkgsCross.armv7l-hf-multiplatform.buildPackages.haskell.compiler.ghc967`
* `pkgsCross.armv7l-hf-multiplatform.buildPackages.haskell.compiler.ghc984`
* `pkgsCross.armv7l-hf-multiplatform.buildPackages.haskell.compiler.ghc9102`
* `pkgsCross.armv7l-hf-multiplatform.buildPackages.haskell.compiler.ghc9121`
* `pkgsCross.armv7l-hf-multiplatform.buildPackages.haskell.compiler.ghc9122`
* `pkgsCross.riscv64.haskell.compiler.ghc948`

The GHC 9.4.8 with an ARMv7 host platform segfaults when I try to run
GHC, though e.g. `ghc-pkg --help` runs successfully. The GHC 9.10.3
build targeting ARMv7 crashed inside `llc(1)`, so I tried RISC‐V,
which has some platform mismatch issue relating to `libffi`, so I
tried z/Architecture, which failed with an invalid floating point
constant in the LLVM IR, so I tried 64‐bit MIPS, which failed with
a different `libffi` issue, so I tried 32‐bit MIPS, which failed
to compile `compiler-rt`, so I gave up. I confirmed that both of the
ARMv7 issues reproduce with 944e8fd4f4,
the revision before they were bumped from their old versions of LLVM,
so these are not regressions.

I built a test program with the ARMv7 cross‐compilers and
confirmed that they run on the AArch64 builder. I also confirmed
that the cross‐compiled RISC‐V GHC successfully runs under
`qemu-riscv64(1)`. It will only try to build programs via the C
backend, though, as that is the only option for unregisterised™
targets, so it’s not clear to me how useful LLVM support in 9.4.8
really is for bootstrapping new platforms; I guess even RISC‐V
would require more backporting work to produce a cross‐compiled
GHC that will use LLVM to compile its own input. I didn’t bother
setting up all the binfmt machinery to get it through compiling and
running a test program, but it at least makes the attempt.
2025-10-15 16:25:12 +01:00
Emily
58799a0f1a haskell.compiler.ghc924Binary: drop
(cherry picked from commit c9c7344657)
2025-10-15 15:05:53 +02:00
Wolfgang Walther
743815bde6 haskellPackages: stackage LTS 24.12 -> LTS 24.15
all-cabal-hashes: 2025-09-25T14:09:07Z -> 2025-10-15T11:31:05Z

(generated by maintainers/scripts/haskell/update-package-set.sh)
2025-10-15 15:05:07 +02:00
Wolfgang Walther
33735c24b9 Merge branch 'haskell-updates' into staging 2025-10-15 13:54:11 +02:00
Wolfgang Walther
4b3b8a1456 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`.
2025-10-15 12:48:56 +02:00
Wolfgang Walther
e915fbe083 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](e1a3a9d50a) as of 2025-10-15 09:00 UTC*
from the haskell-updates jobset on hydra under https://hydra.nixos.org/jobset/nixpkgs/haskell-updates
2025-10-15 11:15:31 +02:00
sternenseemann
dae2ecdecf haskellPackages.gi-gtk-hs: Fix build (#451363) 2025-10-15 09:09:25 +00:00
Wolfgang Walther
1a0f23baf8 haskell-modules/HACKING: remove outdated reference to update hackage
Hackage is only updated directly from master, but not when merging the
PR anymore.
2025-10-14 11:18:01 +02:00
Wolfgang Walther
e1a3a9d50a haskellPackages.hledger_1_50_1: fix eval
Introduced via merge from master.
2025-10-14 10:47:47 +02:00
nixpkgs-ci[bot]
0d00b8baac Merge cf2f6d331e into haskell-updates 2025-10-14 00:20:12 +00:00
Wolfgang Walther
c771cbb68d haskell.compiler.ghc924Binary: drop (#440976) 2025-10-13 20:15:26 +00:00
nixpkgs-ci[bot]
c69dd11cb9 Merge staging-next into staging 2025-10-13 18:06:03 +00:00
nixpkgs-ci[bot]
f5c2101b71 Merge master into staging-next 2025-10-13 18:05:26 +00:00
Emily
c9c7344657 haskell.compiler.ghc924Binary: drop 2025-10-13 18:37:53 +01:00
tv
5260d68085 haskellPackages.mason: unbreak 2025-10-13 19:17:43 +02:00
tv
335ee0ff7b haskellPackages: regenerate package set based on current config
(generated by
maintainers/scripts/haskell/regenerate-hackage-packages.sh)
2025-10-13 19:14:37 +02:00
Wolfgang Walther
3051054425 haskellPackages.haxl: work around broken Setup.hs (#449093) 2025-10-13 16:40:26 +00:00
Wolfgang Walther
828f4ff9cc haskellPackages: unbreak various packages
Created with unbreak.nu.
2025-10-13 18:16:06 +02:00
Alexandre Esteves
a579ed321a haskellPackages: fix build of cabal-macosx (#450870) 2025-10-13 14:59:41 +00:00
Wolfgang Walther
17cdf7ea55 haskellPackages.HsOpenSSL-x509-system: fix Mac runtime (#450225) 2025-10-13 14:25:08 +00:00
K900
88aa4d3792 Merge remote-tracking branch 'origin/staging-next' into staging 2025-10-13 16:07:41 +03:00
nixpkgs-ci[bot]
bff70f3185 Merge master into staging-next 2025-10-13 12:07:07 +00:00
Rodney Lorrimar
8d1ec1d03d 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 <sternenseemann@systemli.org>
2025-10-13 14:02:02 +02:00
sternenseemann
ec5a9db64a 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.
2025-10-13 13:52:13 +02:00
Alexandre Esteves
72a9e526cc haskellPackages: fix build of cabal-macosx 2025-10-13 13:42:51 +02:00
Emily
f538f76655 haskell-modules/configuration-hackage2nix: drop mentions of 8.10 2025-10-13 13:29:20 +02:00
Wolfgang Walther
d2d30c93b4 haskellPackages.hpqtypes: fix passing libpq as lib (#450594) 2025-10-13 11:20:03 +00:00
Fernando Rodrigues
a13ff3e22e karabiner-elements: fix notarization for drivers, karabiner-dk: init at 6.2.0, kanata: Fix darwin drivers based on karabiner-elements, haskellPackages.kmonad: add output for darwinDriver (#445407) 2025-10-13 10:09:21 +00:00
nixpkgs-ci[bot]
8751f8a689 Merge staging-next into staging 2025-10-13 06:07:32 +00:00
nixpkgs-ci[bot]
a6a6bbcf24 Merge master into staging-next 2025-10-13 06:06:52 +00:00
Ivy Pierlot
2db6f4e8a8 haskellPackages.kmonad: add auscyber as maintainer 2025-10-13 11:59:57 +11:00
Ivy Pierlot
308a224f9c haskellPackages.kmonad: add darwinDriver 2025-10-13 11:59:56 +11:00
Robert Schütz
5d14c28808 haskellPackages.hledger_1_50: use hledger-lib_1_50
Otherwise the build fails with

    Encountered missing or private dependencies:
        hledger-lib >=1.50 && <1.51
2025-10-11 11:22:55 -07:00
Curtis Chin Jen Sem
4fe1162044 haskellPackages.hpqtypes-effectful: unbreak 2025-10-10 15:13:19 +02:00
Curtis Chin Jen Sem
4a87fd5a1e haskellPackages.consumers: run tests with pg hook 2025-10-10 13:48:56 +02:00
Ben Orchard
4debea0de9 haskellPackages: change darwin postPatch substitutes to use --replace-fail 2025-10-10 12:34:01 +01:00
Ben Orchard
485a99feff 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.
2025-10-10 12:27:58 +01:00
Curtis Chin Jen Sem
edb0512407 haskellPackages.hpqtypes-extras: run tests with pg hook 2025-10-10 11:46:35 +02:00
Curtis Chin Jen Sem
8fbadfa7a4 haskellPackages.hpqtypes: fix passing libpq as lib 2025-10-10 11:46:34 +02:00
Luna Nova
e7fbed853b treewide: remove usages of obsolete pie hardening flag 2025-10-09 10:13:03 -07:00