Commit graph

3403 commits

Author SHA1 Message Date
Peter Simons
279287a91c haskell-haddock-library: jailbreak and disable test suite to fix the build 2018-07-10 20:10:26 +02:00
Peter Simons
1cc37b2947 haskell-tree-diff: jailbreak to fix the build 2018-07-10 20:10:26 +02:00
Peter Simons
f73baa30f3 haskell-odpic-raw: can't compile this package on Hydra because of unfree dependencies 2018-07-10 20:10:26 +02:00
Peter Simons
62239af3ee haskell-manifolds: break infinite recursion in test suite dependencies 2018-07-10 20:10:26 +02:00
Peter Simons
1096d95c84 haskell-hledger: drop obsolete overrides for ghc-8.2.x 2018-07-10 20:10:26 +02:00
Peter Simons
a711d4342f Update Haskell overrides for lts-12.x. 2018-07-10 20:10:26 +02:00
Peter Simons
444404fc4a hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix 2.9.3-3-ge82312f from Hackage revision
386d91ec32.
2018-07-10 20:10:26 +02:00
Peter Simons
6ad292424a hackage2nix: update list of broken Hydra builds 2018-07-10 20:10:18 +02:00
Peter Simons
32bd0c4f50 hackage2nix: xmobar-0.26 needs old versions of dbus and hinotify to compile 2018-07-10 20:10:18 +02:00
Peter Simons
69cd09f8fb Switch default Haskell package set to LTS-12.x and GHC 8.4.3.
We are at LTS Haskell 12.0.
2018-07-10 20:10:18 +02:00
Robert Hensing
873465eede
Merge pull request #42923 from Gabriel439/gabriel/readDirectory
Add `pkgs.haskell.lib.packagesFromDirectory` utility
2018-07-10 11:30:11 +02:00
John Ericson
740cfffcb2 haskell infra: Fix built-time overrides
These should all come from `buildHaskellPackages`
2018-07-09 18:09:17 -04:00
John Ericson
f27f491784 Haskell infra: Do callPackage splicing 2018-07-09 16:39:37 -04:00
John Ericson
0299641c91 haskell generic-builder: Make test and benchmark tool depends nativeBuildInputs
This was reverted in 6e07a3a19a with the
other commits in the PR, as the number of overrides added in that PR was deemed
excessive. But this commit adds no overrides, and is valuable on its
own, so I am adding it back.

(cherry picked from commit 359e0ce4bb)
2018-07-09 12:30:18 -04:00
Gabriel Gonzalez
05ca67107a
Fix type signature 2018-07-07 15:23:03 -07:00
Robert Hensing
637fcd4c5b pkgs.haskell.lib.packagesFromDirectory: forward compatibility
Add `...` for less painful downgrades in the future
2018-07-06 13:03:56 +02:00
Peter Simons
a2338472fb Drop obsolete ghc-8.4.x overrides for arrows, flexible-defaults, and lambdabot-core. 2018-07-04 19:14:18 +02:00
Peter Simons
1d587c2e66 hledger-ui: fix build with ghc 8.4.x 2018-07-04 19:14:18 +02:00
Peter Simons
81a85ae486 haskell-criterion: update override for ghc 8.4.x 2018-07-04 19:14:18 +02:00
Peter Simons
07db547c19 haskell-dhall: update override for the new version that's used by ghc 8.4.x 2018-07-04 19:14:18 +02:00
Peter Simons
259215a6b3 ghc-8.6.x: create an initial package set configuration 2018-07-04 19:14:18 +02:00
Peter Simons
e938b12cde haskell-base-compat: update overrides for the new version 2018-07-04 19:14:18 +02:00
Peter Simons
0a635d3b78 haskell-hspec: update override for ghc 8.4.x 2018-07-04 19:14:18 +02:00
Peter Simons
ed111be99a hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.9.2-32-gdaeaea6 from Hackage revision
f8e066acb6.
2018-07-04 19:14:19 +02:00
Peter Simons
70d7586278 hackage2nix: ignore Stackage constraints for lambdabot and use latest versions 2018-07-04 19:14:01 +02:00
Peter Simons
a282166e0d hackage2nix: avoid the update to base-compat-batteries-0.10.4
We cannot compile that new version because most builds don't work with
contravariant 1.5.x.
2018-07-04 19:13:14 +02:00
Peter Simons
2664df06c5 hackage2nix: disable failing Hydra builds 2018-07-04 19:13:14 +02:00
Peter Simons
bf9ad8da07 LTS Haskell 11.16 2018-07-04 19:13:14 +02:00
Gabriel Gonzalez
2c55c157bd Rename readDirectory to packagesFromDirectory
... as suggested by @roberth
2018-07-04 08:22:20 -07:00
Peter Simons
6e07a3a19a
Revert "haskell generic-builder: Use strictDeps always" 2018-07-04 13:18:21 +02:00
Gabriel Gonzalez
8dae83157b Change readDirectory to accept an attribute set
... as suggested by @roberth
2018-07-03 17:44:19 -07:00
Matthew Bauer
157b59736b configuration-ghc-8.4.x.nix: Update hspec versions
These have changed on master.
2018-07-03 19:25:26 -04:00
Domen Kožar
9ed54a38bd configuration-common.nix: fix build tools 2018-07-03 19:24:40 -04:00
Gabriel Gonzalez
e57fd11bb4 Add pkgs.haskell.lib.readDirectory utility
This adds a `readDirectory` utility that can be used to "slurp" a directory
full of `cabal2nix`-generated files and transform them into a Haskell package
override set.  The main use of this is so that users don't have to write:

