Commit Graph

54 Commits

Author SHA1 Message Date
Tommy Bidne
ac54dfcdf2
haskellPackages.file-io: unbreak for ghc 9.6 2023-09-06 09:22:15 +12:00
maralorn
7dfb3949da
haskell.packages.ghc96.haskell-language-server: Fix build 2023-08-22 01:50:52 +02:00
sternenseemann
14c332b453 haskell.packages.ghc96: reflect version updates 2023-08-18 10:40:03 +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
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
7442abab18
haskell.packages.ghc96: assorted jailbreaks 2023-07-26 11:22:16 +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
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
sternenseemann
72652d46c8 haskell.packages.ghc9{4,6}.th-extras: drop bound on template-haskell 2023-07-11 18:56:49 +02:00
Rodney Lorrimar
30e99eddbe
haskell.packages.ghc96.gi-gtk: Work around compiler issue
When building gi-gtk with ghc-9.6.1 and ghc-9.6.2 there are errors
like this:

  <no location info>: error:
  attempting to use module ‘gi-gtk-3.0.41-DcfU7A0rbDCAyPkJQEwKC:GI.Gtk.Interfaces.Buildable’ (./GI/Gtk/Interfaces/Buildable.hs) which is not loaded

The errors can be avoided by using -j1, which is unfortunate for
gi-gtk because it has 708 modules to build.

The ghc gitlab issue is: https://gitlab.haskell.org/ghc/ghc/-/issues/23392
2023-07-06 20:18:44 +08:00
Rodney Lorrimar
689ff4fd8f
haskell.packages.ghc96.taffybar: Fix build with blunt force
This applies the Cabal pkgconfig workaround to taffybar and all of its
pkgconfig-using dependencies.

A typical example of the build error looks like this:

  Package libpcre2-8 was not found in the pkg-config search path.
