Commit Graph

3036 Commits

Author SHA1 Message Date
Shea Levy
15344506cc haskell-funcmp: Fix build on GHC 8.4 2018-02-10 18:10:46 +01:00
Shea Levy
7ac6c77323 ghc: Make deterministic profiling patches opt-in.
The patch changes some pieces of the exposed API, so we can't have our
default GHC changed in this way.
2018-02-10 18:10:44 +01:00
Shea Levy
9dfbb52423 liquidhaskell: Patch for compat with our deterministic profiling GHC patch 2018-02-10 18:05:29 +01:00
Peter Simons
36a095e27e haskell-contravariant: fix build on GHC 7.10.x 2018-02-10 18:05:28 +01:00
Peter Simons
1d4529c7e2 cabal2nix: compile with hpack 0.25.0 2018-02-10 18:05:28 +01:00
Peter Simons
c8bc6163c0 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.8-24-g7642d25 from Hackage revision
ddb881454b.
2018-02-10 18:05:23 +01:00
Peter Simons
52628a27e7 hackage2nix: disable broken builds 2018-02-10 18:05:21 +01:00
Peter Simons
13dda44b8b haskell-with-packages-wrapper: don't bother with extraOutputsToInstall
symlinkJoin doesn't recognize this parameter, so this functionality has been
broken ever since 4b77d425aa5970f39f0637894075d2df8c1575c8.
2018-02-09 20:26:35 +01:00
Peter Simons
2c13435734 haskell-generic-builder: revert "set LD_LIBRARY_PATH in shellHook"
This reverts commit e73e5c884f5770110d99675db8495bb1535a6308. Please don't
set $LD_LIBRARY_PATH! Instead, pass appropriate --extra-include-dir and
--extra-lib-dir arguments to "cabal configure" to ensure that Cabal knows
about system dependencies.
2018-02-09 19:56:20 +01:00
Peter Simons
bd3379c443 haskell-generic-builder: include build-tool dependencies in shell environments
For a Haskell package "foo" the environment foo.env now contains the build tool
dependencies required for compiling the package in $PATH.

Fixes https://github.com/NixOS/cabal2nix/issues/331.
2018-02-09 19:56:20 +01:00
Peter Simons
8ff7ac4859
Merge pull request #34646 from clacke/hledger-darwin
hledger: build correctly on darwin
2018-02-07 08:32:59 +01:00
Daiderd Jordan
db7e0aeb42
llvm-packages: cleanup 2018-02-06 23:38:46 +01:00
Claes Wallin (韋嘉誠)
cc2c594a9b hledger*: build correctly on darwin
- mkdir -p $out/share/info rather than assuming $out/share is there
 - find .info and .man* files correctly on darwin -- don't try to
   match the specific system name, there is nothing to gain from that

nix calls darwin darwin, but ghc calls it osx in its directory names.

closes #34644
2018-02-07 01:32:16 +08:00
Peter Simons
a9268dd694
Merge pull request #34404 from deepfire/x-ghc-8.4-overrides
GHC 8.4 package overrides
2018-02-06 10:01:15 +01:00
Kosyrev Serge
ae1e9fbf87
ghc841 configuration: overrides 2018-02-06 05:33:07 +03:00
Shea Levy
39f62c770b
haxl: Disable non-deterministic tests 2018-02-05 13:00:12 -05:00
Peter Simons
af884f5607 cabal2nix: update build to hpack 0.24 2018-02-04 10:52:53 +01:00
Peter Simons
77e074829b hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.8-24-g7642d25 from Hackage revision
2499b1e31f.
2018-02-04 10:52:48 +01:00
Peter Simons
3ac304963c hackage2nix: use latest version of weeder by default 2018-02-04 10:52:18 +01:00
Shea Levy
943592f698
Add setFunctionArgs lib function.
Among other things, this will allow *2nix tools to output plain data
while still being composable with the traditional
callPackage/.override interfaces.
2018-01-31 14:02:19 -05:00
Peter Simons
6f93e0f749 fix GHC 8.4.x builds of hspec and test-framework 2018-01-31 16:03:59 +01:00
Peter Simons
866a1ed2d5 cabal2nix: build with hpack 0.23 2018-01-31 16:03:59 +01:00
Peter Simons
94b6357dc5 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.8-20-g7c22fdf from Hackage revision
d0f20cf258.
2018-01-31 16:03:54 +01:00
Peter Simons
b063a02320 LTS Haskell 10.4 2018-01-31 16:03:50 +01:00
pjan vandaele
bdffbc775e
Adds modifier option to developPackage 2018-01-30 12:29:59 +09:00
Peter Simons
b7e6ac1515 hledger: install man pages and info files
Make sure that hledger, hledger-ui, and hledger-web have their documentation
installed in locations where system tools can find them.

