3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

114 commits

Author SHA1 Message Date
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
sternenseemann ac656b2908 haskellPackages.cabal-install-parsers: build with Cabal >= 3.6
cabal-install-parsers depends on Cabal ^>= 3.6.0.0 since the latest release.
2021-09-04 22:22:41 +02: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
Malte Brandy 69e8d6b92a
haskellPackages.stylish-haskell: Fix on ghc 8.8.x 2021-06-20 23:22:32 +02:00
Malte Brandy 7b92c7f795
haskellPackages.hackage-db: Reactivate hydra job 2021-06-12 19:27:16 +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
sternenseemann 9c6c587e7a haskell.packages.ghc{8104,901}: correct cabal-install override comment 2021-05-19 17:17:02 +02:00
sternenseemann f3119f03ac haskell.packages.*.cabal-install: remove random, hashable overrides
These are not necessary anymore as stackage naturally contains random
1.2.0 and we apply the hashable fix globally as well.
2021-05-19 15:44:04 +02:00
Peter Simons dc4bb0df0a configuration-ghc-8.10.x.nix: cosmetic 2021-03-18 10:48:30 +01:00
Peter Simons 36d357d279 cabal-install: fix overrides for ghc-8.10.x 2021-03-18 10:48:30 +01:00
Peter Simons db0e36a58a cabal-install-parsers: drop obsolete overrides to fix evaluation 2021-03-18 10:02:19 +01:00
Malte Brandy 69faa4c451
haskellPackages.prune-juice: Unbreak 2021-03-12 16:57:26 +01:00
Malte Brandy 1444504e4b
haskellPackages.cabal-install: Fix build for 3.4.0.0
We can‘t use overrideScope with random because that would touch a lot of
tests and cause build failures.  So I try to do the overrides manually.
2021-02-26 14:55:22 +01:00
Manuel Bärenz 92c790582b haskellPackages.Agda: Remove outdated patch 2021-02-19 20:56:32 +01:00
Peter Simons f21de210fe Add more jailbreaks for QuickCheck. 2021-01-02 19:58:19 +01:00
Dennis Gosnell 9d41622c98 haskellPackages.Agda: update comment to be able to track upstream 2021-01-02 19:58:19 +01:00
Anders Kaseorg 20a63c490f haskellPackages.Agda: Fix build for ghc 8.10.2 → 8.10.3 upgrade
Commit 1998b95adc “haskellPackages:
update default compiler from ghc 8.10.2 to version 8.10.3” broke Agda
because Agda.cabal incorrectly declares a transformers dependency only
for ghc < 8.10.3:

    if impl(ghc >= 8.6.4) && impl(ghc < 8.10.3)
      build-depends: transformers == 0.5.6.2

    if impl(ghc >= 8.4) && impl(ghc < 8.6.4)
      build-depends: transformers == 0.5.5.0

    if impl(ghc < 8.4)
      build-depends: transformers == 0.5.2.0

leading to this error:

    src/full/Agda/Utils/Maybe.hs:13:1: error:
    Could not load module ‘Control.Monad.Trans.Maybe’
    It is a member of the hidden package ‘transformers-0.5.6.2’.
    Perhaps you need to add ‘transformers’ to the build-depends in your .cabal file.
    Use -v (or `:set -v` in ghci) to see a list of the files searched for.
       |
    13 | import Control.Monad.Trans.Maybe
       | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2021-01-02 19:58:18 +01:00
Peter Simons 7963b444ca haskell-ListLike: patch to fix the build with ghc-8.10.3 2020-12-25 20:42:36 +01:00