Commit graph

108 commits

Author SHA1 Message Date
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 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 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
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
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
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 ace41329a5
haskellPackages.{gtk,gio}: Use established workaround 2023-07-15 12:08:53 +02:00
sternenseemann 72652d46c8 haskell.packages.ghc9{4,6}.th-extras: drop bound on template-haskell 2023-07-11 18:56:49 +02:00
dalpd 5af63b4958 haskell.packages.ghc94.gtk3: add __CabalEagerPkgConfigWorkaround 2023-07-09 12:56:44 +02:00
dalpd de679473b8 haskell.packages.ghc94.svgcairo: add __CabalEagerPkgConfigWorkaround 2023-07-09 12:55:16 +02:00
sternenseemann fccf629213 jacinda: patch for alex >= 3.3 2023-07-08 02:13:46 +02:00
Dennis Gosnell 44e687d50f
termonad: get building 2023-07-03 13:56:40 +09:00
Dennis Gosnell 64b2287b70
haskell.packages.ghc94.haskell-gi: add __CabalEagerPkgConfigWorkaround for even more packages 2023-07-03 13:56:22 +09:00
Dennis Gosnell 5afd97510b
haskell.packages.ghc94.haskell-gi: add __CabalEagerPkgConfigWorkaround for more packages 2023-07-03 13:33:30 +09:00
Dennis Gosnell 766d462426
haskell.packages.ghc94.haskell-gi: add __CabalEagerPkgConfigWorkaround for some packages 2023-07-03 13:04:15 +09:00
sternenseemann 5407503fba haskell.packages.*.cabal-install: provide correct versions of deps
Some packages cabal-install needed a certain version range (cabal-install-solver
and resolv) have versions incompatible with these in Stackage LTS 21. We can,
however, easily provide the necessary ones.

Additionally, we clean up some old resolv related overrides that are no longer
necessary or we no longer care about (being able to build cabal-install with
GHC 8.6, namely).
2023-07-02 14:22:21 +02:00
sternenseemann 3ad6e93971 haskell.packages.ghc94.shake-cabal: drop bound
GHC 9.4 can build the latest version of shake-cabal, so let's do that!
The older version is preserved for GHC 9.2 in case we have users that
need to use GHC 9.2 for a transitional time.
2023-07-01 11:54:09 +02:00
sternenseemann 64bee9771e haskell.packages.ghc94: remove remaining manually chosen versions
* `ghc-lib*` is tracked by Stackage LTS 21 and has the matching versions
  for GHC 9.4.

* `primitive` is actually upgraded in LTS 21 which we should follow.

* `th-desugar` and `th-abstraction` are downgraded in LTS 21 which we
  should follow.

* `rope-utf16-splay` matches the manually chosen version.
2023-07-01 11:52:03 +02:00
maralorn c5e61a111a
haskellPackages: Dump obsolete overrides for hls dependencies 2023-06-30 15:43:15 +02:00
Robert Hensing c2431c6642 haskellPackages.attoparsec-iso8601: Remove redundant override
The generated package at that attribute has the same version.
2023-06-30 00:18:45 +02:00
maralorn 28cd493da3
haskellPackages: drop more obsolete overrides 2023-06-29 02:45:56 +02:00
maralorn bfe0cb4ebd
haskellPackages: drop more obsolete overrides 2023-06-29 02:40:03 +02:00
maralorn 29c342186d
haskellPackages: drop more outdated overrides 2023-06-29 02:26:11 +02:00
maralorn 871fdf1dcb
haskellPackages: Remove obsolete aeson_2_1_2_1 overrides 2023-06-29 02:22:25 +02:00
sternenseemann a413349481 haskell.packages.ghc94.ghc-exactprint: 1.6.1.1 -> 1.6.1.3 2023-06-09 12:09:32 +02:00
Tommy Bidne 6795426411
haskell.packages.ghc94.gtk2hs-buildtools: remove patch for upstream fix 2023-06-07 10:24:38 +12:00
Dennis Gosnell 1388b98f13 haskell.packages.ghc94.cborg: remove unneeded patch 2023-05-29 16:14:37 +09:00
Domen Kožar 3a021d1a23 cachix: build using GHC 9.4 to avoid kernel crash 2023-05-24 15:51:20 +01:00
sternenseemann 259d93b07f haskell.packages.ghc945.ghc-lib{,-parser}: use 9.4.5 versions
Additionally, we fix an apparent mistake causing ghc-lib-parser to be
used as the ghc-lib attribute.
2023-05-17 23:53:52 +02:00
maralorn 045868c07b haskell.packages.ghc94.hspec*: remove unnecessary overrides 2023-04-26 18:37:25 +02:00
Miao, ZhiCheng e7ec5e110c
haskellPackages.gtk: fix build
- More addPkgconfigDepends
- doJailbreak
- Tested pkgsets:
  - [x] .#haskell.packages.ghc92.gtk
  - [x] .#haskell.packages.ghc94.gtk
