Commit Graph
818 Commits
Author SHA1 Message Date
Hamish MackenzieandGitHub 42f7eb16c7 Add missing import and fix typos in docs (#543) 2020-04-13 01:10:44 +12:00
IOHK ded93b38ff Update Hackage and Stackage 2020-04-12 01:13:09 +00:00
IOHK a1a901648e Update Hackage and Stackage 2020-04-11 01:17:09 +00:00
Robert HensingandGitHub 57b1cf002b {cabal,stack}Project': Expose pkg-set (#531)
This will allow the caller to use the haskell.nix options somewhat
like a submodule.
2020-04-11 12:44:22 +12:00
IOHK 8335385792 Update Hackage and Stackage 2020-04-10 01:13:10 +00:00
Kirill ElaginandGitHub 16f43b2b2f Allow .so dynamic libraries on Darwin (#534)
* Allow .so dynamic libraries on Darwin

This code is a hack that applied only to Darwin, it collects all
required dynamic libraries into a single directory. It does this by
listing all library dirs and then linkin all dynamic libraries in them.

Before this change, it would link only `*.dylib` files. This was a
problem, because (weirdly) a lot of libraries in Nixpkgs actually
produce .so even on Darwin (and, weirdly, this somehow works).

So we now link `.so` files as well.

* Fix linking of dynamic libs with static on Darwin

This piece of code `ln`s all libraries we might want to link with into a
single directory and then hides all previous directories from Cabal.
The problem is that this code only `ln`s dynamic libraries, however we
might want to link with some library that only comes in a static
version.

So, `ln` static `.a` libraries too so that they are found when linking.
2020-04-09 11:14:49 +08:00
IOHK 6467559ed3 Update Hackage and Stackage 2020-04-09 01:12:58 +00:00
IOHK e5089734b7 Update Hackage and Stackage 2020-04-08 01:17:04 +00:00
IOHK 3bd01577a6 Update Hackage and Stackage 2020-04-07 01:12:48 +00:00
IOHK d57402225e Update Hackage and Stackage 2020-04-06 02:30:46 +00:00
IOHK 61d73ba2ea Update Hackage and Stackage 2020-04-05 01:12:43 +00:00
IOHK beee75b341 Update Hackage and Stackage 2020-04-04 01:13:50 +00:00
IOHK 306c2b15d0 Update Hackage and Stackage 2020-04-03 01:16:30 +00:00
Joe HermaszewskiandGitHub 303ed1133d Add vulkan-loader to system package map (#528) 2020-04-02 14:52:41 +08:00
IOHK ef09d6f3bd Update Hackage and Stackage 2020-04-02 01:13:58 +00:00
IOHK 2bf46ddb7c Update Hackage and Stackage 2020-04-01 01:17:15 +00:00
Michael Peyton JonesandGitHub 17f1f63674 Delete noisy trace message (#526)
This fires at least 3 times for every haskell.nix project (bootstrap
happy, alex, and hscolor), and then again for every `cabalProject` and
`hackage-package`. Moreover, it isn't actually informative: it just says
`ghc` and `ghc-pkg` for the executables being used.
2020-03-31 11:59:55 +08:00
Michael Peyton JonesandGitHub eb15db0450 Expose our nixpkgs pins by restructuring default.nix (#514)
* Remove unused (and broken) test files

* Make default.nix expose pinned nixpkgs

Also make `nixpkgs/default.nix` just an attribute set of sources.
This is simpler, and consistent with what e.g. `niv` does.

* Add backwards compatibility shim, and version argument to allow evolution in future

* Fix some missed things

* Fix and improve quickstart
2020-03-31 09:12:40 +08:00
IOHK b4823ea2db Update Hackage and Stackage 2020-03-30 01:13:11 +00:00
IOHK e990e34d30 Update Hackage and Stackage 2020-03-29 01:12:43 +00:00
IOHK ded312c8a0 Update Hackage and Stackage 2020-03-28 01:14:14 +00:00
IOHK 8040c12c54 Update Hackage and Stackage 2020-03-27 01:12:38 +00:00
IOHK c713316282 Update Hackage and Stackage 2020-03-26 07:32:35 +00:00
Moritz AngermannandGitHub a2a12d673d Update hackage-src.json 2020-03-26 15:08:33 +08:00
IOHK 84c7aaee4a Update Hackage and Stackage 2020-03-26 06:29:49 +00:00
Moritz AngermannandGitHub 28b8e2244a Update update-index-state-hashes.nix 2020-03-26 14:17:32 +08:00
Travis WhitakerandGitHub cc0787c785 Fix #515 (#517) 2020-03-26 14:10:56 +08:00
Travis WhitakerandGitHub 3932281deb Linux Cross Work-Around for GHC #15275 (#515) 2020-03-26 10:52:04 +08:00
IOHK e9c882c21d Update Hackage and Stackage 2020-03-26 01:15:59 +00:00
Michael Peyton JonesandGitHub b6a8a97249 Get the hackage index tarball at runtime, not eval time (#512)
* Get the hackage index tarball at runtime, not eval time
* Get rid of special case for update-hackage

Fixes #507.
2020-03-25 20:26:31 +08:00
64700ae79e CI: share between ci.nix and release.nix (#504)
* Define release.nix in terms of ci.nix

Beef up ci.nix to handle the same things as release.nix, then implement
the one in terms of the other.

* Fix infinite loop in evaluating release.nix with high ifdLevel

* Add tests to cross-compile

* Remove obsolete fix

* Do generic platform filtering

* Undefined variable

* Extract ci-lib.nix

* More undefined variables

* Use filterAttrsOnlyRecursive to avoid forcing all the drv attributes

* Set ifdLevel 0 to see if it fixes hydra eval

* Turn off tests on aarch64 cross

* Ifd level 1

* Ifd level 2

* Ifd level 3

* Maybe it's required that's too big?

Co-authored-by: Hamish Mackenzie <Hamish.Mackenzie@iohk.io>
2020-03-25 11:20:58 +00:00
IOHK f8f4cb2540 Update Hackage and Stackage 2020-03-25 01:15:32 +00:00
Hamish MackenzieandGitHub 0aa17d8afc Use subDir not src to construct default names (#506)
When no name is provided to `cleanSourceWith` or `cleanGit` we
currently use `baseNameOf src` as a default.

This was cute, but it lead to cache misses.  For instance if
`x = cleanSourceWith { src = ./.; }` then `baseName src`
will be different when `src` resolves to "/nix/store/X"
than when it is in a local directory.  If people use
git worktrees they also may wind up with different
values for `name`. Anything that depends on `x.name` will
propagate the issue.

This change uses `subDir` if present or if it is not it encourages
adding a suitable `name` with a warning message.
2020-03-25 13:45:43 +13:00
Kris JenkinsandGitHub da071af8ca Correcting some typos in the materialization doc. (#508) 2020-03-24 11:38:20 +00:00
Moritz Angermann 068714dbfe bump nix-tools 2020-03-24 12:51:31 +08:00
IOHK 1087b86f15 Update Hackage and Stackage 2020-03-24 01:15:38 +00:00
IOHK 350b594b3c Update Hackage and Stackage 2020-03-23 01:12:24 +00:00
Michael Peyton JonesandGitHub 171c57ab2c Add 'name' to cleanSource calls in tests (#505)
Otherwise we get unnecessary rebuilding of the tests in CI.
2020-03-22 23:52:10 +00:00
IOHK 1917908ae9 Update Hackage and Stackage 2020-03-22 01:16:06 +00:00
IOHK d3511cdc94 Update Hackage and Stackage 2020-03-21 01:19:20 +00:00
Michael Peyton JonesandGitHub 33dc7bce34 Tidy ci.nix using dimension (#500)
I recently came across this rather nice way of structuring build
matrices for ci.nix.

I think it makes the haskell.nix ci.nix a lot clearer!
2020-03-20 20:52:34 +13:00
Zhenya VinogradovandGitHub cb3acc6bd5 Add AGPL-3.0-only and AGPL-3.0-or-later to cabal-licenses.nix (#503) 2020-03-20 20:15:03 +13:00
Michael Peyton JonesandGitHub 614a675330 Add collectChecks functions (#498)
Fixes #482.
2020-03-20 19:34:40 +13:00
IOHK 5cc81a841b Update Hackage and Stackage 2020-03-20 01:15:46 +00:00
Hamish MackenzieandGitHub 578e7dde6f Fix reinstallable ghc for ghc 8.8.3 (#502) 2020-03-20 11:12:03 +13:00
IOHK 1ca6f0b7d4 Update Hackage and Stackage 2020-03-19 01:16:21 +00:00
Michael Peyton JonesandGitHub d241e560ea Fix shell.nix (#499) 2020-03-19 12:26:57 +13:00
IOHK c111ecefa6 Update Hackage and Stackage 2020-03-18 01:16:58 +00:00
YorickandGitHub 13a88d15f3 ghcjs: copy and run tests (#494) 2020-03-17 22:20:08 +13:00
YorickandGitHub b921ff83f0 fix profilingDetail errors when enabling profiling (#493) 2020-03-17 18:45:56 +13:00