Fixes https://github.com/NixOS/nixpkgs/issues/34301.
2018-01-26 19:42:04 +01:00
Peter Simons
b83990dd76 haskell-hie-packages: disable broken Hydra builds 2018-01-26 13:01:12 +01:00
Peter Simons
71c76eadff hackage2nix: disable broken Hydra builds 2018-01-26 13:01:12 +01:00
Peter Simons
f8776eabdd cabal2nix: build with latest version of hpack 2018-01-26 13:01:12 +01:00
Peter Simons
4ec557eea9 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.8-16-gec0f902 from Hackage revision
6b78792753.
2018-01-26 13:01:12 +01:00
Peter Simons
03ef28473d haskell-tinc: drop broken non-Hackage package 2018-01-26 13:01:11 +01:00
Peter Simons
c83b455c7d haskell-intero-nix-shim: drop broken non-Hackage package 2018-01-26 13:01:11 +01:00
Peter Simons
05723c4d97 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.8-15-g0d15053 from Hackage revision
0d7f6b72e9.
2018-01-26 13:01:11 +01:00
Peter Simons
edf1d07173 hackage2nix: disable broken Hydra builds 2018-01-26 13:01:11 +01:00
Peter Simons
83b35508c6 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.8-11-g68a143c from Hackage revision
ddb65ce29d.
2018-01-26 13:01:11 +01:00
Peter Simons
f9700df56a lambdabot-core: add myself as a maintainer 2018-01-26 13:01:10 +01:00
Peter Simons
291c3681f6 cabal-plan: fix build by applying https://github.com/haskell-hvr/cabal-plan/pull/16 2018-01-26 13:01:10 +01:00
Peter Simons
da7833e7e6 cabal2spec: add myself as a maintainer 2018-01-26 13:01:10 +01:00
Peter Simons
eb5d7d2b26 haskell-lambdabot: fix build 2018-01-23 16:09:29 +01:00
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 5e31e828f88a8aa229d68bade00d9f2d70f7b9f8

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
Peter Simons
a1a3aeaa8f hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.7.2 from Hackage revision
1ec0a139aa.
2018-01-05 09:34:51 +01:00
Michael Alan Dorman
b1a1062dad text-icu: Some sort of testing issue with ghc-8.2 2018-01-05 09:34:25 +01:00
Peter Simons
be49066415
Merge pull request #33433 from obsidiansystems/haskell-misc
ghcWithPackages: Misc cleanups
2018-01-05 09:28:07 +01:00
John Ericson
ec2f121bed ghcWithPackages: Fix comment URL 2018-01-04 14:49:52 -05:00
John Ericson
dea9fceb0b ghcWithPackages: Get rid of unused passthrough
If you want the whole packages set...don't use ghcWithPackages.
2018-01-04 14:49:50 -05:00
Peter Simons
0a07a52506
Merge pull request #33425 from mpickering/stringbuilder
Use self rather than super to make stringbuilder overridable
2018-01-04 18:02:07 +01:00
Matthew Pickering
d7944aba3e Use self rather than super to make stringbuilder overridable 2018-01-04 16:54:38 +00:00
John Ericson
6bdf9a7f6d ghcWithPackages: Don't bother with ignoreCollisions cause we don't use buildEnv
SymlinkJoin doesn't know or care about this.
2018-01-04 11:45:36 -05:00
Robin Gloster
231754d995
haskellPackages.restless-git: fix build 2018-01-04 15:13:57 +01:00
Drew Hess
05824e66a1
haskell-modules: disable happy tests on armv7l-linux. 2018-01-03 16:03:26 -08:00
Drew Hess
260749cf5d
haskell-modules: split-objs is not supported on ARM. 2018-01-03 16:00:26 -08:00
Shea Levy
707cfbf39a
haskell: Add hoogle-5.0.14 for hie-hoogle.
5.0.14 is actually the version of hoogle in the stackage LTS we're
tracking, but due to
NixOS/cabal2nix@5c816fdee9 that isn't respected.
2018-01-03 14:59:39 -05:00
John Ericson
5e31e828f8 ghcWithPackages: Fix cross, and avoid needless C compiler 2018-01-03 01:24:57 -05:00
John Ericson
bc066466fb haskell generic-builder: Don't use absolute path to tools, and also track strip 2018-01-02 21:04:14 -05:00
John Ericson
a224dfc253 haskell infra: Fix cross as much as possible without changing hashes 2018-01-02 21:00:13 -05:00
Test
6ea37497cd loosen version bounds for lzma test dependencies 2018-01-02 17:43:40 -06:00
Frederik Rietdijk
804285f589 Merge remote-tracking branch 'upstream/staging' into HEAD 2018-01-02 19:10:45 +01:00
Shea Levy
34a91b7922
haskell: Fix depending on libs with internal libs on darwin.
Thanks to @hamishmack for the pointer.

