Commit graph

2797 commits

Author SHA1 Message Date
John Ericson
ec0c4802ae
Merge pull request #26799 from obsidiansystems/cross-haskell
haskell infra: Fix cross compilation to work with new system
2018-01-22 15:31:19 -05:00
Peter Simons
699d715f24 haskell-nix-paths: fix bogus dependencies 2018-01-22 08:47:00 +01:00
Ben Gamari
bf687907d7 haskell lib: Make Cabal compiler names explicit
Cabal2nix expects a --compiler flag that contains a Cabal Compiler description.
We used to use the compiler's derivation name for this, but this breaks when
cross-compiling due to the target suffix. Instead we add an explicit
haskellCompilerName attribute to Haskell compiler derivations.
2018-01-21 23:31:05 -05:00
John Ericson
81553124cf haskell infra: nativeGhc != ghc.bootPkgs.ghc
There's no reason to wait for non-binary native to *build* cross ghc,
but we want a nix-built GHC for Setup.hs or things won't work.
2018-01-21 23:31:04 -05:00
John Ericson
54ead73271 generic-builder: Make GHC a proper dependency
Rather than just sticking it on the PATH
2018-01-21 23:27:38 -05:00
Peter Simons
4532826e99
Merge pull request #34037 from ElvishJerricco/fix-ghcjs-lts-10
Fixed GHCJS
2018-01-21 19:55:25 +01:00
Will Fancher
fcc8cae88d Fixed GHCJS 2018-01-20 15:47:59 -05:00
Peter Simons
8297025d28 haskell-hlint: needs latest version of haskell-src-exts 2018-01-20 21:40:45 +01:00
Peter Simons
dcf3699b0b hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.8-7-gfbcdc2a from Hackage revision
70d584c0a5.
2018-01-20 21:40:40 +01:00
Peter Simons
9688c0eab7 haskell-hlint: use latest version by default 2018-01-20 21:40:39 +01:00
Peter Simons
a8d9a94574 haskell.lib.markBroken: explicitly disable Hydra builds
Recent changes [1] allow Hydra to build packages that are marked broken. To
avoid plenty of evaluation errors on Hydra, explicitly disable Hydra builds of
broken packages.

