Peter Simons
5b73d202ab
haskell-jailbreak-cabal: build with Cabal 2.2.x in ghc-8.2.x package set
2018-05-30 03:46:16 +02:00
Peter Simons
852e9dc448
haskell-brick: update override for ghc 8.4.x
2018-05-30 03:46:16 +02:00
Peter Simons
9ef8d70d23
haskell-graphviz: override dependency versions to fix the build
...
Closes https://github.com/ivan-m/graphviz/issues/34 .
2018-05-30 03:46:16 +02:00
Peter Simons
60d8e82558
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.9.2-17-g580e4ea from Hackage revision
ae1b1485e2
.
2018-05-30 03:46:16 +02:00
Peter Simons
28ca28296f
LTS Haskell 11.11
2018-05-30 03:45:54 +02:00
Orivej Desh
e4df80a69b
haskellPackages.hlibgit2: fix build after #28029
2018-05-29 23:57:23 +00:00
Ryan Mulligan
e8c5d867a1
use https for default Hackage homepage
2018-05-28 12:48:16 -07:00
Profpatsch
ac404fd9e7
haskellPackages: mark yarn2nix broken w/ message
2018-05-28 17:28:53 +02:00
Jan Malakhovski
ad35019501
Merge branch 'master' into staging
...
Fixed conflicts:
- lib/systems/for-meta.nix: in favor of staging
- pkgs/os-specific/darwin/xcode/default.nix: in favor of master
2018-05-26 00:20:17 +00:00
John Ericson
2e70a75b12
haskell generic-builder: Limit usage of --extra-framework-dirs for compat
2018-05-25 14:52:58 -04:00
John Ericson
ce0180dfd5
Merge pull request #40996 from obsidiansystems/cross-ghc
...
ghc, haskell-infra: #40929 take 2
2018-05-25 11:09:07 -04:00
John Ericson
d7144e708b
Merge remote-tracking branch 'upstream/master' into staging
2018-05-23 16:00:04 -04:00
Peter Simons
9c2b4e53fa
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.9.2-13-gd8bc043 from Hackage revision
9866f7be16
.
2018-05-23 18:21:13 +02:00
Peter Simons
f9524a48f3
LTS Haskell 11.10
2018-05-23 18:21:13 +02:00
Peter Simons
ba47d40db9
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.9.2-13-gd8bc043 from Hackage revision
4e1741ad6f
.
2018-05-23 18:21:13 +02:00
Peter Simons
e7abee1939
hackage2nix: disable failing builds on Hydra
2018-05-23 18:21:12 +02:00
Moritz Angermann
63e5b3ce71
used stdenv.targetPlatform.isDarwin and not stdenv.isDarwin.
2018-05-23 10:27:42 -04:00
Moritz Angermann
87afa66a63
haskell infra: Adds buildFlags logic
2018-05-23 10:27:42 -04:00
Moritz Angermann
affeb0cb80
haskell generic builder: Do the links
dance only if shared is enabled.
2018-05-23 10:27:41 -04:00
Moritz Angermann
a4d5dbd45d
haskell generic builder: Disable static libs on Windows because no -staticlib
...
The reason why this does not work is not that we can't built static
objects, we can, but we can't use `-staticlib` on GHC on windows.
`-staticlib` rolls all dependencies into a combined archive. While this
would work on windows if we used gnu ar and MRI script, GHC can't rely
on GNU ar, and as such has a quick archive concatenation module for GNU
and BSD archives only.
2018-05-23 10:27:41 -04:00
Moritz Angermann
38fbdcc726
haskell generic builder: Use setup package database for setup-depends
...
Adapted from b69f420121
by @Ericson2314
2018-05-23 10:27:41 -04:00
John Ericson
e1b9419dec
haskell generic builder: setupHaskellDepends
should be `nativeBuildInputs
...
This is because they are just for Setup.hs, so they are just used at build time
and completely isolated from the normal components' dependencies.
This was previous implemented in 8a8f0408cd
, but
reverted in e69c7f5641
because it broken
setup-depends non-cross in haskell shell environments (custom Setup.hs in cross
shell environments has never worked). This version adds a special native
exception to avoid that breakage.
2018-05-23 10:27:39 -04:00
John Ericson
513cd3de0e
haskell-generic-builder: Add extra framework dirs
...
Just like with the other `--extra-*` flags, cc/ld-wrapper already handles
this, but we need to make Cabal aware so that the haskell builds have
the correct metadata.
2018-05-23 10:26:57 -04:00
John Ericson
3394c96655
haskell generic-builder: Tiny changes that preserve hases
...
These bring us closer to staging at no cost
2018-05-23 10:23:06 -04:00
John Ericson
446cb32ea1
haskell generic-builder: Remove merge conflict
...
I forgot this in 17316643fd
2018-05-23 10:11:03 -04:00
John Ericson
18742471af
Merge remote-tracking branch 'upstream/master' into staging
...
Use newer vagrant from master
2018-05-23 09:40:37 -04:00
Peter Simons
8f96324584
haskell-lambdabot-core: apply patch from @int-e to fix GHC 8.4.x build
2018-05-23 12:24:31 +02:00
Peter Simons
5db3a9df5e
Revert "ghc, haskell infra: #40642 direct to master"
2018-05-23 09:36:16 +02:00
Peter Simons
0e35858252
Merge pull request #40929 from obsidiansystems/cross-ghc-for-master
...
ghc, haskell infra: #40642 direct to master
2018-05-22 20:37:45 +02:00
Tuomas Tynkkynen
f9feacfc7c
Merge remote-tracking branch 'upstream/master' into staging
2018-05-22 17:48:29 +03:00
Peter Simons
07a045922d
Merge pull request #40710 from ElvishJerricco/overrideCabal-getHaskellBuildInputs
...
Make getHaskellBuildInputs / shellFor work with overrideCabal (Fixes #40266 )
2018-05-22 10:37:26 +02:00
Peter Simons
e9d991a938
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.9.2-13-gd8bc043 from Hackage revision
a5d0811a16
.
2018-05-22 10:32:09 +02:00
Peter Simons
3e2a3b4f12
hackage2nix: keep haddock-library 1.5.x around
2018-05-22 10:31:39 +02:00
John Ericson
db4d77779c
Merge remote-tracking branch 'upstream/master' into staging
2018-05-21 20:21:48 -04:00
John Ericson
d6ecbbe921
Merge branch 'staging' into feature/clean-ghc
2018-05-21 17:43:30 -04:00
Moritz Angermann
f914fdd960
used stdenv.targetPlatform.isDarwin and not stdenv.isDarwin.
2018-05-21 15:11:11 -04:00
Moritz Angermann
82a847a04b
haskell infra: Adds buildFlags logic
2018-05-21 15:11:11 -04:00
Moritz Angermann
5e589a4049
haskell generic builder: Do the links
dance only if shared is enabled.
2018-05-21 15:11:11 -04:00
Moritz Angermann
4ea33def46
haskell generic builder: Disable static libs on Windows because no -staticlib
...
The reason why this does not work is not that we can't built static
objects, we can, but we can't use `-staticlib` on GHC on windows.
`-staticlib` rolls all dependencies into a combined archive. While this
would work on windows if we used gnu ar and MRI script, GHC can't rely
on GNU ar, and as such has a quick archive concatenation module for GNU
and BSD archives only.
2018-05-21 15:11:11 -04:00
Moritz Angermann
15759df660
haskell generic builder: Use setup package database for setup-depends
...
Adapted from b69f420121
by @Ericson2314
2018-05-21 15:11:10 -04:00
John Ericson
900862ea3b
haskell generic builder: setupHaskellDepends
should be `nativeBuildInputs
...
This is because they are just for Setup.hs, so they are just used at build time
and completely isolated from the normal components' dependencies.
This was previous implemented in 8a8f0408cd
, but
reverted in e69c7f5641
because it broken
setup-depends non-cross in haskell shell environments (custom Setup.hs in cross
shell environments has never worked). This version adds a special native
exception to avoid that breakage.
2018-05-21 15:09:51 -04:00
Will Fancher
1f348e41a4
Dont test enclosed exceptions
2018-05-20 13:24:28 -04:00
Vladimír Čunát
392e6de7d0
Merge branch 'master' into staging
2018-05-20 13:20:53 +02:00
Peter Simons
49fc5f0044
git-annex: update sha256 hash for the new version
2018-05-19 22:24:31 +02:00
Peter Simons
c2dd77c440
haskell-vector-sized: update override for the latest version
2018-05-19 22:24:30 +02:00
Peter Simons
b558e43753
haskell-hspec: use version 2.5.1 for ghc-8.4.x
2018-05-19 22:24:30 +02:00
Peter Simons
d83d20c11b
haskell-pandoc: update override for ghc-8.4.x
2018-05-19 22:24:30 +02:00
Peter Simons
02834ba458
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.9.2-13-gd8bc043 from Hackage revision
a6208828bf
.
2018-05-19 22:24:21 +02:00
Peter Simons
9cd1702502
LTS Haskell 11.9
2018-05-19 22:24:18 +02:00
John Ericson
2241dedbe6
Merge pull request #40442 from obsidiansystems/cabal-frameworks
...
haskell-generic-builder: Add extra framework dirs
2018-05-18 18:08:20 -04:00