Fixes #33149.
2018-01-02 11:37:54 -05:00
Peter Simons
81581ba381 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.7.2 from Hackage revision
d8aa793b33.
2018-01-02 12:44:26 +01:00
Peter Simons
b1fd018f90
Merge pull request #33271 from LumiGuide/ghc802-inline-c
haskell: configuration-ghc-8.0.x.nix: keep inline-c at 0.5.6.1
2018-01-02 10:15:07 +01:00
Bas van Dijk
cc9722b638 haskell: configuration-ghc-8.0.x.nix: keep inline-c at 0.5.6.1 2018-01-01 22:50:01 +01:00
Frederik Rietdijk
4cc2a38854 Merge remote-tracking branch 'upstream/master' into HEAD 2018-01-01 18:15:13 +01:00
Peter Simons
f448a79770 haskell-JuicyPixels: disable failing Haddock phase 2018-01-01 18:12:17 +01:00
Peter Simons
ca84a2dd1a hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.7.1-1-gc1b61fc from Hackage revision
5dc3be1712.
2018-01-01 18:12:17 +01:00
Peter Simons
e8f401e61b LTS Haskell 10.2 2018-01-01 18:12:16 +01:00
Vladimír Čunát
1fcd92ce92
Merge branch 'master' into staging
A few thousand rebuilds from master, again.
Hydra: ?compare=1422362
2017-12-31 09:53:49 +01:00
Peter Simons
ab3a12ed7e darcs: switch build to GHC 8.0.2 to fix it
Also, jailbreak the constraint on unix-compat <5.
2017-12-31 09:31:03 +01:00
Peter Simons
238d574846 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.7.1-1-gc1b61fc from Hackage revision
53970160fe.
2017-12-31 09:30:44 +01:00
Peter Simons
7f50608fb2 liquidhaskell: re-enable Hydra builds 2017-12-31 09:30:19 +01:00
John Ericson
4d2b763817
Merge pull request #26805 from obsidiansystems/cross-elegant
Make cross compilation elegant
2017-12-30 22:58:02 -05:00
John Ericson
e0f1739c75 treewide: Don't use nativePkgs or crossPkgs anymore 2017-12-30 22:04:22 -05:00
Peter Simons
2c557e1663
Merge pull request #33187 from NickHu/llvm-hs
llvm-hs: fix llvm-config dependency
2017-12-30 18:15:27 +01:00
Frederik Rietdijk
2d0bead714 Merge remote-tracking branch 'upstream/master' into HEAD 2017-12-30 17:04:54 +01:00
Peter Simons
016aa581a7 haskell: extend generic builder to recognize mis-configured Cabal 2.x builds
Cabal 1.x says:

 | Warning: This package indirectly depends on multiple versions of the same
 | package. This is highly likely to cause a compile failure.

But in version 2.x, that warning is split into two lines differently:

 | Warning:
 |     This package indirectly depends on multiple versions of the same package. This is very likely to cause a compile failure.

