Commit Graph

3786 Commits

Author SHA1 Message Date
Peter Simons 1bc120fa5f git-annex: update sha256 hash for new version 7.20181031 2018-11-02 19:22:17 +01:00
Peter Simons 7766df8eba hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.11.1-2-g57c4f0f from Hackage revision
98ec0eee2d.
2018-11-02 19:22:10 +01:00
Peter Simons 508ce6e208 haskellPackages: default to ghc 8.4.4 as per Stackage LTS 12.16 2018-11-02 19:21:58 +01:00
Peter Simons 3d5f7e368f haskell-polyparse: drop obsolete override for ghc-8.6.x 2018-10-31 12:09:59 +01:00
Peter Simons cd68a8c7cc haskell-fltkhs-themes: disable Hydra build to avoid evaluation errors 2018-10-31 12:09:59 +01:00
Peter Simons 1bc42cb193 haskell-xmobar: drop obsolete override for ghc-8.6.x 2018-10-31 12:09:59 +01:00
Peter Simons b376d55e52 haskell-easytest: drop obsolete override for ghc-8.6.x 2018-10-31 12:09:59 +01:00
Peter Simons 5d18129ce8 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.11.1-2-g57c4f0f from Hackage revision
b6545b2cd8.
2018-10-31 12:09:54 +01:00
Peter Simons 771849af9e LTS Haskell 12.16 2018-10-31 12:09:49 +01:00
John Ericson 26fa9d2b51
Merge pull request #49477 from obsidiansystems/haskell-shell-completions
haskell-lib: Factor out shell completion scripts helper
2018-10-30 15:25:03 -04:00
John Ericson c34f5176f1 haskell-lib: Factor out shell completion scripts helper 2018-10-30 14:49:58 -04:00
Bas van Dijk 945c6b9981
Merge pull request #48699 from ElvishJerricco/overridable-buildFromSdist
haskell.lib.buildFromSdist: Allow overrideCabal
2018-10-26 11:17:24 +01:00
Peter Simons 26974e962e cabal2nix: fix build with ghc 8.4.x 2018-10-25 11:12:38 +02:00
Peter Simons f1fd7da406 haskell-lucid: drop obsolete override 2018-10-25 11:12:38 +02:00
Peter Simons 84b6bf8226 haskell-pandoc-types: drop obsolete override 2018-10-25 11:12:38 +02:00
Peter Simons cfbf9cbf39 haskell-yesod-core: drop obsolete override 2018-10-25 11:12:38 +02:00
Peter Simons c66c169f81 stack: fix the ghc 8.4.x build 2018-10-25 11:12:38 +02:00
Peter Simons 19013d8092 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.11.1-1-g9fae38b from Hackage revision
5124fd5742.
2018-10-25 11:12:38 +02:00
Peter Simons d81e10ab83 LTS Haskell 12.14 2018-10-25 11:12:38 +02:00
John Ericson 6b81005e66
Merge pull request #48688 from ElvishJerricco/shellFor-nativeBuildInputs
haskellPackages.shellFor: Add nativeBuildInputs [Fixes #48435]
2018-10-19 12:19:45 -04:00
Peter Simons 2f9a6d648b ghc-8.6.x: disable mpd support in xmobar
libmpd does not compile with the latest version of ghc.
2018-10-19 14:44:23 +02:00
Peter Simons b5c725f122 haskell-HaTeX: jailbreak to fix the build with ghc-8.6.x 2018-10-19 14:44:23 +02:00
Peter Simons a4be65dac2 haskell-wl-pprint-extras: jailbreak to fix the build with ghc-8.6.x 2018-10-19 14:44:23 +02:00
Peter Simons 6c2f00e4e5 haskell-fgl: ignore the new cabal revision published on Hackage 2018-10-19 14:44:23 +02:00
Peter Simons 0fdbed7f53 haskell-base-compat-batteries: fix build with ghc-8.0.x 2018-10-19 14:44:23 +02:00
Peter Simons 488e41e8df haskell-hledger-ui: jailbreak to fix build with ghc-8.6.1 2018-10-19 14:44:23 +02:00
Peter Simons 0f92a347e9 haskell-brick: jailbreak to fix build with ghc-8.6.1 2018-10-19 14:44:23 +02:00
Peter Simons 5860a9dc73 haskell-vty: use the latest version when building with ghc-8.6.1 2018-10-19 14:44:23 +02:00
Peter Simons d393b89965 stack: prefer the ghc-8.6.1 version
Building stack with ghc-8.4.x requires a whole lot of version overrides -- most
notably Cabal 2.4.x --, so we don't bother and just use the one built with the
latest compiler instead.
2018-10-19 14:44:22 +02:00
Peter Simons 13c666d81c haskell-hledger: jailbreak to fix build with ghc-8.6.1 2018-10-19 14:44:22 +02:00
Peter Simons 2f055cec0a stack: jailbreak to fix build with ghc-8.6.1 2018-10-19 14:44:22 +02:00
Peter Simons 4ec2418dda stack: drop obsolete override after version update 2018-10-19 14:44:22 +02:00
Peter Simons 8d54a1efe6 haskell-neat-interpolation: we cannot use the latest version without megaparsec 7.x 2018-10-19 14:44:22 +02:00
Peter Simons 1643a57fd0 haskell-monad-par: disable the test suite to fix the build with ghc-8.6.1 2018-10-19 14:44:22 +02:00
Peter Simons 60744d784a haskell-wizards: jailbreak to fix build with ghc-8.6.1 2018-10-19 14:44:22 +02:00
Peter Simons 5891201db2 haskell-ledger-lib: jailbreak to fix build with ghc-8.6.1 2018-10-19 14:44:22 +02:00
Peter Simons 79f5e5d365 haskell-cassava-megaparsec: jailbreak to fix build with ghc-8.6.1 2018-10-19 14:44:22 +02:00
Peter Simons 6d070d3ad0 haskell-hspec-megaparsec: jailbreak to fix build with ghc-8.6.1 2018-10-19 14:44:22 +02:00
Peter Simons 91caf69a40 haskell-megaparsec: jailbreak to fix build with ghc-8.6.1
We cannot update to megaparsec-7.x because hledger does not support it.
2018-10-19 14:44:22 +02:00
Peter Simons 147c88256e haskell-config-ini: jailbreak to fix build with ghc-8.6.1 2018-10-19 14:44:22 +02:00
Peter Simons 156e0b0788 haskell-lucid: jailbreak to fix build with ghc-8.6.1 2018-10-19 14:44:22 +02:00
Peter Simons f96a244034 haskell-data-clist: jailbreak to fix build with ghc-8.6.1 2018-10-19 14:44:22 +02:00
Peter Simons 2745a36f2c ghc-8.6.x: we need the latest pandoc version for this compiler 2018-10-19 14:44:22 +02:00
Peter Simons 2e0f10b3d7 haskell-easytest: apply patches to fix the build with ghc-8.6.x 2018-10-19 14:44:22 +02:00
Peter Simons d4fb2748f1 haskell-skylighting-core: the test suite fails when built with ghc-8.6.x 2018-10-19 14:44:22 +02:00
Peter Simons 88a93b14ae ghc-8.6.x: jailbreak pandoc-types to fix the build (of the test suite) 2018-10-19 14:44:22 +02:00
Peter Simons a96f91df0f ghc-8.6.x: update hslua to latest version to fix the build 2018-10-19 14:44:22 +02:00
Peter Simons 876ea22caf haskell-yesod-core: update version to fix the test suite 2018-10-19 14:44:22 +02:00
Peter Simons d6d0871c51 ghc-8.6.x: HTF does not compile 2018-10-19 14:44:22 +02:00
Peter Simons 95ae25600e ghc-8.6.x: update overrides 2018-10-19 14:44:22 +02:00
Peter Simons d210479e65 haskell-texmath: drop obsolete override 2018-10-19 14:44:22 +02:00
Peter Simons ba64a13d69 haskell-haddock-api: disable broken override 2018-10-19 14:44:22 +02:00
Jack Henahan ed2370d8c4 haskellPackages.hasktags: remove dontCheck
https://github.com/MarcWeber/hasktags/issues/52 has been closed and a new version (0.71.1) has been released.
2018-10-19 14:44:22 +02:00
Peter Simons 5ee4818211 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.11.1-1-g9fae38b from Hackage revision
a013b65658.
2018-10-19 14:44:22 +02:00
Will Fancher bc56701020 haskell.lib.buildFromSdist: Allow overrideCabal [Fixes #45018] 2018-10-19 04:49:56 -04:00
Will Fancher 2ebc3034d3 haskellPackages.cabal-helper: Jailbreak restrictive bounds. [Fixes #45515] 2018-10-19 04:29:21 -04:00
Will Fancher a93c777c63 haskellPackages.cabal-macosx: Tests don't build with Cabal >= 2.2 2018-10-18 19:12:25 -04:00
Will Fancher 0ee01e6c2e haskellPackages.shellFor: Add nativeBuildInputs [Fixes #48435] 2018-10-18 18:32:53 -04:00
Ryan Mulligan 0c72f4c517
Merge pull request #48564 from kadena-io/master
Add name parameter to developPackage
2018-10-17 12:54:43 -07:00
Doug Beardsley c3c82aa675 Update developPackage documentation 2018-10-17 14:44:07 -04:00
Doug Beardsley d36c55a530 Add name parameter to developPackage 2018-10-16 09:38:57 -04:00
Drew Hess 46f937dddd
haskellPackages.language-nix: disable tests on aarch64.
The test suite fails on aarch64 with a linker error that looks
suspiciously like this outstanding GHC issue:

https://ghc.haskell.org/trac/ghc/ticket/15275

Note that this change also fixes the existing `isi686` check to
conform to the new cross-compiling arch check.
2018-10-15 20:07:27 -04:00
Drew Hess 321626d5ee
haskellPackages.cryptonite: fix for aarch64.
This is a cherry-pick from upstream (see
https://github.com/haskell-crypto/cryptonite/issues/234); there has
been no upstream release since the fix was committed.
2018-10-15 17:11:32 -04:00
Drew Hess c8a59e8453
haskellPackages.cryptonite: re-enable tests.
This has been fixed since cryptonite-0.7:

https://github.com/haskell-crypto/cryptonite/issues/28

cryptonite is also no longer listed in expected-test-failures in
Stackage.
2018-10-15 16:31:59 -04:00
Peter Simons fe91334fbf haskell-yesod-core: disable broken test suite 2018-10-15 12:39:17 +02:00
Peter Simons 1e44702fc0 git-annex: update sha256 hash for the new 6.20181011 version 2018-10-15 12:39:17 +02:00
Peter Simons c6c29def60 cabal2nix: update overrides for latest yaml version 2018-10-15 12:39:17 +02:00
Peter Simons 21daeb2059 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.11.1 from Hackage revision
15d56e428a.
2018-10-15 12:39:13 +02:00
Peter Simons 5dbe6ac45b hackage2nix: disable failing Hydra builds 2018-10-15 12:39:13 +02:00
Peter Simons e04931e019 LTS Haskell 12.13 2018-10-15 12:37:35 +02:00
Silvan Mosberger 1d512468aa
Merge pull request #48015 from rnhmjoj/shell-conduit
haskellPackages.shell-conduit: fix build
2018-10-14 21:17:23 +02:00
Ryan Mulligan 07f8104707 treewide: fix evaluation with `allowAliases = false` 2018-10-13 15:32:07 -07:00
Sarah Brofeldt ff8d252c2d
Merge pull request #48000 from erictapen/arbtt-jailbreak
haskellPackages.arbtt: jailbreak
2018-10-13 12:51:06 +02:00
Bas van Dijk 5ea9d9d097
haskell: add GitHub issues to non-hackage-packages.nix 2018-10-12 14:17:48 +02:00
Bas van Dijk b64193f69b
haskellPackages.multi-ghc-travis: removed in favour of haskell-ci
multi-ghc-travis has been renamed to haskell-ci which is now also on Hackage.
2018-10-12 14:17:24 +02:00
Bas van Dijk 7b49b870cb
haskell: have a dedicated file for non Hackage packages
We had a few "overrides" in configuration-common.nix that were really
extensions. They introduced packages that weren't in hackage-packages.nix.

The advantage of having a dedicated file for these packages is that we can still
place Nix-specific overrides to these packages in configuration-nix.nix. We
weren't able do this before because configuration-nix.nix extended only the
packages from hackage-packages.nix.
2018-10-12 14:12:29 +02:00
Bas van Dijk 0c25079958
futhark: introduce the top-level futhark attribute
The fact that futhark is a Haskell package is an implementation detail. To
install it users should just have to specify `futhark` instead of
`haskellPackages.futhark`.

Additionally futhark is overridden with `haskell.lib.justStaticExecutables` to
reduce closure size.
2018-10-12 14:12:29 +02:00
Silvan Mosberger d26c303bef
futhark: init at 0.6.2 2018-10-12 14:11:30 +02:00
Domen Kožar 9e502600ba
stack2nix: fix build 2018-10-08 18:45:46 +01:00
Peter Simons 478eff0225 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.11.1 from Hackage revision
23ec1f32c6.
2018-10-08 18:38:39 +02:00
Peter Simons 6ec4ebf6f8 LTS Haskell 12.12 2018-10-08 18:38:38 +02:00
rnhmjoj 096be6d941
haskellPackages.shell-conduit: fix build 2018-10-07 16:45:05 +02:00
Justin Humm a01cab05c6
haskellPackages.arbtt: unbreak with jailbreak 2018-10-07 14:13:37 +02:00
Drew Hess 4babe7f799
haskell: re-enable aarch64, but disable parallel builds on that arch.
This is a workaround for unreliable parallel Haskell builds on
aarch64. See https://ghc.haskell.org/trac/ghc/ticket/15449
2018-10-05 01:28:42 -04:00
Peter Simons c5d4957103 haskell-lens: use latest version when building with ghc-8.6.x 2018-10-03 18:00:29 +02:00
Peter Simons 975c77e2d5 haskell-free and base-orphans: use latest versions to fix build with ghc-8.6.x 2018-10-03 18:00:29 +02:00
Peter Simons 5334751964 haskell-hspec: fix overrides to use the newer QuickCheck version 2018-10-03 18:00:29 +02:00
Peter Simons 2d098f7ef6 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.11.1 from Hackage revision
007086bd5b.
2018-10-03 18:00:29 +02:00
Peter Simons e6195f704f haskell-semigroupoids: update to latest version for ghc-8.6.x 2018-10-03 18:00:29 +02:00
Silvan Mosberger 5067773e39 haskellPackages.*.env: Use shellFor 2018-10-03 18:00:29 +02:00
Silvan Mosberger 56da05d459 haskellPackages.shellFor: Clean and fixup
- Now correctly sets NIX_GHC* env vars
2018-10-03 18:00:29 +02:00
Silvan Mosberger 7c5c3fceff haskell.lib.getBuildInputs: Use generic builder passthru to implement 2018-10-03 18:00:29 +02:00
Tim Steinbach 22e39f642b
xmonad-extras: jailbreak
Our XMonad identifies as 0.15, which is why we need to jailbreak it
into the extras build
2018-10-03 07:48:49 -04:00
Matthew Bauer a88b8da554
Merge pull request #47676 from matthewbauer/security-mojave-fix
haskell: fix x509-system on mojave
2018-10-02 15:18:39 -05:00
Matthew Bauer 300ff965ae haskell: fix x509-system on mojave
darwin.security_tool is currently broken in Mojave. See issue #45042
for more info. Our security_tool stuff comes from 10.9 so I suspect
that it needs an update.

Here I am putting in a hack to get things working again. This uses the
system provided security binary at /usr/bin/security to avoid the
issue in Haskell’s x509-system package. Unfortunately, this will break
with the sandbox. I am also working on a proper fix, but this requires
updating lots of Apple stuff (and also copumpkin’s new CF). You can
follow the progress on this branch:

  https://github.com/matthewbauer/nixpkgs/tree/xcode-security

This commit should be backported to release-18.03 and release-18.09.

/cc @copumpkin @lnl7 @pikajude
2018-10-02 15:14:11 -05:00
Peter Simons a4badb243c hledger: fix build of new version 1.11 2018-10-02 21:08:48 +02:00
Peter Simons 8f400527a7 haskell-hspec: update ghc-8.6.x overrides for version 2.5.8 2018-10-02 21:08:47 +02:00
Peter Simons 8841b09c0f haskell-doctest: drop obsolete override for ghc-8.6.x 2018-10-02 21:08:47 +02:00
Peter Simons ab1a64fe6a hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.11.1 from Hackage revision
8d7d987c0d.
2018-10-02 21:08:42 +02:00
Peter Simons d072586714 LTS Haskell 12.11 2018-10-02 21:07:59 +02:00
Peter Simons c917407575 haskell-texmath: patch to fix build with ghc-8.6.x 2018-09-28 12:11:20 +02:00
Peter Simons d994f1cfd4 git-annex: update sha256 for new version 6.20180926 2018-09-28 11:16:42 +02:00
Peter Simons fd02cfd3ba hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.11.1 from Hackage revision
deb25ca305.
2018-09-28 11:16:42 +02:00
Peter Simons 2c5e1c003a haskell-hslogger: use latest version when building with ghc-8.6.x 2018-09-28 11:16:42 +02:00
Peter Simons bb5638e54a haskell-lens: put override into alphabetical order 2018-09-28 11:16:42 +02:00
Peter Simons 89223a9380 haskell-control-monad-free: mark broken when building with ghc-8.6.x 2018-09-28 11:16:42 +02:00
Peter Simons 9f660351a4 haskell-Glob: use latest version when building with ghc-8.6.x 2018-09-28 11:16:42 +02:00
Peter Simons b68e320e3a haskell-JuicyPixels: use latest version when building with ghc-8.6.x 2018-09-28 11:16:42 +02:00
Peter Simons 147c5da7bc haskell-lens: disable test suite to fix build with ghc-8.6.x 2018-09-28 11:16:42 +02:00
Peter Simons 35cf30bd8e haskell-fgl: fix build with ghc-8.6.x 2018-09-28 11:16:42 +02:00
Bas van Dijk 0ab8fa2181
Merge pull request #47424 from Taneb/dontcheck-generic-lens
haskellPackages.generic-lens: dontCheck
2018-09-28 10:55:38 +02:00
Nathan van Doorn 550fe159f0 haskellPackages.generic-lens: apply patch to fix tests 2018-09-28 09:42:36 +01:00
Sarah Brofeldt 5c45ca0943 haskellPackages.term-rewriting: doJailbreak and dontCheck 2018-09-28 09:45:22 +02:00
Peter Simons e797f37d02 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.11.1 from Hackage revision
8d69413ed8.
2018-09-27 15:14:13 +02:00
Peter Simons b70f4ff218 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.11.1 from Hackage revision
35d90c5e25.
2018-09-27 15:14:12 +02:00
Peter Simons 424f6b9341 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.11.1 from Hackage revision
a4158051bb.
2018-09-27 15:14:12 +02:00
Peter Simons 44f68ab3ef haskell-doctest: fix build with ghc-8.6.x 2018-09-27 15:14:12 +02:00
Peter Simons a2cbfd961b haskell-hspec: fix build with ghc-8.6.x 2018-09-27 15:14:11 +02:00
Peter Simons f705ee21f6 Update overrides for ghc-8.6.x. 2018-09-24 21:19:35 +02:00
Peter Simons 873476c55a haskell-hspec-core: use latest version when building with ghc 8.6.x 2018-09-24 21:19:35 +02:00
Peter Simons 9de1461f45 haskell-stm: update overrides for the new 2.5.x version 2018-09-24 21:19:35 +02:00
Peter Simons 21dc7a6aa5 haskell-text: update overrides for the new version 2018-09-24 21:19:35 +02:00
Peter Simons 9e963c020e haskell-stm: update overrides for the new 2.5.x version 2018-09-24 21:19:34 +02:00
Peter Simons dbffdee9d2 Add a couple of overrides to fix build with GHC 8.6.1. 2018-09-24 21:19:34 +02:00
Peter Simons c50365ec92 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.11.1 from Hackage revision
be1e8a29d2.
2018-09-24 21:19:29 +02:00
Peter Simons 2fc9fee6b2 hackage2nix: disable broken Hydra builds 2018-09-24 21:18:51 +02:00
Bas van Dijk 36e8d638d4 haskellPackages.haddock-api: fix build
Also remove haddock-library == 1.4.4 since it's not needed anymore
2018-09-24 01:57:09 +02:00
Bas van Dijk e1d51fa9e6 haskellPackages.yi-core: use overrideScope instead of override 2018-09-24 01:57:09 +02:00
Bas van Dijk 1d7b922238 haskellPackages.safe-money-*: use overrideScope instead of override 2018-09-24 01:57:09 +02:00
Bas van Dijk 38467261c3 haskellPackages.Frames: use overrideScope instead of override 2018-09-24 01:57:09 +02:00
Bas van Dijk 9b67908e67 haskellPackages.Euterpea: fix build by using PortMidi == 0.2 2018-09-23 22:50:04 +02:00
Bas van Dijk 73cf1c26d8 haskellPackages.Frames-beam: disable tests because it requires a running PostgreSQL server 2018-09-23 21:57:17 +02:00
Bas van Dijk ff6122c993 haskellPackages.Frames: fix build by using vinyl-0.10.0 2018-09-23 21:54:25 +02:00
Peter Simons 7a036a5cbe hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.11.1 from Hackage revision
c75652c02b.
2018-09-22 13:26:33 +02:00
Bas van Dijk 73862bf812 haskellPackages.mandrill: fix build for ghc843 2018-09-21 19:08:25 +02:00
John Ericson 8a41a11d66
Merge pull request #47096 from obsidiansystems/fix-x509-system
haskellPackages.x509-system: Override based on the host, not target platform
2018-09-20 21:55:24 -04:00
John Ericson 45c637d8a0 haskellPackages.x509-system: Override based on the host, not target platform
There were many reverts back and forth, but it ultimately appears that I
am the source of this mistake. I clarified the comment so as not to
confuse myself or anyone else.
2018-09-20 21:48:06 -04:00
Nathan van Doorn c8598daad4 haskellPackages.sbv: fix location of z3 executable
A lot of the functionality of the z3 library depends on it being able to
find the z3 executable on $PATH. Hard-coding it here means it will never
be unable to find it and z3 doesn't need to pollute $PATH.
2018-09-20 11:45:16 +01:00
Peter Simons 6e4c666a67 git-annex: update sha256 hash for new version 6.20180913 2018-09-19 21:04:41 +02:00
Peter Simons c18a0becf2 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.11.1 from Hackage revision
439b9af37f.
2018-09-19 21:04:41 +02:00
Peter Simons 72e2ab2c72 cabal2nix: update yaml override to the latest version 2018-09-19 21:04:41 +02:00
Michael Alan Dorman c5467e8f73 cabal-install: use newer version of Cabal library 2018-09-19 21:04:41 +02:00
Peter Simons 4b129a73db hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.11.1 from Hackage revision
d5215acecc.
2018-09-19 21:04:41 +02:00
Peter Simons 234a24cbeb LTS Haskell 12.10 2018-09-19 21:04:40 +02:00
Peter Simons 3c95fb13ee
Merge pull request #46893 from costrouc/costrouc/pandoc-crossref-refactor
haskellPackages.pandoc-crossref: refactor disable tests for 0.3.2.1
2018-09-19 20:50:50 +02:00
Chris Ostrouchov e1ed5b26c9
haskellPackages.pandoc-crossref: refactor disable tests for 0.3.2.1
Author acknowleges test failing (change when no longer 0.3.2.1).
https://github.com/lierdakil/pandoc-crossref/issues/199
2018-09-19 14:47:41 -04:00
John Ericson f4be0b45dd
Merge pull request #46872 from obsidiansystems/cross-haskell-ar-flag
haskell infra: Also pass `--with-ar` in cross builds
2018-09-18 19:14:13 -04:00
John Ericson 750933a17c haskell infra: Also pass `--with-ar` in cross builds 2018-09-18 18:49:58 -04:00
Nathan van Doorn d6dc56180b
haskellPackages.JuicyPixels: re-enable Haddock
This was made to avoid an issue which was fixed in `3.2.9.3`. The version currently in `nixpkgs 18.03` is `3.2.9.4`, which includes this fix.
2018-09-18 15:29:58 +01:00
Bas van Dijk 0a30853461
Merge pull request #46512 from michaelpj/imp/haskell-benchmarks
haskell lib: add --enable-benchmarks in doBenchmark
2018-09-18 14:57:03 +02:00