2023-04-24 00:32:10 +03:00
maralorn 59f654146c haskellPackages.hspec*: Update overrides 2023-04-22 22:56:04 +02:00
maralorn a4f5f8b2e5 haskell.packages.ghc94.lucid: drop jailbreak 2023-04-19 23:59:12 +02:00
Tristan McLeay cc8b4a260b fourmolu: 0.10.0.0 -> 0.10.1.0
Restore bugfix release previously part of nixpkgs.
2023-04-18 14:59:03 +02:00
sternenseemann 31d0beef68 haskell.packages.ghc94.ormolu: restore 0.5.* for 9.4 compat
ormolu 0.6 wants ghc-lib* for GHC 9.6. It is probably possible to
upgrade to this version in the 9.4 set in principle, but this seems
simpler for now.
2023-04-13 00:23:15 +02:00
maralorn 5ddf8ec5a8 haskell.packages.ghc94.haskell-language-server: Fix build 2023-04-03 15:11:05 +02:00
Dennis Gosnell cd111f458f
haskell.packages.ghc944.fourmolu_0_11_0_0: unbreak 2023-03-30 13:33:10 +09:00
Dennis Gosnell f90d974481
haskell.packages.ghc944.tasty-hedgehog: 1.4.0.0 -> 1.4.0.1 2023-03-30 11:02:10 +09:00
Dennis Gosnell 9283ba9fbb
haskell.packages.ghc944.http-api-data: 0.5 -> 0.5.1 2023-03-30 10:59:01 +09:00
Dennis Gosnell bdd538ff03
haskell.packages.ghc944.lens: 5.2.1 -> 5.2.2 2023-03-30 10:17:33 +09:00
Dennis Gosnell 4c75508d6e
Merge pull request #222190 from sternenseemann/vector-tests
haskell.packages.*.vector: clean up and unify overrides, run tests
2023-03-27 09:13:16 +09:00
sternenseemann 25ae272497 haskell.packages.ghc94.cborg: unrestrict platforms
Revert "haskell.packages.ghc94.cborg: resolve duplicate overlay entry"

This reverts commit 6634553e48.

Revert "haskell.packages.ghc94.weeder: don't test on aarch64"

This reverts commit 600fd969f6.

Reason for reverts: https://github.com/NixOS/nixpkgs/pull/221688 applied
a patch for the compilation failure we were seeing on aarch64.
2023-03-20 18:04:46 +01:00
sternenseemann 6634553e48 haskell.packages.ghc94.cborg: resolve duplicate overlay entry 2023-03-20 14:23:57 +01: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
sternenseemann 600fd969f6 haskell.packages.ghc94.weeder: don't test on aarch64
cborg does not compile with GHC >= 9.4 and aarch64
2023-03-20 13:53:43 +01:00
Domen Kožar f73d0e3084 fix cachix build 2023-03-20 12:17:19 +00:00