Commit Graph

132 Commits

Author SHA1 Message Date
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
2e9ff9aa98 haskell.packages.*.ghc-tags: pick compatible version
Since there is probably more movement going forward, testing this on
Hydra for multiple GHC versions seems sensible.
2023-02-18 20:16:36 +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
7bc38b9128 haskell.packages.ghc810.haskell-language-server: Fix eval 2022-12-30 23:29:47 +01:00
maralorn
8c4865a950 haskell-modules/configuration-ghc-*.nix: Remove trailing whitespaces 2022-12-30 18:04:51 +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
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
sternenseemann
d4d50ffc5c haskell.packages.ghc8107.cabal-install: fix build 2022-12-23 01:14:47 +01:00
maralorn
ad0d7cf936 haskell.packages.ghc810.haskell-language-server: Fix build 2022-12-17 02:06:57 +01:00
Dennis Gosnell
c63bff0622
haskell.packages.ghc810.hashable: add build depend on base-orphans 2022-11-26 02:03:23 -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
ac1f1ad0e0 haskell: support cross in generateOptparseApplicativeCompletions
Deprecate haskell.lib{,.compose}.generateOptparseApplicativeCompletion*
in favor of the newly added
haskell.packages.*.generateOptparseApplicativeCompletions (plural!)
which takes into account whether we are cross-compiling or not. If we
are, generating completions is disabled, since we can't execute software
built for a different platform.

The move is necessary, so we can receive the /same/ stdenv as the
package we are overriding in order to accurately check whether we can
execute produced binaries.

Resolves #174040.
Resolves #49648.
2022-10-07 00:37:53 +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
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
Stefan Matting
dc594280fd haskell-language-server: fix with ghc-lib >= 9.0 and ghc <= 8.10.7
This cherry-picks the relevant changes from
https://github.com/haskell/haskell-language-server/pull/2854 into the
8.10.x version of hls-hlint-plugin, as suggested in
https://github.com/NixOS/nixpkgs/issues/168064#issuecomment-1146691884

Co-Authored-By: Florian Klink <flokli@flokli.de>
2022-08-18 17:02:16 +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
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
b42bd1a3d2 haskell.packages.ghc8107.spectacle: mark as unbroken
Closes #135145.

GHC >= 9.0 is unsupported at this moment (same goes for 8.8.4):
https://github.com/awakesecurity/spectacle/issues/49
2022-04-29 10:45:33 +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
82b4dabe8f haskell.packages.ghc8107.haskell-language-server: enable fourmolu plugin 2022-04-14 12:47:52 +02:00
Malte Brandy
76168cb096 haskell.packages.ghc8107.haskell-language-server: enable hlint plugin 2022-04-14 12:31:41 +02:00
Robert Hensing
517cb71b02 haskellPackages.inline-c-cpp: Fix tests on darwin 2022-04-01 16:56:31 +02:00
sternenseemann
e14278d33b yi: build using GHC 8.10.7
Luckily, all build failures where just related to type checking changes
in GHC 9.0 (and maybe base changes?), so we can just use GHC 8.10.7 with
the Stackage version of packages and keep Yi working. I feel like we
dodged a bullet here, as upstream maintenance doesn't seem to be too
proactive these days.
2022-03-28 18:31:01 +02:00
sternenseemann
6da0212360 taffybar: build using GHC 8.10.7
taffybar's GHC 9.0 patches are unreleased and not easy to backport.
2022-03-28 13:11:57 +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
Malte Brandy
2460c8b1a5 haskell.packages.ghc8107.haskell-language-server: Fix build 2022-02-25 23:55:06 +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
sternenseemann
d84b322b5f haskell.packages.ghc8107.weeder: use weeder 2.2.0 2022-02-21 11:27:38 +01:00
Malte Brandy
77b623d5a2 haskell-language-server: Fix build 2022-02-21 00:59:59 +01:00
sternenseemann
97ad10cfcc haskellPackages.system-fileio: allow chell >= 0.5 2022-02-20 22:22:59 +01:00
sternenseemann
35aff43aba haskellPackages.csv: work around ill conceived Setup.hs
This Setup.hs uses Cabal < 3 defaultUserHooks for no apparent reason. We
can simply revert to the default Setup.hs, as was already done for GHC
8.10.
2022-02-20 20:10:56 +01:00
sternenseemann
7b1e2a2277 haskell.packages.ghc8107: pick correct versions of GHC-specific pkgs
Extra acrobatics are required for ghc-bignum which has been removed from
hackage-packages.nix, since it is bundled with GHC starting with 9.0.2.
2022-02-18 18:24:22 +01:00
sternenseemann
af2e1acb5f haskellPackages: drop references to cabal-install-parsers_0_4_2
This package has been removed in a previous commit and the remaining
references cause eval issues.
2022-01-16 22:40:45 +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
(cdep)illabout
96f6dbbd10
haskell: bump uses of Cabal_3_6_0_0 to Cabal_3_6_1_0 to get rid of eval errors 2021-09-11 11:58:02 +09:00
sternenseemann
21e3afc6a2 haskell-ci: make sure all dependencies use Cabal 3.4
haskell-ci doesn't support Cabal 3.6 yet, so we need to downgrade
cabal-install-parsers to avoid inconsistencies across the dependency
graph.
2021-09-05 21:42:26 +02:00