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
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
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