Commit Graph

9628 Commits

Author SHA1 Message Date
Philip Taron
8e3651c954
aeson: remove with statements 2024-08-18 06:31:15 -07:00
github-actions[bot]
ae6040d6a6
Merge master into staging-next 2024-08-14 00:02:32 +00:00
maralorn
d940d7b15b
Merge pull request #332377 from kkoniuszy/hledger_1_34-fix-build
haskellPackages.hledger_1_34: add overrides for dependencies and extra files
2024-08-13 23:12:45 +02:00
github-actions[bot]
45080a9559
Merge master into staging-next 2024-08-10 18:01:08 +00:00
Robert Schütz
d43b5f6caf git-annex: fix executable path in desktop file 2024-08-08 13:23:43 -07:00
Vladimír Čunát
d4720e9c1e
Merge branch 'staging-next' into staging
There was a nontrivial conflict in pkgs/stdenv/linux/bootstrap-tools*
(reorganizing code vs. modifying it)  I hope I really got it right.
2024-08-05 11:05:55 +02:00
Kacper Koniuszy
eeae44a1ed haskellPackages.hledger_1_34: add overrides for dependencies and extra files
* Change hledger_1_30_1 -> hledger_1_34 in existing overrides because
  1.30.1 doesn't exist anymore in nixpkgs

* Add new override for hledger-ui_1_34

* Fix manpage and info paths for hledger_1_34 in postInstall script
2024-08-05 03:55:30 +02:00
maralorn
c20c714d7c
Merge pull request #296645 from Stunkymonkey/haskell-modules-deprecate-phases
haskell-modules/generic-builder.nix: use runCommand instead of phases
2024-08-05 00:30:09 +02:00
Sigmanificient
63d05d989e pkgs/development: remove unused arguments 2024-08-03 17:18:20 +02:00
K900
a4a42b3aec Merge remote-tracking branch 'origin/staging-next' into staging 2024-08-01 08:57:50 +03:00
maralorn
269d73766f haskellPackages: Mark packages with failed builds broken 2024-07-31 23:01:19 +02:00
maralorn
2fcf19c7fc
git-annex: Bump hash 2024-07-30 13:45:15 +02:00
maralorn
97dc5d6809
haskellPackages: Format configuration-ghcjs-9.x.nix 2024-07-28 20:40:02 +02:00
maralorn
e7514c803a
Merge pull request #330344 from alexfmpe/proto3-suite
haskellPackages.proto3-suite: fix build
2024-07-28 20:29:43 +02:00
maralorn
bdb82c7eb7
Merge pull request #305823 from slotThe/kmonad-iokit
haskellPackages.kmonad: mark as broken on darwin
2024-07-28 20:26:19 +02:00
maralorn
2abfffa288
Merge pull request #330643 from hercules-ci/fix-haskellPackages.tasty_1_5_1
haskellPackages.tasty_1_5_1: fix
2024-07-28 20:23:52 +02:00
sternenseemann
7d2a01c5be Merge branch master into haskell-updates 2024-07-28 16:18:39 +02:00
Robert Hensing
9dc86a2318 haskellPackages.tasty_1_5_1: fix 2024-07-28 15:00:34 +02:00
Alexandre Esteves
c701b5787b haskellPackages.proto3-suite: fix build 2024-07-27 07:58:07 +01:00
Dennis Gosnell
6b3e2a4fbd stack: pin to hpack-0.36.0
This is necessary to make sure that `stack` distributed from Nixpkgs
uses the same `hpack` version as `stack-2.15.7` as distributed upstream.

This commit fixes the `tests.haskell.upstreamStackHpackVersion` test.
2024-07-27 14:08:47 +09:00
Randy Eckenrode
daa97965e1
Revert "haskell-builder.nix: work around useSystemCoreFoundationFramework hook"
This reverts commit e14e9647d7.
2024-07-26 12:41:44 -04:00
K900
1410c766c8 Merge remote-tracking branch 'origin/master' into staging-next 2024-07-26 08:41:08 +03:00
github-actions[bot]
574f1a6205
Merge master into haskell-updates 2024-07-26 00:14:02 +00:00
Silvan Mosberger
4888d2661b
Merge pull request #324691 from philiptaron/__attrsFailEvaluation/haskell
haskellPackages: remove __attrsFailEvaluation, buildHaskellPackages, and generateOptparseApplicativeCompletions special cases
2024-07-26 02:01:19 +02:00
maralorn
310c87a2a2
Merge pull request #329197 from alexfmpe/reflex-dom-js
haskellPackages.reflex-dom: fix eval on js backend
2024-07-25 23:37:43 +02:00
Alexandre Esteves
b7903bfec9 haskellPackages.reflex-dom: fix eval on js backend 2024-07-25 22:33:41 +01:00
maralorn
bdecf6fd33 haskellPackages: regenerate package set based on current config
This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh
2024-07-25 23:29:50 +02:00
maralorn
f64e5ad7d9
Merge pull request #328706 from alexfmpe/old-overrides
Remove a bunch of no longer needed old overrides
2024-07-25 23:06:02 +02:00
maralorn
00e2f1e748
Merge pull request #328911 from alexfmpe/pipes-aeson
haskellPackages.pipes-aeson: fix build
2024-07-25 23:04:34 +02:00
maralorn
f49f2b9a77
Merge pull request #329000 from mpscholten/drop-patch-for-push-notify-apn
haskellPackages.push-notify-apn: Drop patch
2024-07-25 23:03:37 +02:00
maralorn
42223ca763
Merge pull request #329200 from Profpatsch/purescript-unbreak
Purescript unbreak
2024-07-25 23:01:23 +02:00
maralorn
ec5bc77b2c
Merge pull request #329585 from mpscholten/fix-pdftotext
haskellPackages.pdftotext: break
2024-07-25 22:52:58 +02:00
maralorn
6dd4fde86e
Merge pull request #328705 from alexfmpe/large-records
haskellPackages.large-records: adjust to new release
2024-07-25 22:49:05 +02:00
maralorn
ea121367a9
Merge pull request #327465 from Montmorency/with-utf8-libiconv
libiconv with comment for with-utf8 commented and rebased to haskell-updates
2024-07-25 22:46:22 +02:00
maralorn
6abfa24a98 Revert "haskellPackages.with-utf8: fix build on x86 darwin."
This reverts commit 5f2e02bafe.
2024-07-25 22:45:22 +02:00
maralorn
cd3e2a2b69
Merge pull request #327322 from d-xo/fix-with-utf8-darwin-x86
haskellPackages.with-utf8: fix build on x86 darwin.
2024-07-25 22:01:45 +02:00
sternenseemann
9919b666ab haskell.packages.ghc{96,98}.cabal-install: fix build of 3.12
With cabal-install >= 3.12, we need to adjust our cabal-install overlay
once again.

