Commit Graph

497 Commits

Author SHA1 Message Date
IOHK
6ad351e599 Update Hackage and Stackage 2019-10-21 01:09:45 +00:00
IOHK
1037c41f52 Update Hackage and Stackage 2019-10-20 01:07:12 +00:00
IOHK
da692234ba Update Hackage and Stackage 2019-10-19 01:08:20 +00:00
IOHK
5a7fa0d458 Update Hackage and Stackage 2019-10-18 01:07:14 +00:00
IOHK
7f2b4cd3fb Update Hackage and Stackage 2019-10-17 01:54:13 +00:00
IOHK
2a186687d9 Update Hackage and Stackage 2019-10-16 01:09:18 +00:00
IOHK
e80fd8d4ec Update Hackage and Stackage 2019-10-15 01:10:04 +00:00
Moritz Angermann
623032c1af
Fix dealing with str (#263)
our change from string -> str to evade the warnings nix generates, resulted in a bunch of
unforseen consequences.

We now modify the str type a bit for our own use.
2019-10-14 16:00:39 +08:00
IOHK
a489e0145e Update Hackage and Stackage 2019-10-14 01:13:13 +00:00
Hamish Mackenzie
94f4679618 Add setup-depends to shellFor (#259)
* Add failing test for shellFor with setup-depends

* Add setup-depends to shellFor
2019-10-13 20:01:25 +08:00
Rodney Lorrimar
e4a572b034 tests: Add test case with fully static build of pandoc (#256)
* tests: Add test case with fully static build of pandoc

It uses the musl libc. To try it, use:

   nix-build test/default.nix \
     --arg crossSystem '(import <nixpkgs/lib>).systems.examples.musl64' \
     -A fully-static.pandoc-gmp

This includes the GMP library (linked statically). To build one without GMP:

   nix-build test/default.nix \
     --arg crossSystem '(import <nixpkgs/lib>).systems.examples.musl64' \
     -A fully-static.pandoc-integer-simple

Unfortunately, the latter doesn't work (it says "ghc" command not found).

* fixup! tests: Add test case with fully static build of pandoc
2019-10-13 19:44:24 +08:00
Rodney Lorrimar
b47a6bb1a2 shellFor: Use CABAL_CONFIG only with exactDeps = true (#255)
* shellFor: Use CABAL_CONFIG only with exactDeps = true

* shells: Put write-ghc-environment-files: never in cabal.config
2019-10-13 19:43:17 +08:00
Hamish Mackenzie
df51ce67b2 Fix conflicting flag definitions #254 (#258) 2019-10-13 19:42:26 +08:00
Hamish Mackenzie
147cf21341 Add ghcOptions on packages (#257)
* Add `ghcOptions` with example and docs
2019-10-13 14:19:59 +08:00
IOHK
933becf59d Update Hackage and Stackage 2019-10-13 01:08:45 +00:00
IOHK
7be7db8816 Update Hackage and Stackage 2019-10-12 01:24:39 +00:00
Hamish Mackenzie
f648a6585e
Fix project flags (#253)
Project flags (from stack.yaml and plan.json) are exported in a modules attribute by stack-to-nix and plan-to-nix, but are not currently used. This change updates `mkStackPkgSet` and `mkCabalProjectPkgSet` so that the modules attribute is used (if present) and includes tests to check they are.

This commit makes `stdenv.lib.mkOverride` necessary for setting flags in `mkCabalProjectPkgSet` modules, however it also means that you can set them in `cabal.project` instead (see #254).
2019-10-11 17:19:31 +13:00
IOHK
c06225a369 Update Hackage and Stackage 2019-10-11 01:09:20 +00:00
IOHK
dcd728bcf2 Update Hackage and Stackage 2019-10-10 01:08:30 +00:00
IOHK
622c7b61ab Update Hackage and Stackage 2019-10-09 01:07:58 +00:00
Phil de Joux
5ef9d5b576 Fix typos in the introduction. (#249)
* Fix typos in introduction.

* Missed an article.
2019-10-08 12:05:09 +10:00
IOHK
b0839f1b27 Update Hackage and Stackage 2019-10-08 01:08:50 +00:00
IOHK
02617b0928 Update Hackage and Stackage 2019-10-07 01:07:53 +00:00
IOHK
783978171e Update Hackage and Stackage 2019-10-06 01:08:35 +00:00
IOHK
b07397969a Update Hackage and Stackage 2019-10-05 01:09:18 +00:00
IOHK
975d2d8b5a Update Hackage and Stackage 2019-10-04 01:07:15 +00:00
IOHK
8a9e942288 Update Hackage and Stackage 2019-10-03 01:09:43 +00:00
IOHK
d8808093bf Update Hackage and Stackage 2019-10-02 01:09:35 +00:00
Rodney Lorrimar
53c0498ec4 Add tests for benchmarks and hspec-discover (#181)
* tests: Add benchmarks and hspec-discover to cabal-22 test
2019-10-01 10:01:49 +08:00
IOHK
dcec48a79b Update Hackage and Stackage 2019-10-01 01:06:45 +00:00
Hamish Mackenzie
fdcb2da2a8
Add default for shellFor packages (#242)
Uses the `isLocal` for property set by `plan-to-nix` and `stack-to-nix`
on packages where the source is referenced in the `cabal.project`
or `stack.yaml` file.
2019-10-01 11:10:11 +13:00
IOHK
792cf12b8b Update Hackage and Stackage 2019-09-30 01:08:09 +00:00
IOHK
08f0334c01 Update Hackage and Stackage 2019-09-29 01:09:54 +00:00
IOHK
a55f7f3af0 Update Hackage and Stackage 2019-09-28 01:08:34 +00:00
IOHK
0cb32e695d Update Hackage and Stackage 2019-09-27 01:11:05 +00:00
Hamish Mackenzie
6f566a6d5d Filter components using buildable flag (#240)
* Filter components using buildable flag

* Bump nix-tools

* Include components without buildable flag

* Test buildable components are filtered correctly
2019-09-26 13:47:03 +08:00
IOHK
3b60632c62 Update Hackage and Stackage 2019-09-26 01:08:24 +00:00
IOHK
f164646282 Update Hackage and Stackage 2019-09-25 01:07:34 +00:00
IOHK
bd9c46d98b Update Hackage and Stackage 2019-09-24 01:06:25 +00:00
Rodney Lorrimar
ad640fa02d
docs: Add note about shellFor and CABAL_CONFIG (#247) 2019-09-24 08:53:20 +10:00
IOHK
2af9b1697d Update Hackage and Stackage 2019-09-23 01:06:32 +00:00
IOHK
b2185376c1 Update Hackage and Stackage 2019-09-22 01:06:24 +00:00
IOHK
ff4958c3ea Update Hackage and Stackage 2019-09-21 01:07:00 +00:00
IOHK
3853a5124a Update Hackage and Stackage 2019-09-20 01:06:33 +00:00
IOHK
6b9d7b56a3 Update Hackage and Stackage 2019-09-19 01:07:54 +00:00
IOHK
2554d6d003 Update Hackage and Stackage 2019-09-18 01:16:17 +00:00
IOHK
03cf2369e0 Update Hackage and Stackage 2019-09-17 01:06:00 +00:00
Hamish Mackenzie
c513afa420 Include --enable-tests in callCabalProjectToNix (#225) 2019-09-16 17:18:29 +08:00
Hamish Mackenzie
f5b80ecf0e Fix issue with testWrapper (exposed by #238) (#243)
* Fix issue with testWrapper (exposed by #238)

We were relying on the `string` type's merge function quietly
concatenating strings.

Described here:
700cc56a0e/lib/types.nix (L218-L221)
2019-09-16 10:40:58 +08:00
IOHK
5f6fbe618e Update Hackage and Stackage 2019-09-16 01:08:56 +00:00