Commit graph

3060 commits

Author SHA1 Message Date
Jude Taylor
d6a0652d6d
Merge pull request #37509 from pikajude/darwin-hs-dynamic
Haskell: fix static libs on darwin
2018-03-21 14:36:08 -07:00
Peter Simons
3c6dcdb74e
Merge pull request #37588 from mpickering/pure-zlib
dontCheck pure-zlib
2018-03-21 18:19:56 +01:00
Matthew Pickering
4a3ad82bcd dontCheck pure-zlib
Fixes #37499
2018-03-21 17:16:20 +00:00
Will Dietz
2a30ab3865
Merge pull request #37486 from dtzWill/fix/ghc-glibcLocales
haskell: only use glibcLocales when using glibc
2018-03-20 22:55:44 -05:00
Jude Taylor
0458c7b885 fix static libs on darwin 2018-03-20 15:26:00 -07:00
Will Dietz
8727284a4b haskell: only use glibcLocales when using glibc
Fixes eval w/musl.

Possible alternative would be using glibcLocales
when it is non-null, to avoid duplicating the logic.
2018-03-20 14:38:40 -05:00
Moritz Angermann
918edbe485 haskell-generic-builder: Add enableHsc2hsViaAsm for Windows cross compilation 2018-03-20 15:27:02 -04:00
John Ericson
0c52fe9702
Merge pull request #37460 from obsidiansystems/host-meta-platforms-fixes
treewide: `meta.platforms` fixes now that it tracks the host platform
2018-03-20 13:08:54 -04:00
John Ericson
65e24f22e6 haskell-generic-builder: Default to window + unix platforms,
Since GHC is a cross compiler, it's perfectly possible to make haskell
binaries on platforms without GHCs. `windows ++ unix` seems good enough
for now.

Also don't default `hydraPlatforms` to `platforms`. The former must be a
list of systems (strings), but the latter is a list of systems or
patterns.
2018-03-20 13:02:53 -04:00
Peter Simons
97d56e94fa haskell-getopt-generics: override to latest version for ghc-8.4.x 2018-03-20 16:23:12 +01:00
Peter Simons
ad1cd53ec8 haskell-src: drop obsolete override for ghc 8.4.x 2018-03-20 16:23:12 +01:00
Peter Simons
92935aeac8 haskell-conduit: drop obsolete override for ghc 8.4.x 2018-03-20 16:23:12 +01:00
Peter Simons
e4a5fea87f haskell-blaze-builder: drop obsolete override for ghc 8.4.x 2018-03-20 16:23:12 +01:00
Peter Simons
c9777cdf9d haskell-SHA: the new version has fixed the test suite failure 2018-03-20 16:23:12 +01:00
Peter Simons
a413639a26 haskell-th-printf: drop obsolete override for ghc 8.4.x 2018-03-20 16:23:12 +01:00
Peter Simons
53309758e3 haskell-matrix: the new version has fixed the test suite failure 2018-03-20 16:23:12 +01:00
Peter Simons
61d4538812 LTS Haskell 11.1
This update was generated by hackage2nix v2.9.1-1-g63041e4 from Hackage revision
6aec0b311c.
2018-03-20 16:23:12 +01:00
Jan Tojnar
47bbd819c7
haskell-configuration-common: disable some tests depending on tasty-hunit-0.9 2018-03-20 13:34:38 +01:00
Graham Christensen
81da63f003
Merge pull request #37132 from srhb/haddock-wrapped
haskellPackages.ghcWithPackages: Wrap haddock with GHC lib dir
2018-03-19 10:27:36 -04:00
Peter Simons
54c1ca5fe9 haskell-xmonad: patch to fix the build with ghc-8.4.x 2018-03-17 21:16:49 +01:00
Peter Simons
13b154aee4 haskell-data-inttrie: patch to fix the build with ghc-8.4.x 2018-03-17 21:16:49 +01:00
Peter Simons
b8ab77c1f0 haskell-th-printf: jailbreak to fix the build with ghc-8.4.x 2018-03-17 21:16:49 +01:00
Peter Simons
c044a82caf haskell-json: patch to fix the build with ghc-8.4.x 2018-03-17 21:16:49 +01:00
Peter Simons
148646e630 haskell-matrix: override to latest version for ghc-8.4.x 2018-03-17 21:16:49 +01:00
Peter Simons
93d241e3dd haskell-timezone-olson: override to latest version for ghc-8.4.x 2018-03-17 21:16:49 +01:00
Peter Simons
7d5a69c265 haskell-GenericPretty: drop obsolete override for ghc-8.4.x 2018-03-17 21:16:49 +01:00
Peter Simons
8848a95575 haskell-boxes: drop obsolete override for ghc-8.4.x 2018-03-17 21:16:49 +01:00
Peter Simons
cedf31b04a haskell-brick: override to latest version to fix build with ghc-8.4.x 2018-03-17 21:16:49 +01:00
Peter Simons
84bd9be9ce haskell-cabal2spec: fix build with ghc-8.2.x 2018-03-17 21:16:49 +01:00
Peter Simons
69c7aabbf8 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.9.1-1-g63041e4 from Hackage revision
f91c8f61e9.
2018-03-17 21:16:49 +01:00
Peter Simons
03cae069fe haskell-pandoc: use current git version when building with ghc-8.4.x 2018-03-17 21:16:48 +01:00
Peter Simons
bb6b99287b cabal2nix: drop obsolete overrides for ghc-8.4.x 2018-03-17 21:16:48 +01:00
Peter Simons
3c978a82ca haskell-doctemplates: drop obsolete override for ghc-8.4.x 2018-03-17 21:16:48 +01:00
Peter Simons
b59905bfe4 haskell-conduit: use latest version when compiling with ghc-8.4.x 2018-03-17 21:16:48 +01:00
Peter Simons
e772848b44 haskell-tasty: drop obsolete override for ghc-8.4.x 2018-03-17 21:16:48 +01:00
Peter Simons
6a71804bea hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.9.1 from Hackage revision
04b554ad3b.
2018-03-17 21:16:48 +01:00
Peter Simons
38bd7183c5 brick: undo update to revision 1, which breaks the build with GHC 8.2.2
Hopefully, upstream fixes this quickly.
2018-03-17 11:42:36 +01:00
Peter Simons
6fbf6efcf3 haskell-esqueleto: drop the markBroken for ghc 8.4.1
Although accurate, the override causes evaluation errors that serve little
purpose but poison our dashboard at [1].

