Commit graph

146 commits

Author SHA1 Message Date
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
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
Siva Mahadevan 78898bfe90
ghc810x: remove obsolete overrides (2/x)
feed: -doJailbreak
hashable: -doJailbreak
parallel: -doJailbreak
regex-base: -doJailbreak
regex-compat: -doJailbreak
2020-07-01 10:40:06 -04:00
Peter Simons 05530585af haskell-policeman: jailbreak with all compilers to fix the overspecified constraint on relude 2020-06-26 22:43:46 +02:00
Peter Simons 913724e47c haskell-repline: update override for ghc-8.10.x to the latest version 2020-06-25 10:51:24 +02:00
Malte Brandy bc8b615344
hackagePackages.hnix: Fix build
hnix 0.9.0 does not provide an executable for ghc <8.10 anymore.
So we need to disable optparse-applicative completion generation for all other versions.
2020-06-22 21:16:54 +02:00
Peter Simons 3ee117a0a9 xmobar: jailbreak latest version to accept recent timezone-olson packages 2020-06-19 22:29:22 +02:00
Peter Simons 2187753da6 haskell-base-noprelude: jailbreak when building with ghc-8.10.x 2020-06-19 22:29:22 +02:00
Peter Simons 89997f69b1 Drop obsolete overrides now that LTS 16.x has arrived. 2020-06-19 22:29:20 +02:00
Peter Simons ad62b57855 haskell-cabal-plan: drop obsolete patches 2020-06-05 21:58:25 +02:00
Peter Simons dcbcd742e0 haskell-dhall: update override for the latest version on ghc-8.10.x 2020-05-15 21:02:08 +02:00
Peter Simons 2a60d72465 haskell-hlint: drop obsolete override for ghc-8.10.x 2020-05-08 21:11:47 +02:00
Peter Simons 7a10ebe361 haskell-pantry: apply upstream patch to fix the build with ghc-8.10.x 2020-05-08 21:11:47 +02:00
Peter Simons 96ca16d0d8 haskell-dbus: drop obsolete patches for ghc-8.10.x support 2020-05-08 21:11:47 +02:00
Peter Simons c752d37efe cabal-install: patch the ghc-8.10.x build to succeed 2020-05-01 21:52:29 +02:00
Peter Simons b0c0ba6f81 haskell-ed25519: jailbreak to fix build with ghc-8.10.1 2020-05-01 21:52:29 +02:00
Peter Simons 60f6da9ae1 haskell-tasty-rerun: jailbreak for ghc-8.10.x to fix the build 2020-05-01 21:52:29 +02:00
Peter Simons 8dd2b73d4d haskell-feed: jailbreak for ghc-8.10.x to fix the build 2020-05-01 21:52:29 +02:00
Peter Simons 89acd1a9d0 haskell-email-validate: jailbreak for ghc-8.10.x to fix the build 2020-05-01 21:52:29 +02:00
Peter Simons 6a627c416f haskell-policeman: jailbreak to fix the build with ghc-8.10.1 2020-04-25 19:45:08 +02:00
Peter Simons 4bff4d692d haskell-xmobar: jailbreak to fix the build with ghc-8.10.1 2020-04-25 19:45:08 +02:00
Peter Simons ea37fe1f1c haskell-singletons: use latest versions when building with ghc-8.10.1 2020-04-25 19:45:08 +02:00
Peter Simons d3ae5625ff haskell-dbus: apply patch to fix the build
Taken from https://github.com/rblaze/haskell-dbus/pull/48.
2020-04-25 19:45:08 +02:00
Peter Simons d28e92d5aa haskell-weeder: jailbreak to fix the build with ghc-8.10.1 2020-04-25 19:45:08 +02:00
Peter Simons 53865f5f71 haskell-hlint: fix build with ghc-8.10.1 2020-04-25 19:45:08 +02:00
Peter Simons ceab66bf6e haskell-lens: use latest version when building with ghc-8.10.1 2020-04-25 19:45:08 +02:00
Peter Simons daf3b0868a configuration-ghc-8.10.x.nix: cosmetic 2020-04-25 19:45:08 +02:00
Peter Simons 7b7764287c haskell-cabal-plan: apply patch to fix the build with ghc-8.10.1 2020-04-25 18:16:57 +02:00
Peter Simons 6a6d0174ed haskell-pandoc: jailbreak out of haddock-library 1.8.x constraint 2020-04-25 18:06:43 +02:00
Peter Simons 125ada17b0 haskell-dhall: use the latest version when building with ghc-8.10.x 2020-04-25 18:06:42 +02:00
Peter Simons b24d2a90dd configuration-ghc-8.10.x.nix: cosmetic 2020-04-25 18:06:42 +02:00
Peter Simons f2aa6b44d4 haskell-system-fileio: jailbreak out of dependency on chell 0.4.x 2020-04-25 18:06:42 +02:00
Peter Simons e567a3b622 haskell-haddock: fix build with for the latest compiler ghc-8.10.1 2020-04-24 22:00:40 +02:00
Peter Simons da45fd982f haskell-microlens-th: drop obsolete override 2020-04-24 22:00:39 +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 10100a97c8 ghc-8.10.x: add plenty of overrides to fix builds 2020-04-17 22:50:43 +02:00
Peter Simons 73af2522be haskell-ChasingBottoms: jailbreak to fix build with ghc-8.10.x 2020-02-28 20:42:27 +01:00
Peter Simons 9347a3e5be ghc-8.10.x: add overrides to fix regex-* packages 2020-02-28 20:42:26 +01:00
Peter Simons f206eea2cf ghc-8.10.x: add a bunch of jailbreaks to fix builds 2020-01-31 22:13:06 +01:00
Peter Simons 2514bddbf7 ghc-8.10.x: exceptions is now a core library that comes with the compiler 2020-01-10 20:56:19 +01:00
Peter Simons 525b8cd3f6 ghc: add 8.10.1-alpha2 2019-12-27 20:58:23 +01:00