[1] https://github.com/NixOS/nixpkgs/issues/7541#issuecomment-357541243
2018-01-20 21:40:38 +01:00
Peter Simons
8bf8581b9a hackage2nix: disable broken Hydra builds
- Ping @abbradar for broken lambdabot.
- Ping @alunduil for broken collection-json and siren-json.
2018-01-20 21:40:08 +01:00
Kosyrev Serge
8d027c1113
ghc841: GHC 8.4.1: nix-shell -p haskell.compiler.ghc841 2018-01-19 16:06:02 +03:00
Michael Alan Dorman
899714ae96 hoogle: fix http-conduit dependency for new version
5.0.17 now requires http-conduit > 2.3.
2018-01-19 12:53:11 +01:00
Peter Simons
a1366f43a0 git-annex: update hash for new version 2018-01-19 12:53:11 +01:00
Peter Simons
3b54c5f483 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.8-3-g1ab3260 from Hackage revision
6aedac1525.
2018-01-19 12:53:11 +01:00
Will Fancher
9047a7dd33 Move packageSourceOverrides to haskellLib 2018-01-18 16:42:56 -05:00
Jan Tojnar
c278dd0b9d
bustle: re-enable hgettext support
hgettext 0.1.31.0 builds again
2018-01-18 22:13:57 +01:00
Shea Levy
f12f2ed44c
haskell-ide-engine: Fix build in sandbox 2018-01-18 12:02:29 -05:00
Peter Simons
29f0f38433 multi-ghc-travis: update to latest Git version and create a proper Haskell build
The attribute haskellPackages.multi-ghc-travis refers to a proper Cabal build
that includes the package's library
2018-01-18 17:01:33 +01:00
José Luis Lafuente
9b577c44bc
gitHUD: disable tests
Tests require tasty-quickcheck ==0.8.*
2018-01-17 17:18:16 +01:00
Jude Taylor
cf6c05fda7 add haddock version for GHC 8.0 2018-01-13 01:17:23 -08:00
Shea Levy
43e7cf5eb7
haskellPackages.ChasingBottoms: Disable testsuite 2018-01-12 13:04:57 -05:00
Peter Simons
e30ecaa916
Merge pull request #33636 from hamishmack/haskell-internal-libs-darwin2
haskell: Fix depending on libs with internal libs on darwin.
2018-01-12 16:09:56 +01:00
Peter Simons
e277be1943
Merge pull request #33360 from adnelson/unpin_lzma_versions
haskellPackages.lzma: loosen version bounds for test dependencies
2018-01-12 16:09:13 +01:00
Robert Hensing
f40ecb29aa Add documentation for haskell-modules/lib.nix 2018-01-12 10:48:03 +01:00
Peter Simons
aecc868ac1
Merge pull request #33733 from dhess/arm-cross-fixes
ghc, haskell-modules: ARM cross build fixes.
2018-01-11 16:56:20 +01:00
Drew Hess
e4f3fe051e ghc, haskell-modules: ARM cross build fixes.
As requested in #33405.
2018-01-11 10:45:44 -05:00
Shea Levy
4e78aeb441
callCabal2nix: Fix calling with a path in the store. 2018-01-11 10:17:56 -05:00
Shea Levy
fb069b77ee
Merge branch 'callCabal2nix-cleanSourceWith' 2018-01-11 09:21:50 -05:00
Drew Hess
84e4caacc5
haskell-modules: swagger2 still needs dontHaddock on armv7l-linux. 2018-01-11 00:59:55 -08:00
Shea Levy
fb2b6ac373
callCabal2nix: Use cleanSourceWith for composable filtering 2018-01-10 12:46:45 -05:00
Shea Levy
3a763b9196
haskellLib: Add shellAware function 2018-01-10 12:08:36 -05:00
Drew Hess
c5e433df59
haskell-modules: more disabled tests for armv7l-linux.
Specifically: servant-docs, servant-swagger, swagger2.
2018-01-10 00:38:45 -08:00
Drew Hess
c05378b730
haskell-modules: disable hashable tests on armv7l-linux. 2018-01-09 18:06:25 -08:00
Peter Simons
2280127e85 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.7.2 from Hackage revision
c0e307307b.
2018-01-09 20:33:02 +01:00
Matthew Pickering
5542e3cc4d haskell package set configuration clean-up
Closes https://github.com/NixOS/nixpkgs/pull/33588.
2018-01-09 20:32:55 +01:00
Hamish Mackenzie
d3eaa5a4de haskell: Fix depending on libs with internal libs on darwin. 2018-01-09 14:43:13 +13:00
Matthew Pickering
889d618f16 Jailbreak purescript package
See

https://github.com/NixOS/nixpkgs/issues/33355
https://github.com/purescript/purescript/issues/3189
2018-01-08 12:52:51 +00:00
Peter Simons
83a5765b1f LTS Haskell 10.3
This update was generated by hackage2nix v2.7.2 from Hackage revision
f0c9745e58.
2018-01-08 11:52:28 +01:00
Peter Simons
48a6d1a2ab
Merge pull request #33405 from dhess/ghc-armv7l
Make GHC work on armv7l-linux
2018-01-08 11:50:41 +01:00
Jude Taylor
b980675107 add haddock-api-2.17 for GHC 8.0 2018-01-07 15:47:11 -08:00
Peter Simons
066ec6a149
Merge pull request #33564 from mpickering/issue-33355
Add ansi-terminal < 0.7 to hackage2nix.yaml config
2018-01-07 19:47:13 +01:00
Matthew Pickering
80913e7471 Add ansi-terminal < 0.7 to hackage2nix.yaml config
This is required in order to resolve #33355
2018-01-07 11:22:37 +00:00
Allen Nelson
a4c8f60e86 reference issue in comment 2018-01-06 23:08:24 -06:00
Robin Gloster
b2e9096f68
ghcWithPackages: fix ghc version passing
The correct ghc version was not passed through anymore, I'm not entirely
sure this is the correct fix or if this is the only argument that was
missing.

broken by 5e31e828f8

cc @Ericson2314
2018-01-07 03:36:19 +01:00
Peter Simons
3bf1c3f961 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.7.2 from Hackage revision
5de0e510e9.
2018-01-06 11:29:51 +01:00
Michael Alan Dorman
5d56434e56 hindent: needs new haskell-src-exts 2018-01-06 11:29:51 +01:00
Peter Simons
5ab4aeb621
Merge pull request #33508 from alunduil/add-network-arbitrary-maintainer
add alunduil as maintainer of network-arbitrary
2018-01-06 11:27:37 +01:00
Alex Brandt
b7d216e51c add alunduil as maintainer of network-arbitrary 2018-01-05 22:42:44 -06:00