- Due to the new dependency semaphore-compat, which appears to require
  unix >= 2.8 it is very difficult to get to work for GHC < 9.6 (but
  probably possible). Technically, using pkgs.cabal-install should
  always be fine, so there's no strict need for cabal-install to work
  with every GHC. Let's drop support for GHC < 9.6 for now.

- Make sure that cabal-install-solver also uses the latest version
  always.

- Due to Cabal 3.12, we need to deviate from Stackage for
  hackage-security. cabal-install does support the standard version of
  resolv now, though.
2024-07-25 16:54:51 +02:00
Marc Scholten
52fb468f16 haskellPackages.pdftotext: add mpscholten as maintainer 2024-07-24 11:10:36 -07:00
Marc Scholten
99181fe913 haskellPackages.pdftotext: unbreak
Fixes https://github.com/NixOS/nixpkgs/issues/319365

Build of pdftotext was broken caused by a recent cabal change introduced via https://github.com/haskell/cabal/pull/9200
2024-07-24 11:10:28 -07:00
Randy Eckenrode
e14e9647d7
haskell-builder.nix: work around useSystemCoreFoundationFramework hook
In 23.11, Darwin was changes to use the system CoreFoundation both aarch64-darwin and x86_64-darwin. The ability to change between implementations was removed, but the hook was left in place because at the time it was harmless. Unfortunately, that is no longer the case.

After the upgrade of ld64 to 951.9, it is no longer as permissive about when `-rpath` may be used. It no longer allows the flag to be used when targeting macOS 10.5, and it no longer allows it when merging objects. The former was an issue for certain versions of GCC (now fixed). The latter is an issue for Haskell.

When a Haskell project uses Darwin frameworks and Cabal to build, they will fail to build without this workaround, giving the following error.

    ld: -rpath can only be used when creating a dynamic final linked image

This is due to an optimization Cabal [performs][1]. If the linker supports creating relocatable objects or merging them, it will do so eagerly. This causes packages such as OpenGLRaw to fail to build due using Cabal and frameworks (OpenGL), which pull in the hook.

This workaround is ugly, but it will be reverted as soon as it hits staging and replaced with the real solution, which is removing the hook. The hook is only used with the 10.12 SDK. The 11.0 and 12.3 SDKs do not support the hook, and being able to switch CoreFoundation implementations is not anticipated to be restored in the future (due to problems it causes).

[1]: 705b6ebcae/Cabal/src/Distribution/Simple/Program/Builtin.hs (L341-L380)
2024-07-23 18:30:26 -04:00
Profpatsch
f7dd6b8f2a purenix: unbreak package by adapting to purescript 0.15.12
purenix has not been updated in a while. My fix was “merged into a
staging branch” (read: ignored) because their nix setup is broken.

https://github.com/purenix-org/purenix/pull/60
2024-07-22 18:50:36 +02:00
Profpatsch
afce93f732 purescript: unbreak package by fixing imports for new mtl
mtl decided to un-export `Control.Monad` and `Data.Monoid`, which in
itself is fine, but of course it breaks everything.
2024-07-22 18:50:35 +02:00
Marc Scholten
ee3278a62e haskellPackages.push-notify-apn: Drop patch 2024-07-21 15:02:20 -07:00
Alexandre Esteves
8bb380efbb haskellPackages.pipes-aeson: fix build 2024-07-21 14:32:51 +01:00
Alexandre Esteves
5b25c2ab26 haskellPackages.avro: unbreak with upstream patch 2024-07-21 00:23:41 +01:00
Peter Simons
04fb8e376e ghc-9.8.x: drop obsolete patch for libmpd 2024-07-20 21:14:13 +02:00
Alexandre Esteves
bd47af9693 haskellPackages.tzdata: remove override 2024-07-20 18:32:48 +01:00
Alexandre Esteves
2b16e31a7e haskellPackages.base64: remove override 2024-07-20 18:32:47 +01:00
Alexandre Esteves
d63390ab7a haskellPackages.shower: remove dontCheck 2024-07-20 18:32:47 +01:00
Alexandre Esteves
c9a6949ee7 haskellPackages.retrie: remove override 2024-07-20 18:32:47 +01:00