[1] https://hydra.nixos.org/jobset/nixpkgs/haskell-updates
2018-03-17 08:21:24 +01:00
Peter Simons
fe0be794fb haskell-pandoc-types: update override for ghc 8.4.x 2018-03-17 08:21:23 +01:00
Peter Simons
f3f5d68ca3 haskell-generic-builder: cosmetic 2018-03-17 08:21:23 +01:00
Peter Simons
1978fa444d haskell-generic-builder: disable shared executable linking by default
This change raises the question of whether we should disable building of shared
libraries altogether (since we don't link them). Unfortunately, we can't,
because GHC expects shared libraries to be around when building and running
test suites, and no amount of passing --disable-shared flags at configure time
changes the fact. I *guess* that's related to the DYNAMIC_GHC_PROGRAMS = YES
flag we set when building GHC itself, but I haven't investigated it further
yet.

Closes https://github.com/NixOS/nixpkgs/issues/29011.
2018-03-17 08:21:23 +01:00
Peter Simons
db5be10a4a haskell-generic-builder: fix confusion about --enable-static vs. --enable-library-vanilla 2018-03-17 08:21:23 +01:00
Peter Simons
d7beae33dc haskell-generic-builder: always compile with --enable-library-for-ghci 2018-03-17 08:21:23 +01:00
Peter Simons
a62b24be6d haskell-generic-builder: drop obsolete splitObjs function argument 2018-03-17 08:21:23 +01:00
Peter Simons
7f5fba75e2 haskell-generic-builder: compile profiling library variants by default
Unless specified otherwise, the default package set compiles library variants
for profiling with profiling-detail "all-functions". Executables, however, are
not built with profiling enabled.

This change increases the closure size for many Haskell programs, but the
practical advantage of having stack traces and performance measurements easily
available during development seems to outweigh that cost.

Closes https://github.com/NixOS/nixpkgs/issues/22340.
2018-03-17 08:21:22 +01:00
Peter Simons
408d441df0 git-annex: update sha256 hash for the new version 2018-03-17 08:21:22 +01:00
Peter Simons
929dac413b cabal2nix: update hpack version override 2018-03-17 08:21:22 +01:00
Peter Simons
7d043f036c haskell-configuration-common: cosmetic, no functional change 2018-03-17 08:21:22 +01:00
Peter Simons
9df1d15a28 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.9-10-gc1333d1 from Hackage revision
bad3dc0ed6.
2018-03-17 08:21:17 +01:00
Peter Simons
c81d3e72e8 hackage2nix: disable failing Hydra builds 2018-03-17 08:21:16 +01:00