Commit Graph

8717 Commits

Author SHA1 Message Date
sternenseemann
2a93f44336 haskellPackages.czipwith: relax upper bound on base and t-h 2023-08-17 09:31:56 +02:00
sternenseemann
bac83374f1 haskellPackages.butcher: relax upper bound on base 2023-08-17 09:31:56 +02:00
sternenseemann
c24a28822e haskell.packages.ghc8107.ghc-lib: downgrade to 9.2.*
ghc-lib >= 9.4 won't compile with GHC 8.10 anymore, so we'll use the
newest version that still works (we used ghc-lib == 9.2.* with Stackage
LTS 20 as well).
2023-08-17 09:31:56 +02:00
sternenseemann
9e4a1cf233 haskell.packages.ghc94.ghc-tags: pin to matching version 1.6
haskell.packages.ghc96.ghc-tags: test on Hydra
2023-08-17 00:33:57 +02:00
sternenseemann
72573db36b haskellPackages: mark builds failing on hydra as broken
This commit has been generated by maintainers/scripts/haskell/mark-broken.sh based on
*evaluation [1798556](https://hydra.nixos.org/eval/1798556) of nixpkgs commit [4a85282](4a85282f9a) as of 2023-08-16 14:32 UTC*
from the haskell-updates jobset on hydra under https://hydra.nixos.org/jobset/nixpkgs/haskell-updates
2023-08-16 18:30:47 +02:00
sternenseemann
ee21e35394 haskellPackages.nix-graph: relax bound on algebraic-graphs 2023-08-16 17:33:50 +02:00
sternenseemann
703fd72aab haskellPackages.nix-deploy: lift upper bounds on text/turtle 2023-08-16 17:33:32 +02:00
sternenseemann
556e723ae1 haskellPackages.glualint: work around missing test data 2023-08-16 17:33:14 +02:00
sternenseemann
1422b80e21 haskell.packages.ghc8107.hspec_2_7_10: correct hspec-meta version
Unfortunately hspec 2.7 no longer compiles with GHC >= 9.4, so we hide
it in the Hydra jobset. It is preserved nonetheless, as it is used by
ghcjs (which still uses hspec 2.7 and GHC 8.10.7).
2023-08-16 14:53:01 +02:00
sternenseemann
821b63e6f0 haskellPackages.nixfmt: relax upper bounds 2023-08-16 14:51:06 +02:00
Dennis Gosnell
7000d9d454
Merge pull request #249372 from dalpd/fix-patat-build-3
haskellPackages.patat: Remove no longer needed patches
2023-08-16 08:22:13 +09:00
dalpd
807ebe04cb
haskellPackages.patat: Remove no longer needed patches 2023-08-15 21:31:34 +03:00
sternenseemann
2485935e38 haskellPackages.gi-webkit2webextension: work around argv limit 2023-08-15 13:00:19 +02:00
sternenseemann
1132e3984c haskellPackages.agda2lagda: provide executable to test suite 2023-08-15 12:26:07 +02:00
sternenseemann
74e0320bb8 haskellPackages.cabal2nix-unstable: 2023-07-10 -> 2023-08-15
Correctly detects pkg-config dependencies of text-icu.
2023-08-15 12:24:55 +02:00
sternenseemann
892d1fbc85 haskellPackages.aeson: simplify overrides 2023-08-14 23:49:20 +02:00
sternenseemann
052d60c4f3 haskellPackages.aeson: disable test suite on 32bit platforms
The failures have to do with lowered double precision on such platforms.
They are reported upstream and will hopefully be fixed soon.
2023-08-14 23:49:20 +02:00
sternenseemann
44552f9e3c haskellPackages.memory: fix build on i686 with GHC >= 9.4
Patch is conditional for now, so the rebuild only affects the relevant
platform.
2023-08-14 23:49:20 +02:00
sternenseemann
72ba1daaeb haskellPackages.basement: fix build on i686 with GHC >= 9.4
Patches are conditional for now to prevent a big rebuild.
2023-08-14 23:49:20 +02:00
sternenseemann
4f88c9d750 haskell.packages.*.weeder: provide algebraic-graphs < 0.7 if needed
weeder has no actively maintained support for older GHC versions, so we
need to partially restore historic install-plans when it is affected by
breaking changes in other libraries than GHC.
2023-08-14 10:58:24 +02:00
zowoq
bdea49df12 haskellPackages.inline-c-cpp: fix darwin build 2023-08-10 16:55:31 +10:00
sternenseemann
cba189dc2f haskellPackages.fclabels: allow 9.4 core pkgs and base-orphans-0.9.0 2023-08-09 21:27:48 +02:00
Manuel Bärenz
39fb5c360a haskellPackages.monad-bayes: Jailbreak and override 2023-08-09 21:08:17 +02:00
maralorn
b676a511c3
haskellPackages.systemd-api: Restrict to linux 2023-08-09 00:35:57 +02:00
maralorn
d58ec5127e
haskell.packages.ghc810.haskell-language-server: Fix build 2023-08-09 00:20:35 +02:00
maralorn
3f86662951
haskell.packages.ghc9{0,2}.haskell-language-server: Fix build 2023-08-08 22:49:51 +02:00
maralorn
9fda0fb7ec
haskellPackages.jsaddle-webkit2gtk: allow-newer: aeson, text 2023-08-08 16:04:05 +02:00
maralorn
c9ac4ccecb
haskellPackages.{webkit2gtk3-javascriptscore,gi-webkit2}: Populate pkg-config based on metadata 2023-08-08 16:04:04 +02:00
sternenseemann
06d13d55ed haskellPackages.gi-javascriptcore: respect argv limit for GHC >= 9.4 2023-08-08 11:57:37 +02:00
sternenseemann
2e876061cc haskellPackages.mkDerivation: allow overriding automatic propagation
Since we can't reliably (or easily at least) tell what Cabal version is
used, we should allow overriding whether to propagate or not, although
GHC >= 9.3 is correct in most cases.
2023-08-08 11:57:37 +02:00
sternenseemann
88f2062797 haskellPackages.mkDerivation: opt to only propagate pkgConfigModules
The main idea is to limit the amount of flags passed to Setup.hs as well
as, consequently, linkers and C compilers. E.g. in the case of
gi-javascriptcore, the default behavior causes the argv limit to be
exceeded.
2023-08-08 11:57:37 +02:00
sternenseemann
f8ffc1dd4c haskellPackages.yesod-core: temporarily disable broken tests
Compilation problem is fixed in a later version.
2023-08-07 17:33:37 +02:00
sternenseemann
0b5334887f haskellPackages.hercules-ci-cnix-store: don't use overrideAttrs
overrideAttrs can have counter intuitive effects when used in
conjunction with the tools offered by haskell.lib.
2023-08-07 13:58:06 +02:00
sternenseemann
69b514d249 haskellPackages.mkDerivation: don't ev allPkgconfigDepends too early
Just getting the length of allPkgconfigDepends now may require a quite
expensive and involved function to be execute, so it should be put off
as long as possible. We can achieve this by moving the assert for
pkg-config being available next to its inclusion in nativeBuildInputs.

This solves the infinite recursion triggered by hercules-ci-cnix-store.
2023-08-07 13:58:06 +02:00
sternenseemann
a83158c7b9 haskellPackages.mkDerivation: propagate pc deps for GHC >= 9.4
This change essentially amounts to inlining
__CabalEagerPkgConfigWorkaround into haskellPackages.mkDerivation and
applying it automatically for the affected GHC versions. This is a bit
overeager, but the best automatic solution we can come up with for now.

Consequently, we don't need __CabalEagerPkgConfigWorkaround in nixpkgs
anymore nor downstream at least for “standard” haskellPackages builds.
__CabalEagerPkgConfigWorkaround is preserved for now since it is still
necessary if using GHC < 9.4 with Cabal >= 3.10 or cabal-install >= 3.10.

The one thing that may or may not be negatively affected by this change
is ghcWithPackages. I doubt this is a problem in practice though, since
it didn't provide pkg-config in the first place. passthru.env and
shellFor do and work correctly since they rely on mkDerivation.
2023-08-07 13:58:06 +02:00
github-actions[bot]
c01174aacb
Merge master into haskell-updates 2023-08-04 00:13:19 +00:00
Jan Malakhovski
d8f7f6a5ce treewide: noop: refer to src.name or similar in sourceRoot where appropriate, part 2: the non-trivial cases 2023-08-03 16:32:05 +00:00
Ben Orchard
da718d171b haskellPackages.flatparse: add raehik as maintainer 2023-08-02 13:08:48 +01:00
Ben Orchard
f789cae407 haskellPackages.refined1: add raehik as maintainer 2023-08-02 13:08:37 +01:00
Ben Orchard
0f05762ba7 haskellPackages.refined: add raehik as maintainer 2023-08-02 13:07:55 +01:00
Ben Orchard
835e5c9587 haskellPackages.heystone: add raehik as maintainer 2023-08-02 12:58:13 +01:00
Ben Orchard
3d3f25e54a haskellPackages.generic-data-functions: add raehik as maintainer 2023-08-02 12:57:42 +01:00
sternenseemann
227a57329f haskell.packages.ghc8107.ghc-lib-parser: lift lower base bound 2023-07-30 22:19:53 +02:00
Daniel Rolls
da781ec44e haskellPackages.shellify: add me as a maintainer 2023-07-30 00:15:15 +02:00
maralorn
8ecc5ecc5a
haskellPackages.dependent-sum-template: back pin for ghc 9.4 compat 2023-07-29 13:05:17 +02:00
maralorn
cd1c98b639
haskellPackages: regenerate package set based on current config
This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh
2023-07-29 13:03:16 +02:00
maralorn
2b55fad13c
haskellPackages.inline-c-cpp: drop obsolete patch 2023-07-29 12:47:10 +02:00
sternenseemann
c01fcb6b2e arion: allow base >= 4.17 2023-07-27 11:29:52 +02:00
Rodney Lorrimar
9954c0da18 haskell.packages.ghc96.arbtt: patch for unix-2.8.0.0 2023-07-26 15:15:21 +02:00
Rodney Lorrimar
83a24f92e8 haskell.packages.ghc96.xmonad-contrib: patch for mtl-2.3 2023-07-26 15:15:21 +02:00
Rodney Lorrimar
2635c9eb1d haskell.packages.ghc96.monad-par: tweak override 2023-07-26 15:15:21 +02:00
Rodney Lorrimar
5c24ad1f29 haskell.packages.ghc94.taffybar: apply pkgconfig workaround 2023-07-26 15:15:21 +02:00
sternenseemann
9461adddf1 haskellPackages.hnix: make GHC 9.4 patch unconditional 2023-07-26 13:32:49 +02:00
Dennis Gosnell
6eb0db2b60
Merge pull request #245326 from rvl/haskell-updates-fixes
haskell.packages.ghc96: Build fixes
2023-07-26 12:26:12 +09:00
Rodney Lorrimar
7442abab18
haskell.packages.ghc96: assorted jailbreaks 2023-07-26 11:22:16 +08:00
Rodney Lorrimar
5ff4edd335
haskell.packages.ghc94.hnix: Add note to patch 2023-07-26 11:22:15 +08:00
Dennis Gosnell
911d466fca
stack: remove old, unused override from ghc86 2023-07-26 11:52:41 +09:00
Dennis Gosnell
645dfb80b8
stack: unset pin to Stackage LTS 2023-07-26 11:49:49 +09:00
Dennis Gosnell
32532fb2d3
Merge remote-tracking branch 'origin/master' into haskell-updates 2023-07-26 11:06:12 +09:00
pacien
f747a635d6 ldgallery: drop package
This removes 'ldgallery' from nixpkgs.
It remains available through the Nix Flake provided by ldgallery.

The package of its "compiler" part was already marked as broken due to
dependencies having gone out of sync with the rest of the Haskell
packages.

The package of its "viewer" part also got out of sync due to changes
in JS dependency manager.
2023-07-26 01:44:35 +02:00
sternenseemann
e31a4d909d haskellPackages.hspec*_2_11_4: provide missing versioned deps 2023-07-25 20:57:39 +02:00
sternenseemann
52f0aec3f0 pandoc: provide matching version of skylighting{,-core}
Since 500b36d057, there is a more recent
version of skylighting and skylighting-core available than Stackage LTS
contains. We'll have to manually provide matching versions for pandoc
3.1.6 again.
2023-07-25 20:37:12 +02:00
sternenseemann
812ce1a97c Merge PR #244603 into haskell-updates 2023-07-25 13:04:17 +02:00
sternenseemann
0b4156230b haskell.packages.*.ghc-source-gen: shuffle broken flags around
ghc-source-gen being broken is the norm now, as it only supports
GHC < 9.4. To keep tabs on it still (it is required for HLS some of the
time), we add it to release-haskell.nix.
2023-07-25 13:01:20 +02:00
Rodney Lorrimar
e45b99dfb5
haskell.packages.ghc94.hnix: Add patch to fix compile errors 2023-07-25 17:08:43 +08:00
Rodney Lorrimar
5efd81070c
haskell.packages.ghc96.servant: use 0.20 and jailbreaks 2023-07-25 17:08:17 +08:00
Rodney Lorrimar
d8e11a4943
haskell.packages.ghc96.relude: jailbreak and skip tests 2023-07-25 17:08:17 +08:00
Rodney Lorrimar
13acc8f938
haskell.packages.ghc96: assorted jailbreaks 2023-07-25 17:08:16 +08:00
Rodney Lorrimar
832b2cdbef
haskell.packages.ghc96.warp: remove override to 3.3.28
Versions of warp >=3.3.26 have the crypton-x509 dependency (forked
from x509), which pulls in cascading breakage.
2023-07-25 14:12:44 +08:00
Dennis Gosnell
277bf961c3
Merge pull request #245174 from ncfavier/sym
haskellPackages.sym: disable tests
2023-07-25 13:05:24 +09:00
Tommy Bidne
5778937656
maintainers: add tbidne 2023-07-25 13:18:55 +12:00
Tommy Bidne
d877ca18d1
haskellPackages.rest-rewrite: remove fix that is no longer necessary
The actual fix has been upstreamed to the package itself and is now present in
rest-rewrite-0.4.2.
2023-07-25 13:18:51 +12:00
sternenseemann
b6e5f0095d futhark: provide lsp >= 2.1 2023-07-25 02:21:57 +02:00
sternenseemann
500b36d057 all-cabal-hashes: 2023-07-19T20:56:38Z -> 2023-07-24T19:28:29Z
The main motivation for this is that the latest versions of hspec-core
and hspec-expectations got out of sync due to an unlucky timing on the
hackage snapshot update. As a consequence, we weren't able to build
cabal-install in some package sets. Additionally, this brings a version
of futhark that can be built with the lsp version we ship.

This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
and maintainers/scripts/haskell/regenerate-hackage-packages.nix.

Additional changes:

* Adapt to new xhtml version (still doesn't match the version normally
  shipped by the respective GHC as a core library).

* Adapt to new versions of hspec* and pandoc
2023-07-25 02:21:57 +02:00
sternenseemann
69516a90d6 gitit: drop upstreamed patches 2023-07-24 22:21:50 +02:00
Naïm Favier
bb835df448
haskellPackages.sym: disable tests 2023-07-24 13:43:02 +02:00
Dennis Gosnell
7dd4145f59
stack: make sure it is pointing at stack-2.11.1 2023-07-24 10:29:50 +09:00
sternenseemann
091d02e79b haskellPackages.css-syntax: drop broken flag 2023-07-20 01:38:24 +02:00
sternenseemann
97e7224610 haskellPackages.toml-parser: drop broken flag 2023-07-20 01:34:53 +02:00
sternenseemann
0ded80fcf5 haskellPackages.digits: work around broken Setup.hs
pandoc now (indirectly) depends on this and it's easy to fix.
2023-07-20 01:34:31 +02:00
sternenseemann
2ae7741768 haskellPackages: stackage LTS 21.0 -> LTS 21.3
all-cabal-hashes: 2023-06-28T16:36:39Z -> 2023-07-19T20:56:38Z

This commit has been generated by

* maintainers/scripts/haskell/update-hackage.sh
* maintainers/scripts/haskell/update-stackage.sh
* maintainers/scripts/haskell/regenerate-hackage-packages.sh

Additionally, the following manual changes are included:

* Delete now obsolete overrides for

  - base-compat, base-compat-batteries (new release in stackage)
  - cmark (new release in stackage)
  - skylighting (newer release than 0.13.3 in stackage)
  - optics (new release in stackage)

* Adjust to new versions for

  - hspec, hspec-core, hspec-discover, hspec-expectations
  - fourmolu
  - pandoc
  - doctest

!fixup stackage
2023-07-20 01:34:11 +02:00
maralorn
23bb7c65c3
haskellPackages.shh: jailbreak 2023-07-18 01:44:31 +02:00
maralorn
2da166c1ce
haskellPackages.ema: check, jailbreak 2023-07-18 01:40:17 +02:00
maralorn
bae7b8ae56
haskellPackages.lvar: jailbreak 2023-07-17 00:50:39 +02:00
Janus Troelsen
ebcb9db21d haskell.packages.{ghc90x,ghc94x}: Remove unnecessary jailbreaks 2023-07-16 16:23:29 +00:00
maralorn
de6a8565ee
haskellPackages: Add workaround for more haskell-gi packages 2023-07-15 12:10:14 +02:00
maralorn
5619bfa758
haskellPackages.ghcjs-dom: jailbreak 2023-07-15 12:09:20 +02:00
maralorn
ace41329a5
haskellPackages.{gtk,gio}: Use established workaround 2023-07-15 12:08:53 +02:00
maralorn
5bd1f315ba
haskellPackages.reflex-dom-core: Fix build 2023-07-15 12:07:24 +02:00
maralorn
405d3d38b3
Merge pull request #243515 from nomeata/unbreak-proteaaudio
haskellPackages.protoeaaudio: unbreak
2023-07-15 02:42:38 +02:00
maralorn
e52bcfb116
Merge pull request #243501 from dalpd/fix-patat-build-2
haskellPackages.patat: Patch to bump dependencies, override pandoc
2023-07-15 02:40:50 +02:00
maralorn
240ae41cbf
haskellPackages.jsaddle: patch 2023-07-15 00:52:25 +02:00
maralorn
22b8869e61
haskellPackages.shh: jailbreak 2023-07-15 00:24:32 +02:00
maralorn
d72b2ae9c0
haskellPackages.matrix-client: jailbreak 2023-07-15 00:16:56 +02:00
Joachim Breitner
4ad43ff1cb haskellPackages.protoeaaudio: unbreak 2023-07-14 18:59:10 +02:00
dalpd
b9be587f5e haskellPackages.patat: Patch to bump dependencies, override pandoc 2023-07-14 18:36:22 +03:00
sternenseemann
08aba29186 haskellPackages.base-compat{,batteries}: 0.12.2 -> 0.12.3
Building base-compat-batteries-0.12.2 against OneTuple == 0.4.* as we do
for GHC < 9.0 could lead to confusing results for users of
Data.Tuple.Compat. Thankfully upstream has provided a solution they are
satisfied with and released it as 0.12.3 to which we preemptively
upgrade (but it should enter Stackage LTS 21 soon enough)

See https://github.com/haskell-compat/base-compat/pull/92.

This reverts commit 54ebdad42d.
2023-07-12 14:51:11 +02:00
sternenseemann
970d1ddaa6 haskellPackages.aeson-better-errors: allow aeson == 2.1.* 2023-07-11 22:56:25 +02:00
sternenseemann
72652d46c8 haskell.packages.ghc9{4,6}.th-extras: drop bound on template-haskell 2023-07-11 18:56:49 +02:00
sternenseemann
fc97e60a59 haskellPackages.shelly: fix test script execution
Due to the lack of /usr/bin/env we need to make the script executable
and throw patchShebangs against it /before/ tests are executed.
2023-07-11 18:56:03 +02:00