2023-07-06 20:18:43 +08:00
Rodney Lorrimar
285a85dac4
haskell.packages.ghc96.gi-cairo-connector: add jailbreak for mtl 2023-07-06 20:18:42 +08:00
Rodney Lorrimar
76a030effd
haskell.packages.ghc96.{cairo,glib,pango}: remove jailbreaks
Since the gtk2hs issue was fixed and a new version released, the
jailbreaks are no longer required.
2023-07-06 20:18:41 +08:00
Rodney Lorrimar
83d68068cf
haskell.packages.ghc96.warp: Fix build 2023-07-06 20:18:40 +08:00
Rodney Lorrimar
0e504b6873
haskell.packages.ghc96.ConfigFile: add build patch
This lets the package build with GHC 9.6.
2023-07-06 20:18:35 +08:00
sternenseemann
cc025c684d haskell.packages.ghc96.monad-par: patch for mtl >= 2.3
This allows us building cabal2nix with GHC 9.6 which we can now test on
Hydra.
2023-07-03 12:31:30 +02:00
sternenseemann
eda8d29381 haskell.packages.ghc96.language-haskell-extract: patch TH code
We have a similar patch for all GHCs >= 9.0.
2023-07-03 12:15:37 +02:00
sternenseemann
32f8dd4bee haskell.packages.ghc96: drop now unnessary version pins
We need to upgrade http-api-data, since 0.5 (LTS 21) still doesn't
support base >= 4.18.
2023-07-01 19:00:34 +02:00
sternenseemann
974363bfc1 haskell.packages.ghc96.foundation: drop obsolete patch 2023-07-01 18:36:43 +02:00
maralorn
871fdf1dcb
haskellPackages: Remove obsolete aeson_2_1_2_1 overrides 2023-06-29 02:22:25 +02:00
Peter Simons
45499facb3 Plenty of build fixes for ghc-9.6.x, particularly xmonad. 2023-06-26 14:35:49 +02:00
sternenseemann
adc82e6806 haskell.packages.ghc96.ghc-exactprint: 1.7.0.0 -> 1.7.0.1 2023-06-09 12:08:51 +02:00
Dennis Gosnell
6ddd5973f4
haskell.packages.ghc96.haskell-language-server: explicitly disable fourmolu plugin 2023-05-30 08:56:03 +09:00
Dennis Gosnell
47b2bd788b haskell.packages.ghc96.cborg: remove unneeded jailbreak 2023-05-29 16:16:24 +09:00
Dennis Gosnell
1203b93d86
haskell.packages.ghc96.ghc-lib: 9.6.1.20230312 -> 9.6.2.20230523 2023-05-29 07:44:11 +09:00
Janus Troelsen
3c108bd5d8
haskell.packages.ghc961.singleton-bool: Remove useless assert 2023-04-23 16:07:32 -05:00
Janus Troelsen
3aa6004a88 haskell.packages.ghc961.{aeson,singleton-bool,unliftio-core,lukko,lucid}:
Remove unnecessary jailbreaks
2023-04-23 19:40:51 +00:00
maralorn
22c5bd85d8 Partially revert "haskell.packages.ghc96: uses jailbreakForCurrentVersion"
This partially reverts commit 4925760232.
2023-04-22 22:27:21 +02:00
Tristan Cacqueray
4925760232 haskell.packages.ghc96: uses jailbreakForCurrentVersion 2023-04-22 20:04:56 +00:00
Tristan Cacqueray
e08455e3d6 haskell.packages.ghc96.serialise: allow base-4.18 2023-04-22 20:04:56 +00:00
Tristan Cacqueray
ef8559d3f4 haskell.packages.ghc96.cborg-json: allow base-4.18 2023-04-22 20:04:56 +00:00
maralorn
a092e62ce8
Merge pull request #227661 from TristanCacqueray/ghc96-turtle
haskell.packages.ghc96.turtle: distribute v1.6.1
2023-04-22 22:01:06 +02:00
maralorn
1c5ea44629
Merge pull request #227648 from TristanCacqueray/ghc96-http-api-data
haskell.packages.ghc96.http-api-data: distribute v0.5.1
2023-04-22 21:59:39 +02:00
Tristan Cacqueray
039b9d3988 haskell.packages.ghc96.turtle: distribute v1.6.1 2023-04-22 18:04:14 +00:00
Tristan Cacqueray
47fc92421b haskell.packages.ghc96.http-api-data: distribute v0.5.1 2023-04-22 16:22:53 +00:00
Tristan Cacqueray
216f0b7c29 haskell.packages.ghc96.hedgehog: distribute v1.2 2023-04-22 16:14:20 +00:00
maralorn
7f34e9543f
Merge pull request #227625 from TristanCacqueray/ghc96-hourglass
haskell.packages.ghc96.hourglass: pull test fix
2023-04-22 16:54:22 +02:00
Tristan Cacqueray
b147229444 haskell.packages.ghc96.hourglass: pull test fix 2023-04-22 14:36:36 +00:00
Tristan Cacqueray
09de688511 haskell.packages.ghc96.newtype-generics: relax base bound 2023-04-22 10:15:50 -04:00
maralorn
f8ca8c031b haskell.packages.ghc96.haskell-language-server: Fix build 2023-04-03 16:27:33 +02:00
Dennis Gosnell
dc532b18f2
haskell.packages.ghc96: fix some overrides for ghc96 2023-03-30 13:31:07 +09:00
Tristan Cacqueray
b9afffd107 haskell.packages.ghc96.foundation: add build patch 2023-03-27 22:29:16 +02:00
Tristan Cacqueray
bbc633e5fe haskell.packages.ghc96.parallel: bump version 2023-03-27 22:29:16 +02:00
Tristan Cacqueray
2e6a5a6ad2 haskell.packages.ghc96.memory: bump version
This change enables using the memory package.
2023-03-27 22:29:16 +02:00
sternenseemann
0cce97d64e haskell.packages.*.vector: clean up and unify overrides, run tests
- The dontCheck overrides are not necessary completely. It seems that
  there is some kind of issue with the doctest suite, but we can run the
  other ones.

- We need a jailbreak everywhere due to doctest (ironically), so we can
  move that into the common configuration.

- The i686 issue has been closed upstream. Tested locally to confirm
  that it is indeed not a problem anymore.
2023-03-20 14:14:41 +01:00