Commit graph

108 commits

Author SHA1 Message Date
Domen Kožar b5cf1b23f7
Merge branch 'master' into haskell-updates 2023-03-20 11:44:17 +00:00
sternenseemann a50dd13c92 haskell.packages.ghc94.aeson: drop obsolete jailbreak 2023-03-18 21:31:47 +01:00
sternenseemann a1c16a7909 haskell.packages.ghc94.generically: supply base-orphans
base-orphans is required for building generically with
generically >= 9.4 && < 9.6.
2023-03-18 21:31:47 +01:00
sternenseemann 3ce5834b3e haskell.packages.ghc94.indexed-traversable*: drop obsolete overrides 2023-03-18 21:31:47 +01:00
Domen Kožar d99eb5e079 cachix: 1.3.1 -> 1.3.3
It also uses GHC 9.4, since 9.2 is broken on arm/linux (segfaults).
2023-03-18 13:13:10 +00:00
sternenseemann beafc73774 haskellPackages.hspec*: reflect 2.10.9 -> 2.10.10 2023-03-17 16:10:40 +01:00
sternenseemann eabab5397e haskell.packages.ghc94.th-desugar: 1.14 -> 1.15
Also add override for GHC 9.6, 1.15 is the first version to support GHC
9.6. The override likely doesn't work yet, but is added in preparation.

To make it compile, we need a matching version of th-abstraction.
2023-03-17 16:10:39 +01:00
sternenseemann 70ec07b998 haskell.packages.ghc94.aeson: allow quickcheck-instances 0.3.28 2023-03-07 20:07:34 +01:00
maralorn 1c43095769 haskell.packages.ghc94.primitive: Pin to 0.7.4.0 2023-03-04 14:00:26 +01:00
sternenseemann 335f3cf390 haskell.packages.ghc94.lens: 5.2 -> 5.2.1 2023-03-02 13:58:52 +01:00
sternenseemann 295066c43d haskell.packages.ghc94.aeson: 2.1.1.0 -> 2.1.2.1 2023-03-02 13:58:52 +01:00
sternenseemann 7f2ac90596 haskell.packages.ghc94.primitive: 0.7.4.0 -> 0.8.0.0
Needs matching update of quickcheck-instances:

haskell.packages.ghc94.quickcheck-instance: 0.3.28 -> 0.3.29.1
2023-03-02 13:58:51 +01:00
sternenseemann 5a86855e00 haskell.packages.*: reflect terminfo update for cross compilation
terminfo had a new release on hackage and we only ship the latest
version currently, so every GHC gets the newest version. Whether this is
correct, is another question, occurs to me – we'll have to look into
whether we should fix this at some point.
2023-03-02 13:58:51 +01:00
Ben Orchard 653dc22fa1 haskell.packages.ghc94.ormolu: fix eval by bumping version 2023-02-20 00:52:23 +00:00
Peter Simons 20f68e74e8 haskell.packages.ghc94.haskell-language-server: update list of supported plugins 2023-02-04 15:48:44 +01:00
Peter Simons f0a4d98333 haskell.packages.ghc94.ormolu: use latest version for ghc-9.4.x 2023-02-04 15:48:44 +01:00
Peter Simons bfd3325932 haskell.packages.ghc94.libmpd: needs a jailbreak to succeed 2023-02-04 15:45:54 +01:00
sternenseemann ef3a8f19ac haskell.packages.ghc94.{glib,cairo,pango}: apply cabal#8455 fix
The package also need an additional jailbreak due to a strict text
bound. https://github.com/gtk2hs/gtk2hs/issues/323#issuecomment-1416723309
2023-02-04 12:34:07 +01:00
Peter Simons 962633e4d1 haskell.packages.ghc94.gtk2hs-buildtools: gtk2hs setup hook broken for ghc-9.4.4
See https://github.com/gtk2hs/gtk2hs/issues/323 for details.
2023-02-04 12:34:07 +01:00
sternenseemann 63862f4a66 haskell.packages.ghc94.X11-xft: automate workaround for cabal#8455
The current workaround for the regression is propagating the
runtime dependency closure (technically only Requires.private in the
pkg-config files). This can easily be done automatically by mimicking
how e.g. pkgsStatic converts buildInputs to propagatedBuildInputs.
This is extracted into a helper function,
__CabalEagerPkgConfigWorkaround, which can be applied to any package
easily.
2023-02-04 12:34:07 +01:00
github-actions[bot] 69514aad3b
Merge master into haskell-updates 2023-02-03 00:13:26 +00:00
Peter Simons 0bd808eebb haskell.packages.ghc944.X11-xft: add missing build-time dependencies
The packages has additional system dependencies when compiled in the
ghc-9.4.x package set.
2023-02-02 09:12:10 +01:00
maralorn e92ea6d48d haskellPackages: Fix eval by bumping pinned versions 2023-01-29 12:10:44 +01:00
sternenseemann 48eface5ca haskellPackages.shake-cabal: downgrade to match Cabal version
haskell.packages.ghc94.shake-cabal: use latest version to match Cabal
2023-01-25 16:29:15 +01:00
maralorn 4e75bbe768 haskell.packages.ghc94.haskell-language-server: Fix eval 2023-01-08 19:34:35 +01:00
maralorn 733bc1fb0a haskell.packages.ghc944.blaze-textual: Remove obsolete override 2023-01-04 18:35:41 +01:00
maralorn 3b14e60bab haskell-language-server: Fix build for 1.9.0.0 for all ghc versions 2022-12-30 17:21:48 +01:00
Robert Hensing 31cbc81000 haskell.packages.ghc944: Fix ghc-lib attrs
Monkey see, monkey do.
2022-12-29 19:21:25 +01:00
Dennis Gosnell f0cab3b001
haskell: hspec_2_10_7 -> hspec_2_10_8 2022-12-25 15:28:07 +09:00
Dennis Gosnell 5d40eaa66f
haskell.packages.ghc943.implicit-hie: remove unneeded Cabal-syntax override 2022-12-19 08:35:48 +09:00
maralorn 1bb1559d75 haskellPackages: Fix eval errors 2022-12-09 04:43:38 +01:00
sternenseemann d3df35b7b2 haskellPackages.rope-utf16-splay: downgrade to match text version 2022-11-26 12:14:47 +01:00
Naïm Favier 38b38881a4 haskell.packages.ghc9{2,4}.haskell-language-server: remove plugin overrides
Now that the base compiler has been updated to GHC 9.2, the cabal file
removes those unsupported plugins.
2022-11-24 15:32:48 +01:00
Dennis Gosnell 0c1886899e haskell.packages.ghc94.lens-aeson: remove unnecessary override 2022-11-22 15:50:18 +09:00
Dennis Gosnell a8f4aa3f49 haskell.packages.ghc94.swagger2: dont jailbreak 2022-11-22 15:44:37 +09:00
Dennis Gosnell 39bc33d6b4 haskell.packages.ghc94.hashtables: remove jailbreak 2022-11-22 14:19:34 +09:00
Dennis Gosnell 96024bde81 haskell.packages.ghc94.rerebase: remove jailbreak 2022-11-22 14:15:35 +09:00
Dennis Gosnell 3fb38eeb2f haskell.packages.ghc94.retry: remove dontCheck 2022-11-22 14:02:30 +09:00
Dennis Gosnell d57e153099 haskell.packages.ghc94.tasty-hedgehog: override version 1.3.1.0 with 1.4.0.0 2022-11-22 14:00:54 +09:00
Dennis Gosnell 4d8f23c5c8 haskell.packages.ghc94.implicit-hie-cradle: remove jailbreak 2022-11-22 13:51:48 +09:00
Dennis Gosnell 7e7a8ca3e2 haskell.packages.ghc94.invariant: remove jailbreak 2022-11-22 13:34:38 +09:00
Dennis Gosnell 49b7ff686e haskell.packages.ghc94.doctest: don't force specific version 2022-11-22 12:47:58 +09:00
Naïm Favier ea84ce7593
haskellPackages: fixes 2022-11-21 15:32:41 +01:00
maralorn 88fef9d935
Merge pull request #201692 from MercuryTechnologies/gabriella/fix_ormolu_ghc9.4
haskell.packages.ghc94.{or,four}molu: Disable `fixity-th` flag
2022-11-18 12:56:56 +01:00
Dennis Gosnell da038b4146 haskell.packages.ghc94.ghc-lib: 9_4_2_20220822 -> 9_4_3_20221104 2022-11-18 14:34:10 +09:00
Gabriella Gonzalez 524ddeb34f haskell.packages.ghc94.{or,four}molu: Disable fixity-th flag
See: https://github.com/tweag/ormolu/issues/941
2022-11-17 16:52:26 -06:00
maralorn 4ef72e5d10 haskellPackages.implicit-hie: Don‘t override Cabal-syntax on ghc 9.4
Less overrides are better, right?
2022-11-06 23:46:26 +01:00
sternenseemann 050fd1c134 haskell.packages.ghc943.cabal2nix: aarch64-linux works again 2022-11-05 13:54:41 +01:00
sternenseemann a379c57701 haskell.packages.ghc942.co-log-core: drop now unnecessary jailbreak 2022-11-04 14:59:51 +01:00
sternenseemann 4add137b0d haskell.packages.ghc942.cabal-install*: drop unnecessary jailbreak 2022-10-30 18:03:57 +01:00
sternenseemann 5e906acf26 haskell.packages.ghc942.co-log-core: ignore bounds on base, doctest
Needed for HLS and implicit-hie-cradle.
2022-10-27 22:44:53 +02:00
sternenseemann 4ae75bcfdb haskell.packages.ghc942.{distribution-nixpkgs,cabal2nix}: run tests 2022-10-27 22:10:03 +02:00
sternenseemann 26ec809a99 haskell.packages.ghc942: adapt to now-working doctest 0.20.1 2022-10-27 22:09:30 +02:00
Dennis Gosnell 88c678cae8
haskell.packages.ghc942.cabal2nix: mark as broken on aarch64-linux 2022-10-09 12:02:41 -04:00
maralorn dcda00d4ac haskell.packages.ghc942.haskell-language-server: Disable unsupported plugins to fix build 2022-10-06 00:52:38 +02:00
Jade Lovelace 9d97b342de haskell.packages.ghc942: get inital support up
This change introduces some actual overrides in
configuration-ghc-9.4.x.nix (based on the ones for 9.2) with the aim of
getting a basic 9.4 package set up. In particular the following
“interesting” packages are working:

* hpack
* hoogle
* cabal2nix
* cabal-install

You can get a better overview by looking at the overrides and the
versionedCompilerJobs in release-haskell.nix. Next obvious steps would
be working towards basic HLS support, but it seems that basically none
of the plugins are working so far. Big blockers here:

* https://github.com/alanz/ghc-exactprint/issues/114
* https://github.com/ndmitchell/hlint/issues/1413
* https://github.com/haskell/haskell-language-server/issues/3190

We ourselves have some churn to take care of and should try to release
the changes in https://github.com/NixOS/cabal2nix/pull/571 soon.

Co-authored-by: Rebecca Turner <rbt@sent.as>
Co-authored-by: sternenseemann <sternenseemann@systemli.org>
2022-10-02 14:01:45 +02:00
sternenseemann 5a1b7ea735 haskell.packages.ghc941.terminfo: not a core pkg if cross compiling
Reference #182873 and #182785.
2022-07-26 21:11:49 +02:00
sternenseemann 078346d55e haskell.compiler.ghc941: init at 9.4.0.20220721 2022-07-26 21:09:03 +02:00