Commit graph

146 commits

Author SHA1 Message Date
Dennis Gosnell 911d466fca
stack: remove old, unused override from ghc86 2023-07-26 11:52:41 +09: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 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 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 4c2f247e11 haskell.packages.*.Cabal-syntax: expose dummy packages for GHC < 9.4
Before Cabal >= 3.8, Cabal-syntax did not exist, but there is a dummy
package Cabal-syntax-3.6.0.0 which can be used to prevent the constraint
solver from picking mutually incompatible versions of Cabal and
Cabal-syntax. Since we are now solving flags with Cabal >= 3.8, many
packages have a dependency on Cabal-syntax they did not have before,
requiring us to have a matching attribute in every package set. Using
the dummy package is the safest solution, although it is not required in
every case.

Fixes eval of jailbreak-cabal for GHC < 9.4.
2023-07-01 13:17:43 +02: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
Jason Yundt b1bb9bb6c8 treewide: fix backwards smart apostrophes
According to the Unicode Standard, you should use U+2019 RIGHT SINGLE
QUOTATION MARK for apostrophes [1]. Before this change, some of the text
in this repo would use U+2018 LEFT SINGLE QUOTATION MARKs instead.

[1]: https://www.unicode.org/versions/Unicode15.0.0/ch06.pdf#G12411
2023-02-06 07:24:42 -05:00
sternenseemann f6b35ce8e3 haskellPackages.cabal-install-solver: allow building directly
This is a dependency of cabal-install and builds by virtue of its
overrideScope. We also want to make sure it builds independently, so
that it doesn't get marked as broken at the very least.
2022-08-27 10:02:59 +02:00
sternenseemann f39aee2d8b haskellPackages.terminfo: not a core pkg if cross compiling
GHC's cross build flavours disable the terminfo package, so it will
never be included if we are cross-compiling – setting it to null thus
breaks all builds depending on the package.

To fix this problem, we use the versioned attribute generated by
hackage2nix, just like we do for xhtml.

Closes #182785.
2022-07-25 23:42:29 +02:00
sternenseemann 813f8b5efb haskellPackages: xhtml is not bundled if haddock is disabled
The xhtml library is only built as part of the GHC build process if GHC
is disabled. This means that no GHC cross compiler has xhtml bundled,
since haddock can't be built if GHC is a cross compiler (see relevant
notes in the GHC nix expressions). This means that all packages
depending on xhtml would currently fail to build when cross-compiled, as
haskellPackages would assume it'd be provided by GHC. This is fixed by
this commit.

pkgsStatic hits this case, so we test compilation of xhtml for these
package sets which will remind us to update the attribute name whenever
its version changes.
2022-04-29 15:27:02 +02:00
Robert Hensing 517cb71b02 haskellPackages.inline-c-cpp: Fix tests on darwin 2022-04-01 16:56:31 +02:00
Malte Brandy 7fb5fa680a haskellPackages.policeman: drop 2022-03-21 22:55:51 +01:00
sternenseemann d7ff8061be haskellPackages: always inherit llvmPackages from ghc's passthru
This means we only have to update the llvmPackages attribute in one
place now and should prevent situations like with 8.6.5 where different
versions would be used in the package set compared to the compiler
build.

Drop comments in the configuration-ghc-X.Y.x.nix files as well, since
LLVM version isn't tied to the compiler minor version at
all (e. g. 8.10.2 and 8.10.7 have different support ranges).
2021-11-23 16:46:18 +01:00
mrkun 4df9292e9b haskellPackages.mime-string: disable optimization for older compilers 2021-11-20 02:13:42 +03:00
Ellie Hermaszewska 15ae25f36c
haskell: switch from haskell.lib to haskell.lib.compose 2021-11-07 20:18:45 +08:00
sternenseemann d675e19abb haskellPackages.{hackage-db,distribution-nixpkgs}: new rel. bounds
* no released version of hackage2nix does support distribution-nixpkgs yet.

* hackage-db 2.1.2 fixes an annoying bug introduced in 2.1.1 and also supports
  Cabal 3.4: https://github.com/NixOS/cabal2nix/issues/501