```
{ overrides = self: super: {
    foo = self.callPackage ./path/to/foo.nix { };

    bar = self.callPackage ./path/to/bar.nix { };

    ...
  };
}
```

Instead, they can write:

```
{ overrides = pkgs.haskell.lib.readDirectory ./path/to;
}
```

This is a an alternative to `packageSourceOverrides` which primarily addresses
the following use cases:

* The desired package is not yet available in `all-cabal-hashes` (perhaps the
  user is pinned to an older revision of `nixpkgs`)
* The default `cabal2nix` invocation used by `packageSourceOverrides`
  does not use the desired `cabal2nix` flags
* The user wants to avoid the use of import-from-derivation
2018-07-03 09:25:15 -07:00
Matthew Bauer
1a668f79b2 yesod-persistent: add hspec-discover for 1.4.3 2018-07-02 16:37:20 -04:00
Matthew Bauer
4590a3702a haskell-modules: Add more overrides 2018-07-02 15:55:00 -04:00
Matthew Bauer
2cb563374f haskell-modules: Add more test tool depends 2018-07-02 15:55:53 -04:00
Matthew Bauer
fb94cd9b51 haskell-modules: Add pandoc for heist 2018-07-02 15:55:48 -04:00
Matthew Bauer
c4431d301a haskell-modules: Add test tool depend for modern-uri 2018-07-02 15:55:43 -04:00
Matthew Bauer
10f10638d8 haskell-modules: Add many more overrides for hspec-discover
This is needed for picking up hspec-discover in strictDeps generic-builder.nix.
2018-07-02 15:55:20 -04:00
Matthew Bauer
42bd49d72b haskell-modules: Fix mockery in macos
Weird errors otherwise - seems to need this to know it can skip the
bad test.
2018-07-02 15:55:01 -04:00
John Ericson
3457ce0142 with-location: Link upstreamming attempt 2018-07-02 15:52:47 -04:00
John Ericson
c4d43761c1 haskell with-location: Link upstreaming attempt 2018-07-02 15:52:47 -04:00
Matthew Bauer
fea9a71ff4 haskell: add more test tool depend for hspec-discover
Needed for new ‘strictDeps = true;’ handling.

Including-

- slim
- string-conversions
- skeletal-test
- catamorphism
- unliftio
- logging-facade
- distributive
- doctest
- http-types
- interpolate
- mockery
- mime-mail
- http2
2018-07-02 15:52:47 -04:00
Matthew Bauer
160894db35 text-conversions: add hspec-discover 2018-07-02 15:52:22 -04:00
Matthew Bauer
9ef816e776 with-location: add hspec-discover 2018-07-02 15:52:22 -04:00
John Ericson
d2f6f527f4 alex: which needs to be a tool dep so it's a nativeBuildInput
Also pull it from `buildPackages`, as that is where nativeBuildInputs
come from.
2018-07-02 15:52:22 -04:00
John Ericson
242ca11b03 base-compat: Add missing build tool dependency 2018-07-02 15:52:22 -04:00
John Ericson
43e3ea0322 hspec{,-core,-discovery}: Add build-tool-depends to testsuite
`fetchpatch`ing a PR I just opened. This ought to get Cabal to make the
`PATH` include the newly-built exe, but unfortunately it doesn't.
2018-07-02 15:52:21 -04:00
John Ericson
ceaf285c0c haskell generic-builder: Use strictDeps always
This helps avoid the `ARG_MAX` issues we've been having, and is
generally a good idea to ensure cross comparability anyways.
2018-07-02 15:51:14 -04:00