This commit modifies the call to "egrep" to recognize both versions by virtue
of the "-z" flag, which essentially interprets the whole configure-time output
as one long line.
2017-12-30 13:53:05 +01:00
Peter Simons
7eeea3d7e2 haskell: configure overrides to fix numerous package builds with GHC 7.10.3 2017-12-30 13:53:04 +01:00
Peter Simons
f84d863793 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.7.1-1-gc1b61fc from Hackage revision
fa9adf335b.
2017-12-30 13:53:04 +01:00
Peter Simons
0232282eb5 hackage2nix: disable broken Hydra builds
- Ping @khumba for failing "hoppy-runtime":
   https://hydra.nixos.org/build/66704172.

 - Drop "persistent-redis" from the list of maintained packages (@psibi)
   because it continues to fail: https://hydra.nixos.org/build/66704120.
2017-12-30 13:51:48 +01:00
Peter Simons
f5a501074f Drop Haskell package set for GHC 7.8.4.
We support only the last three major releases, i.e. 7.10.x is the latest
compiler we worry about.

The *compiler* is still there, though; it's just the package set that's been
removed.
2017-12-30 13:51:07 +01:00
Nick Hu
47c1711f68 llvm-hs: fix llvm-config dependency 2017-12-29 22:38:27 +00:00
Peter Simons
4a01a175a3
Merge pull request #33158 from shlevy/hslib-haskell-build-inputs-again
Revert "Revert "hslib: Function to extract the haskell build inputs of a package.""
2017-12-29 20:51:24 +01:00
Shea Levy
961907de47
Add haskell-ide-engine 2017-12-29 14:41:15 -05:00
Shea Levy
1ee61d8f23
Revert "Revert "hslib: Function to extract the haskell build inputs of a package.""
Trying again, without changing the generic builder.