2021-07-26 18:59:58 +02:00
sternenseemann c145f7930d haskellPackages.hackage-db: downgrade to 2.1.0 if Cabal < 3.4
Stackage Nighly recently upgraded their version of hackage-db from 2.1.0
to 2.1.1. 2.1.1 had a compatibility fix for Cabal 3.4 [1]. However it
did not increase the version bound on Cabal nor fails to compile with
Cabal 3.2, so Stackage was able to update it.

Unfortunately hackage-db with Cabal 3.2 causes observable issues [2]
in cabal2nix, so we need to downgrade it for all compilers that still
ship a Cabal version < 3.4.

Also ideally we should update the constraints for hackage-db 2.1.0 and
hackage-db 2.1.1 on hackage. See also [3].

[1]: https://github.com/peti/hackage-db/pull/12
[2]: https://github.com/NixOS/cabal2nix/issues/501
[3]: https://github.com/peti/hackage-db/pull/14
2021-06-10 15:30:13 +02:00
sternenseemann 083ac8e64c haskellPackages.llvmPackages: dontRecurseIntoAttrs
They are not an exposed part of haskellPackages per se, so we shouldn't
list them in nix-env. Additionally this should prevent the failed lldb
build from cluttering our jobset output.
2021-06-04 11:36:24 +02:00
Peter Simons 7a0c9c110f haskell-time-compat: the test suite has transient errors on ghc-8.6.5 2021-03-05 21:15:53 +01:00
Malte Brandy 2b473737f9 haskell.packages.ghc884.vector: Disable checks 2021-02-12 20:35:22 +01:00
Malte Brandy 74d8ebc574 haskell.packages.ghc865.vector: Disable checks
There is a doctest problem on 8.6.5. with newest vector
2021-02-12 20:35:22 +01:00
Peter Simons 48104ded64 hls-hlint-plugin: add new ghc-lib dependency when building with older compilers 2021-02-05 23:05:20 +01:00
Malte Brandy 160d449726 haskell.ghc865.mmorph: Fix build 2021-02-05 23:05:20 +01:00
Malte Brandy b568d074ba haskell.packages.{ghc865,ghc884}.exceptions: Create attribute 2020-11-20 20:57:37 +01:00
Malte Brandy bf29c147c3 haskellPackages.haskell-language-server: Fix build
In preparation of the upcoming 0.6.0 release I wanted to fix hls.

It introduces two new plugin packages, which are not on hackage yet.

I remove apply-refact overrides, because current apply-refact versions
are compatible with all ghcs we support, according to their changelog.

I override more of the hls dependencies globally on the whole package
set, to avoid a lot of duplicate compilations. And because @peti changed
my mind about this being a good practice.

hls now uses a released version of ghcide
2020-11-13 21:37:56 +01:00
Peter Simons ed41afe60a haskell: update Cabal overrides for the new 3.2.1.0 release 2020-10-30 21:11:47 +01:00
Owen Shepherd ff263519a6 haskell.packages.ghc865.rebase: jailbreak on ghc 8.6 2020-07-24 13:02:54 +02:00
andys8 28556cd9ab Haskell: apply-refact version has to match ghc
This commit maps:

* GHC 8.6 to apply-refact 0.6
* GHC 8.8 to apply-refact 0.7
* GHC 8.10 to apply-refact 0.8

See:
<https://hackage.haskell.org/package/apply-refact/changelog>
<https://github.com/mpickering/apply-refact/issues/56>
2020-04-24 22:00:38 +02:00
Peter Simons d6aedf7bcd haskell-ghc-lib-parser-ex: fix build with GHC versions prior to 8.8.x 2020-04-17 20:50:48 +02:00
Peter Simons 11d28064b7 haskell-Cabal: update overrides for the new 3.2.x release 2020-04-03 22:00:29 +02:00
Gabriel Gonzalez 8d2c08e774 Fix evaluation of cabal2nix
`cabal2nix` fails to evaluate due to attempting to
evaluate `pkgs.haskellPackages.hackage-db_2_1_0`, which
does not exist.  However, the default
`pkgs.haskellPackages.hackage-db` is already version 2.1.0,
so the fix is simple: go back to using the default version.
2020-03-30 19:24:01 -07:00
Peter Simons 376ff258b5 stylish-cabal: fix the build
We can still compile the package with ghc-8.6.5. Later
compiler versions don't work, unfortunately.
2020-02-29 11:10:19 +01:00
Peter Simons abd5926447 haskell-policeman: don't build this package with ghc-8.6.x 2020-02-07 20:55:41 +01:00
Peter Simons e7dce63d54 haskell-cabal2spec: override Cabal to version 3.0.x 2020-02-07 20:44:24 +01:00
Peter Simons 2590a85189 haskell-liquidhaskell: drop obsolete overrides 2019-09-28 12:04:39 +02:00
Michael Alan Dorman e7eb269d45 cabal2nix: fix build
Without this change, the build fails with:

```
Warning:
    This package indirectly depends on multiple versions of the same package. This is very likely to cause a compile failure.
      package hackage-db (hackage-db-2.0.1-AliTRXEJBGFAEMpONOEnbV) requires Cabal-2.4.0.1
      package hpack (hpack-0.32.0-1iJuukTWmC4EGkYhAiFeII) requires Cabal-3.0.0.0-CD1INMNwoxXIKVgcu1nec5
      package distribution-nixpkgs (distribution-nixpkgs-1.3.1-82Z2DCdLAUs8Q2gjtlPLz5) requires Cabal-3.0.0.0-CD1INMNwoxXIKVgcu1nec5
      package cabal2nix (cabal2nix-2.15.0) requires Cabal-3.0.0.0-CD1INMNwoxXIKVgcu1nec5
      package cabal2nix (cabal2nix-2.15.0) requires Cabal-3.0.0.0-CD1INMNwoxXIKVgcu1nec5
      package cabal2nix (cabal2nix-2.15.0) requires Cabal-3.0.0.0-CD1INMNwoxXIKVgcu1nec5
```
2019-09-27 08:18:04 +03:00
Peter Simons 933c885761 cabal2nix: add override to keep the ghc-8.6.x version compiling 2019-09-25 15:29:46 +02:00
Michael Alan Dorman 4037a43630 jailbreak-cabal: updated package needs updated Cabal library
Only needs to be overridden for prior GHC releases.
2019-09-06 17:27:21 +02:00
Peter Simons 2e08ac73ca cabal-install: override native Cabal version on older compilers 2019-08-28 15:50:33 +00:00
Peter Simons a9dd9c7c2f haskell-resolv: add overrides for older compilers 2019-08-28 15:50:33 +00:00
Peter Simons da9c111088 ghc-8.6.x: fix llvmPackages version; this compiler needs LLVM 6.x 2019-04-30 11:43:44 +00:00
Peter Simons 09dbd3c8dc liquidhaskell: update devel snapshot to the latest version 2019-04-13 12:53:54 +02:00
Peter Simons 803e956919 liquidhaskell: switch ghc-8.6.x version to the 'develop' branch to fix the build 2019-03-26 17:20:35 +01:00
Peter Simons 48db7bf9d9
Merge pull request #56138 from jacereda/psqueues-check-86
psqueues: run test suite on ghc-8.6
2019-02-21 11:53:05 +01:00
Jorge Acereda 5aa3f23a98 psqueues: run test suite on ghc-8.6 2019-02-21 10:06:42 +01:00
Jorge Acereda c8e61efae3 cereal: run test suite on ghc-8.6 2019-02-21 10:02:43 +01:00
Peter Simons acaa5c1f1a stylish-cabal compiles again. Yay!
Thank you, @pikajude.
2019-02-18 10:39:12 +01:00
Nathan van Doorn 86c5937bcb haskellPackages.equivalence: dontCheck in GHC 8.6
The test suite fails due to MonadFail changes
2019-02-13 17:39:16 +00:00
Peter Simons dd98e07fed stylish-cabal: fix build with GHC 8.4.x (and clean up overrides)
Unfortunately, more recent compiler versions are unable to build this package
because of its dependency on the old haddock-library version.
2019-01-29 10:59:32 +01:00
Peter Simons e51f959fc7 git-annex: drop obsolete patches 2019-01-25 11:54:30 +01:00