Commit Graph

89 Commits

Author SHA1 Message Date
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
Malte Brandy
505d721c3c haskellPackages: Move some overrides and update affected derivations
This is a follow-up to
https://github.com/NixOS/nixpkgs/pull/105140
2020-11-27 21:00:00 +01:00
Robert Hensing
5598ed7480 haskellPackages.hercules-ci-agent: Update Cabal for Setup 2020-11-27 20:59:59 +01:00
Robert Hensing
2cc48d915f haskellPackages.servant-swagger: dontCheck
Tests did not compile.
Message:

test/Servant/SwaggerSpec.hs:44:14: error:
    • No instance for (HasSwagger
                         (Fragment Int :> Servant.Test.ComprehensiveAPI.GET))
        arising from a use of ‘toSwagger’
    • In the expression: toSwagger comprehensiveAPI
      In an equation for ‘_x’: _x = toSwagger comprehensiveAPI
      In the second argument of ‘($)’, namely
        ‘do let _x = toSwagger comprehensiveAPI
            True `shouldBe` True’
   |
44 |     let _x = toSwagger comprehensiveAPI
   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^
2020-11-27 20:59:59 +01:00
Malte Brandy
dd75aa6b9b haskellPackages.stack: Fix build of dependencies
* persistent-sqlite
* pantry
2020-11-20 20:57:38 +01:00
Malte Brandy
8ef164247e haskellPackages: Remove a lot of overrides to fix eval errors 2020-11-20 20:57:36 +01:00
Peter Simons
6aa6b8f0eb haskell: drop overrides that have become obsolete in Stackage Nightly 2020-11-20 20:57:35 +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
90500cc7a4 haskell-dhall: update overrides for the new release 2020-10-23 21:00:26 +02:00
Peter Simons
4ec5eee624 stylish-haskell: jailbreak build with ghc-8.10.x to support Cabal-3.2.x 2020-10-16 21:36:20 +02:00
Peter Simons
88dbd029bc haskell-dhall: update override for ghc-8.10.2 2020-09-11 20:30:09 +02:00
Ariel Nunez
a29ed35bc7 hasura: 1.2.1 -> 1.3.1-beta.1 2020-09-03 14:59:08 -05:00
Peter Simons
05bf532082 pandoc: update to version 2.10.1
Stackage wants us to stay at 2.9.x, but that version is really quite old now
and updating the new version actually simplifies our code because a couple of
overrides are no longer necessary.
2020-08-28 21:06:51 +02:00
Peter Simons
a782182c05 ghc-8.10.x: update pandoc to the latest version 2020-08-27 14:21:00 +02:00
Peter Simons
9b63500893 ghc-8.10.x: fix various optics-* builds 2020-08-27 14:21:00 +02:00
Peter Simons
b38e6cf1c6 ghc-8.10.x: update override for optics-core 2020-08-07 20:34:52 +02:00
Peter Simons
a08c537cfb ghc-8.10.x: update override for dhall 2020-08-07 20:34:52 +02:00
Richard Marko
2dab5712fb haskellPackages.hnix: fix build for ghc-8.10 by adding repline 2020-07-31 21:21:57 +02:00
Peter Simons
e8e0ca289c haskell-shower: jailbreak to fix the build with ghc-8.10.x 2020-07-24 21:58:58 +02:00
Peter Simons
f4d4fdcbf0 haskell-dhall: use latest version for ghc-8.10.x so that we can build with the latest repline library 2020-07-24 21:13:25 +02:00
Siva Mahadevan
72f9a48471
ghc810x: remove obsolete overrides (3/x)
regex-pcre-builtin: -doJailbreak
regex-posix: -doJailbreak
regex-tdfa: -doJailbreak
split: -doJailbreak
tar: -doJailbreak
2020-07-02 23:42:53 -04:00
Siva Mahadevan
e522cf0cd7
ghc810x: remove obsolete overrides (1/x)
async: -doJailbreak
ChasingBottoms: -doJailbreak
ed25519: -doJailbreak
email-validate: -doJailbreak
2020-07-02 11:37:23 -04:00
Dennis Gosnell
f911872180
Merge pull request #91952 from svmhdvn/ghc810x-o5
ghc810x: remove obsolete overrides (5/x)
2020-07-02 10:34:12 +09:00
Dennis Gosnell
c391ffc804
Merge pull request #91951 from svmhdvn/ghc810x-o4
ghc810x: remove obsolete overrides (4/x)
2020-07-02 10:33:36 +09:00
Siva Mahadevan
129b21a426
ghc810x: remove obsolete overrides (5/x)
cabal-plan: -doJailbreak
cborg: -doJailbreak
cborg-json: -doJailbreak
relude: -dontCheck, -doJailbreak
2020-07-01 11:43:19 -04:00
Siva Mahadevan
ac690a7874
ghc810x: remove obsolete overrides (4/x)
tasty-expected-failure: -doJailbreak
tasty-rerun: -doJailbreak
vector: -doJailbreak
zlib: -doJailbreak
aeson-diff: -doJailbreak
2020-07-01 11:39:39 -04:00