This reverts commit 65138e8a411244c81aefa21be280323d30010b96.
2017-12-29 14:37:24 -05:00
Vladimír Čunát
a1a3e54ac9
Merge branch 'master' into staging
Haskell rebuild :-)
Hydra: ?compare=1421865
2017-12-29 18:39:36 +01:00
Peter Simons
40a3d775a5 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.7.1-1-gc1b61fc from Hackage revision
246f2ece36.
2017-12-29 15:47:44 +01:00
Peter Simons
504016f753
Merge pull request #32993 from shlevy/haskell-internal-libs
haskell generic-builder: Support installing internal libs.
2017-12-29 15:41:19 +01:00
Rickard Nilsson
1de251c664 haskellPackages.LDAP: Fix build 2017-12-29 11:42:20 +01:00
Vladimír Čunát
f29000b002
Merge branch 'master' into staging
Hydra: ?compare=1421760
2017-12-29 10:13:33 +01:00
Robin Gloster
ee1c85aee9 mariadb: lib -> connector-c 2017-12-29 02:18:35 +01:00
Peter Simons
65138e8a41 Revert "hslib: Function to extract the haskell build inputs of a package."
This reverts commit d545ef3fa11198f12e525b641aeb33887694f97f. Please don't
commit substantial changes to the generic Haskell builder without giving me a
chance to review them.
2017-12-28 19:23:41 +01:00
Shea Levy
a7334eb476
Merge branch 'hslib-haskell-build-inputs' 2017-12-28 11:24:45 -05:00
Peter Simons
635c10140f hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.7-7-g6012213 from Hackage revision
e61097beb3.
2017-12-27 21:33:17 +01:00
Peter Simons
071c6bb8ab LTS Haskell 10.1
Fixes https://github.com/NixOS/nixpkgs/issues/33097.
2017-12-27 21:33:12 +01:00
Peter Simons
39eb15b028 haskell-scalendar: break the infinite recursion to avoid evaluation errors
Suggested in https://github.com/NixOS/nixpkgs/pull/33077#issuecomment-353993598.
2017-12-27 18:33:45 +01:00
Peter Simons
adabca4b13
Revert "haskellPackages.{SC,sc}alendar: nullify to fix ofborg eval" 2017-12-26 22:24:30 +01:00
Piotr Bogdan
416d9bd7f8 haskellPackages.{SC,sc}alendar: nullify to fix ofborg eval 2017-12-26 16:52:36 +00:00
Michael Alan Dorman
48c4901a7a taggy: remove patch
The newly released 0.2.1 includes it.
2017-12-26 11:36:28 +01:00
Peter Simons
052fdc9427 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.7-5-g07d8814 from Hackage revision
72f75113ed.
2017-12-26 11:36:23 +01:00
Peter Simons
eb0da3e8af haskell: drop package sets for GHC 6.12.x, 7.0.x, 7.2.x, 7.4.x, and 7.6.x
These old package sets have been broken and unmaintained for a long time now.
2017-12-26 11:35:26 +01:00
Julien Langlois
aaf62f7f6e (haskell.packages.ghc802.ghc): (fix llvm dependency)
Fix incorrect LLVM dependency of GHC 8.0.x to be 3.7 instead of 3.5.
2017-12-25 23:45:19 +00:00
Shea Levy
d545ef3fa1
hslib: Function to extract the haskell build inputs of a package.
This works by extracting out some logic from generic-builder.nix to
make it possible to get at the relevant information by overriding
mkDerivation for the haskell package.
2017-12-23 11:44:18 -05:00
Shea Levy
b6d215aa79
haskell generic-builder: Support installing internal libs.
Fixes #32980.
2017-12-22 19:44:37 -05:00
Shea Levy
ea9b677046
haskellPackages.coordinate: Fix build on ghc 8.2 2017-12-22 14:04:59 -05:00
Shea Levy
e32bc0b5c0
haskellPackages.lenz: Fix against latest hs-functors 2017-12-22 13:54:01 -05:00
Shea Levy
4c66ebb0d1
hadoop-rpc: Fix build on ghc 8.2 2017-12-22 13:31:35 -05:00
Shea Levy
5e8a0786b0
Disable tests on haskellPackages.protobuf 2017-12-22 12:48:07 -05:00
Shea Levy
7f410df1c6
haskell-modules: Request older haddock-library to match haddock-api. 2017-12-22 09:16:12 -05:00
Shea Levy
302202ccde
haskellPackages.monad-memo: Fix testsuite 2017-12-22 09:11:41 -05:00
Shea Levy
bd424fdce9
ghc-exactprint: Fix build on GHC-8.2 2017-12-22 09:01:03 -05:00
Peter Simons
8cb0b71374
Merge pull request #32959 from alunduil/readd-network-uri-json
remove network-uri-json from dont-distribute-packages
2017-12-22 11:23:02 +01:00
Alex Brandt
b57fc1f183 remove siren-json from dont-distribute-packages
I've fixed the build issues with siren-json and uploaded the new package
to hackage.  This should be successful going forward.
2017-12-21 23:02:03 -06:00
Alex Brandt
cfa636c646 remove network-uri-json from dont-distribute-packages
I've fixed the build issues with network-uri-json and uploaded the new
package to hackage.  This should be successful going forward.
2017-12-21 17:14:13 -06:00
Pierre Radermecker
b8ac2ddf06 HaskellPackages.language-puppet: enable x86_64 build again
Timeout haddock issue has been fixed with PR #32896
2017-12-21 16:52:07 +01:00
Alex Brandt
ca7d54c1a1 add alunduil as maintainer for haskell packages
Adding myself, alunduil, as a maintainer on network-uri-json and
siren-json.
2017-12-20 21:01:35 -06:00
Michael Alan Dorman
8e6d5639c3 pointfree, taffybar: jailbreak 2017-12-20 20:59:33 +01:00
Peter Simons
211a1ee84b hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.7-5-g07d8814 from Hackage revision
4112e5cd3d.
2017-12-20 20:59:33 +01:00
Peter Simons
15b9537f37 haskell-wai-secure-cookies: drop obsolete overrides 2017-12-20 20:59:18 +01:00
Peter Simons
e4bb2a784d liquidhaskell: drop obsolete override 2017-12-20 20:59:18 +01:00
Peter Simons
e058744dd4 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.7-5-g07d8814 from Hackage revision
4112e5cd3d.
2017-12-20 20:59:18 +01:00
Peter Simons
acc6389bea hackage2nix: update list of broken builds
Ping @alunduil for broken "collection-json" build.
Ping @gridaphobe for broken ghc-srcspan-plugin build.
Ping @gebner for broken hledger-diff build.
Ping @khumba for broken hoppy-docs and hoppy-runtime builds.
Ping @psibi for broken persistent-redis build.
2017-12-20 20:59:04 +01:00
Peter Simons
c1dcbad256
Merge pull request #32821 from ttuegel/haskell/shell-env-build-inputs
haskell: set buildInputs in nix-shell env
2017-12-20 20:58:31 +01:00
Pierre Radermecker
3e22c56161 Haskell-language-puppet: don't build haddock 2017-12-20 15:16:57 +01:00
Orivej Desh
6e2df0aed8 haskellPackages.SCalendar: try to restore the bot capacity to evaluate
Remove infinite recursion between SCalendar and scalendar:

https://gist.github.com/GrahamcOfBorg/eb6d5675657ddc3cc3f054305b11dcb5
2017-12-20 10:08:36 +00:00
Orivej Desh
d3a375fe58 haskell-configuration-nix: fix eval 2017-12-20 09:50:21 +00:00
Peter Simons
d41f7655fb hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.7-5-g07d8814 from Hackage revision
4112e5cd3d.
2017-12-20 09:17:47 +01:00
Peter Simons
9a3158d486 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.7-5-gf18d849 from Hackage revision
4112e5cd3d.
2017-12-20 09:17:47 +01:00
Peter Simons
8909467b16 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.7-4-g48a154e from Hackage revision
4d733469c5.
2017-12-20 09:17:47 +01:00
Peter Simons
3ae4e2dcc9 haskell-graphviz: jailbreak to fix build with recent versions of QuickCheck 2017-12-20 09:17:46 +01:00
Peter Simons
dba09a202b stack: jailbreak to fix broken build in LTS-10.x 2017-12-20 09:17:46 +01:00
Peter Simons
4ab8999891 haskell-store: disable test suite to fix build with recent versions of smallcheck 2017-12-20 09:17:46 +01:00
Peter Simons
6922808372 haskell-path: disable test suite to fix build with recent versions of doctest 2017-12-20 09:17:46 +01:00
Peter Simons
a33d746223 haskell-genvalidity-property: jailbreak to fix build with recent versions of doctest 2017-12-20 09:17:46 +01:00
Peter Simons
5119549255 haskell-config-ini: disable test suite which fails with GHC 8.2.2 2017-12-20 09:17:46 +01:00
Peter Simons
04bd949738 haskell-nix-derivation: jailbreak to fix build with QuickCheck 2.10+ 2017-12-20 09:17:46 +01:00
Peter Simons
48c0621cdf haskell-int-cast: jailbreak to fix build with QuickCheck 2.10+ 2017-12-20 09:17:46 +01:00
Peter Simons
68be4071ed haskell-text-short: jailbreak to fix build with recent tasty-quickcheck 2017-12-20 09:17:46 +01:00
Peter Simons
5a55704605 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.7-4-g48a154e from Hackage revision
e7b871e45e.
2017-12-20 09:17:46 +01:00
Peter Simons
277e0a72f5 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.7-3-gb265c2e from Hackage revision
e2ac8e8816.
2017-12-20 09:17:46 +01:00
Peter Simons
2a097c9c02 haskell-blaze-html: jailbreak to fix build with QuickCheck 2.10+ 2017-12-20 09:17:46 +01:00
Peter Simons
91a864f3d7 haskell-attoparsec: disable test suite to fix build with QuickCheck 2.10+ 2017-12-20 09:17:46 +01:00
Peter Simons
914d1aa19b haskell-blaze-markup: jailbreak to fix build with QuickCheck 2.10+ 2017-12-20 09:17:46 +01:00
Peter Simons
cde067b3ac haskell-cryptohash-*: jailbreak to fix build with recent tasty-quickcheck 2017-12-20 09:17:46 +01:00
Peter Simons
6372613259 cabal-install: drop obsolete overrides 2017-12-20 09:17:46 +01:00
Peter Simons
a5d5d03a97 haskell-cryptohash-sha256: jailbreak to fix build with recent tasty-quickcheck 2017-12-20 09:17:46 +01:00
Peter Simons
2a742f6aef haskell-edit-distance: jailbreak to fix build with QuickCheck 2.10+ 2017-12-20 09:17:46 +01:00
Peter Simons
45e819dd49 haskell-configuration-common: drop obsolete overrides 2017-12-20 09:17:46 +01:00
Peter Simons
e2c6ccf71f haskell-scalendar: mark package as broken 2017-12-20 09:17:46 +01:00
Peter Simons
3e524aa06f haskell-configuration-common: drop obsolete overrides 2017-12-20 09:17:46 +01:00
Peter Simons
1c0c6d80e7 haskell-configuration-nix: drop obsolete overrides 2017-12-20 09:17:46 +01:00
Peter Simons
9e99aab45c haskell-configuration-ghc-8.2.x: drop obsolete overrides 2017-12-20 09:17:46 +01:00
Peter Simons
46351ad4b7 haskell-pandoc: drop obsolete constraints 2017-12-20 09:17:45 +01:00
Michael Alan Dorman
053c466073 vector-builder: Break recursion 2017-12-20 09:17:45 +01:00
Michael Alan Dorman
4fa4348dea Remove various package overrides 2017-12-20 09:17:45 +01:00
Michael Alan Dorman
461f311e35 haskell-src-exts: 1.19.1 is now the default version 2017-12-20 09:17:45 +01:00
Michael Alan Dorman
22ef441cfa optparse-applicative: 0.14 is now the default version
Remove references to when it was non-default.
2017-12-20 09:17:45 +01:00
Peter Simons
9f30660e02 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.7-2-gcba0663 from Hackage revision
ad20994c04.
2017-12-20 09:17:45 +01:00
Peter Simons
f1736d1d42 hackage2nix: downgrade llvm-hs to avoid bug in cabal-install
$ cabal get llvm-hs
  Downloading llvm-hs-5.1.1...
  Invalid package llvm-hs-5.1.1
