mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-21 05:25:38 +00:00
Code Issues Wiki Activity
127610 commits 191 branches 125 tags 9.2 GiB
Commit graph

2828 commits

Author SHA1 Message Date
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
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 65138e8a41.
 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 d545ef3fa1. 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