Commit graph

244 commits

Author SHA1 Message Date
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
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 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 54ebdad42d haskell.packages.{ghc88,ghc810}.base-compat-batteries: loosen OneTuple bound
Loosening the bound seems easier than downgrading OneTuple in these package sets.
See also the linked issue.
2023-07-02 14:22:20 +02:00
sternenseemann 6cc8bbe4b6 haskell.packages.{ghc88,ghc810}.OneTuple: depend on foldable1-classes-compat
For GHC >= 9.0, foldable1-classes-compat is a test only dependency. For GHC < 9.0,
OneTuple also depends on it. It is important to add it to the library's build
depends as well, so it gets propagated properly to builds of packages that depend
on base-compat-batteries (or foldable1-classes-compat will appear as broken to
Cabal).
2023-07-02 14:22:20 +02:00
sternenseemann f50da30a5d haskell.packages.*.system-cxx-std-lib: make sure attr always exists
GHC 9.4 introduced a virtual package for linking against the C++
standard library. Since some packages depend on it when configured with
GHC 9.4 (as hackage2nix does), we need to make sure the attribute exists
or some packages will fail to evaluate. The may still build, even though
there is no shim for lower GHC versions (as far as I know).
2023-07-01 19:31:29 +02:00
sternenseemann babf4f9327 haskell.packages.*.hashable: provide data-array-byte for GHC < 9.4
This dependency is no longer necessary for GHC >= 9.4, but we need to
make it available for GHC < 9.4.
2023-07-01 13:57:38 +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 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 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
sternenseemann bdbfe10efb haskell.packages.*.cabal-install{,-solver}: unify overrides
Since the overrides are practically the same for all but the latest GHC
version, we can move the override into configuration-common.nix and rely
on a few conditionals in the overlay assembly — and end up with less
copying around!
2023-02-18 21:55:25 +01:00
sternenseemann 476fea7090 haskell.packages.ghc884.ghc-lib: downgrade to match ghc-lib-parser 2023-02-15 13:55:32 +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
maralorn 3b14e60bab haskell-language-server: Fix build for 1.9.0.0 for all ghc versions 2022-12-30 17:21:48 +01:00
sternenseemann 439841cc15 haskellPackages.multistate: allow hspec == 2.9.* 2022-12-30 12:00:54 +01:00
sternenseemann e238c3fdaa haskell.packages.*.binary-orphans: provide OneTuple when necessary
The binary-orphans dependency on OneTuple is only activated if GHC < 9.2
which means hackage2nix won't emit this dependency anymore.
2022-12-28 14:10:41 +01:00
maralorn e897471eee ghc-api-compat: unmarkBroken on older ghcs 2022-12-24 18:28:23 +01:00
maralorn 65d6fc555b haskell-language-server: Enable reenable dependencies for older ghcs 2022-12-24 17:46:42 +01:00
maralorn b9b319d348 haskell.packages.ghc88.hlint: Fix build 2022-12-17 02:06:39 +01:00
maralorn 093d158f5b haskell.packages.ghc88.haskell-language-server: Fix build 2022-12-17 01:56:27 +01:00
maralorn 1bb1559d75 haskellPackages: Fix eval errors 2022-12-09 04:43:38 +01:00
Dennis Gosnell 5602fa1733
haskell.packages.ghc884.exceptions: 0.10.5 -> 0.10.6 2022-12-03 17:39:29 -05:00
Dennis Gosnell f3b87b4075
haskell.packages.ghc88.hashable: add build depend on base-orphans 2022-11-26 02:07:32 -05:00
sternenseemann 2fccb31598 haskell.packages.ghc8{8,10}.base-compat-batteries: add missing dep 2022-11-22 18:12:03 +01:00
sternenseemann 270246ddd9 haskellPackages: adapt to process 1.6.15.0 -> 1.6.16.0 2022-10-27 22:11:24 +02:00
sternenseemann e7b47a72fe haskell.packages.ghc884.cabal-fmt: drop stale override
It is possible to get it to work again, but a bit annoying, so probably
not worth it. PRs fixing this again (if anyone needs it) will be
accepted.
2022-10-07 00:24:25 +02:00
maralorn 352da0ce31 haskellPackages.hlint: Fix plugin and ghc924 jobs 2022-09-21 06:12:47 +02:00
maralorn 7c2fda45cc haskell-language-server: 1.7.0.0 -> 1.8.0.0 2022-09-21 05:23:07 +02:00
sternenseemann 56a86997c4 haskell.packages.ghc{8107,884}.megaparsec: ignore base lower bound 2022-09-17 13:13:01 +02:00
sternenseemann 8758481cc0 haskell.packages.ghc884.{foundation,basement}: downgrade for GHC 8.8
The 0.0.29 and 0.0.15 releases respectively have dropped support for
GHC < 8.10.
2022-08-30 14:21:06 +02: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 4ad395f0c9 cabal-install: adapt to changes for 3.8.1.0
https://github.com/haskell/cabal/blob/cabal-install-v3.8.1.0/release-notes/cabal-install-3.8.1.0.md
2022-08-20 12:48:04 +02:00
maralorn dd6432a863
Merge pull request #182873 from sternenseemann/terminfo-cross
haskellPackages.terminfo: not a core pkg if cross compiling
2022-07-26 11:25:03 +02:00
Malte Brandy 0620844136 haskellPackages.regex-tdfa: Disable disfunctional tests for older ghcs 2022-07-26 11:15:03 +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 f854f80bc7 haskell.packages.ghc884.exceptions: reflect 0.10.5 release 2022-05-12 18:08:30 +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
sternenseemann caa10b0bee haskell.packages.ghc8{84,107}.universe-base: provide OneTuple
universe-base conditionally depends on OneTuple for GHC < 9.0 which we
need to manually reflect via these overrides.
2022-04-26 19:22:43 +02:00
Malte Brandy 3fa9ae18a0 haskell.packages.ghc884.haskell-language-server: enable hlint and fourmolu plugins 2022-04-14 13:00:43 +02:00
Robert Hensing 517cb71b02 haskellPackages.inline-c-cpp: Fix tests on darwin 2022-04-01 16:56:31 +02:00
sternenseemann 229609de16 haskellPackages.cabal-install-parsers: provide Cabal 3.6 2022-03-26 22:39:42 +01:00
sternenseemann c1f8889beb haskell.packages.ghc{884,8017}.mysql-simple: provide blaze-textual
The package shims blaze-textual for GHC >= 9.0 and makes its inclusion
conditional, causing hackage2nix to miss this dependency.
2022-03-25 14:20:55 +01:00
sternenseemann 33f275b4c2 all-cabal-hashes: 2022-03-03T10:08:52Z -> 2022-03-08T11:03:28Z
* Regenerate package set

* Adjust overrides for upgrades of ghc-lib* and Cabal.
2022-03-08 13:57:59 +01:00
sternenseemann 1aa02b5c38 haskell.packages.ghc8{107,84}.OneTuple: provide hashable
We need to manually simulate the following conditional in the cabal
file:

    if impl(ghc >=9.0)
      build-depends: ghc-prim

    else
      build-depends: hashable >=1.3.5.0 && <1.5
2022-02-25 21:15:57 +01:00
Malte Brandy 77b623d5a2 haskell-language-server: Fix build 2022-02-21 00:59:59 +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 2fb806dba0 haskell.packages.*: reflect Cabal minor version update 2021-10-12 12:51:49 +02:00
(cdep)illabout 749cb69b24
cabal-install: get building on ghc884, ghc8107, and ghc901 2021-09-11 21:53:44 +09:00