2017-12-20 09:17:44 +01:00
Peter Simons
c13330c160 LTS Haskell 10.0 2017-12-20 09:17:44 +01:00
Peter Simons
523fae925c haskell-pandoc-citeproc: update override 2017-12-19 13:58:52 +01:00
Peter Simons
d323c38082 haskell-htoml-megaparsec: update override for latest megaparsec version 2017-12-19 13:58:52 +01:00
Peter Simons
ee75081370 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.7-2-gcba0663 from Hackage revision
d1e90f94f3.
2017-12-19 13:58:47 +01:00
Peter Simons
53a18401ff hackage2nix: update list of broken builds 2017-12-19 13:58:45 +01:00
Peter Simons
1c988f97e9 LTS Haskell 9.20 2017-12-19 13:58:45 +01:00
Thomas Tuegel
86311030cf
haskell: set buildInputs in nix-shell env
systemBuildInputs goes in buildInputs (instead of nativeBuildInputs) so that
NIX_CFLAGS_* is set correctly and gcc works.
2017-12-18 13:49:18 -06:00
Peter Simons
2737faba47
Merge pull request #32746 from jtojnar/bustle
haskellPackages.bustle: build icons and metadata
2017-12-17 08:42:05 +01:00
Jan Tojnar
07c375d9fc
haskellPackages.bustle: build icons and metadata 2017-12-16 22:42:30 +01:00
Peter Simons
874dbb14c1 git-annex: update hash for version 6.20171214 2017-12-15 16:32:56 +01:00
Peter Simons
bd0f541dbb haskell-colour: disable test suite to avoid infinite recursion 2017-12-15 13:11:16 +01:00
Peter Simons
a215e145e4 haskell-configuration-common: cosmetic 2017-12-15 13:11:15 +01:00
Peter Simons
647cda9dfe haskell-hoogle: fix build of latest version 2017-12-15 13:11:15 +01:00
Peter Simons
432d58593e haskell-pandoc: fix override for latest version 2017-12-15 13:11:15 +01:00
Peter Simons
04c4002190 haskell-hpack: fix override for latest version 2017-12-15 13:11:15 +01:00
Peter Simons
efb94191cc hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.7-2-gcba0663 from Hackage revision
15a894ee48.
2017-12-15 13:11:11 +01:00
Peter Simons
11da669334 LTS Haskell 9.18 2017-12-15 13:10:46 +01:00
quxbar
b0340b6f48
type-of-html should build now 2017-12-13 09:16:31 +01:00
Peter Simons
265d68e8ca haskell-pandoc-2.x: update overrides 2017-12-11 18:46:41 +01:00
Peter Simons
ee3d43f978 stack: update default version to 1.6.1
Allow building with either ghc 8.0.x or 8.2.x.
2017-12-11 18:46:41 +01:00
Peter Simons
b0ca52b24c haskell-hpack: new versions need latest HUnit to compile their test suite 2017-12-11 18:46:41 +01:00
Peter Simons
56ebd91299 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.7-2-gcba0663 from Hackage revision
53aaa393b6.
2017-12-11 18:46:41 +01:00
Peter Simons
8294c7d9df hackage2nix: disable failing builds 2017-12-11 18:46:39 +01:00
Peter Simons
75cc0ff85f hackage2nix: add old hpack version to make stack-1.6.1 happy 2017-12-11 18:46:39 +01:00
Michael Alan Dorman
3ddc73a5d1 hackage2nix: keep old haskell-src-exts_1_19_1 around
Needed for hindent and structured-haskell-mode. At the same time, though, we
can drop the older 1.18 version, which is no longer required by hoogle.
2017-12-11 18:46:39 +01:00
Peter Simons
cb6725ea05 LTS Haskell 9.17 2017-12-11 18:46:39 +01:00
Nick Hu
a3d7d3e7cf pandoc2: fix Haskell dependencies 2017-12-07 21:25:29 +00:00
Shea Levy
42519a0f87
callCabal2nix: Take advantage of new hpack support. 2017-12-07 15:26:51 -05:00
Peter Simons
fb1660439b
Merge pull request #32324 from rvl/tmp-postgres
haskellPackages.tmp-postgres: Add pginit dependency
2017-12-06 08:30:20 +01:00
Rodney Lorrimar
e1c4beb818 haskellPackages.tmp-postgres: Add pginit dependency 2017-12-06 04:31:05 +00:00
Peter Simons
8abcedd90e haskell-utf8-string: fix build with ghc 7.4.x 2017-12-05 21:01:51 +01:00
Peter Simons
c722252251 idris: update overrides for new 1.1.1 default version 2017-12-05 21:01:50 +01:00
Peter Simons
8737c9668b haskell-Cabal: update overrides for new 2.0.1.1 release 2017-12-05 21:01:50 +01:00
Peter Simons
1e027f1a0f hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.7 from Hackage revision
497e5d18db.
2017-12-05 21:01:50 +01:00
Peter Simons
d7d8b76f39 LTS Haskell 9.16 2017-12-05 21:01:50 +01:00
Peter Simons
8d8061ec20
Revert "Revive multiple outputs for Haskell packages." 2017-12-05 09:36:08 +01:00
Peter Simons
7993e8790f
Merge pull request #32112 from nc6/hask-split-out
Revive multiple outputs for Haskell packages.
2017-12-04 12:36:45 +01:00
Peter Simons
ce777a26f6 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.7 from Hackage revision
766fbc64fb.
2017-12-02 10:08:45 +01:00
Jonathan Curran
75b79fb5db Use override instead of overrideScope 2017-11-29 15:47:44 -07:00
Jonathan Curran
7775a1a60e purescript: fix build by overriding optparse-applicative dependency 2017-11-29 14:52:29 -07:00
Peter Simons
cf1e09013e git-annex: update hash for new version 6.20171124 2017-11-29 10:47:07 +01:00
Peter Simons
f2dd899a67 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.7 from Hackage revision
7428a6b894.
2017-11-29 10:47:03 +01:00
Peter Simons
98bf2860e4 hackage2nix: disable failing builds 2017-11-29 10:47:01 +01:00
Peter Simons
6610c3557d hackage2nix: keep language-c-0.7.0 around in the package set for c2hs hack 2017-11-29 10:45:36 +01:00
Nicholas Clarke
dc0e594451 Fix 'ghcWithPackages' as per https://github.com/NixOS/nixpkgs/issues/32082 2017-11-27 16:09:03 +00:00