Commit graph

2295 commits

Author SHA1 Message Date
Peter Simons
027ffb6429 Merge pull request #23252 from ljli/ghc7103-pkgs-fixes
haskell ghc710x packages fixes
2017-03-02 19:07:12 +01:00
3noch
4b77d425aa
Fix GHCJS HEAD patch; support GHCJS libdir link; use full ghcEnv for GHCJS
Original:
f3110651c8

(With some tweaks from @cstrahan)

closes #23199
2017-03-02 11:35:11 -05:00
Robin Gloster
ec98c1d8f4
haskellPackages.cabal-lenses: add comment to upstream issue 2017-03-02 11:03:25 +01:00
Peter Simons
9e72734826 haskell-yaml: build with bundled libyaml rather than our system version
It looks like the yaml package bundles an unreleased version of libyaml and
relies on particulars of that versions behavior. Therefore, the package no
longer works with the official libyaml 0.1.7 release, which is what we have.

https://github.com/snoyberg/yaml/issues/106
2017-03-02 09:05:07 +01:00
Peter Simons
2e5a4b1a38 haskell-lambdabot: fix evaluation 2017-03-02 09:05:07 +01:00
Peter Simons
53d55cbfe9 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.1 from Hackage revision
d654ea25e9.
2017-03-02 09:05:06 +01:00
Peter Simons
eabf47b302 hackage2nix: disable builds that depend on broken webkitgtk-2.4.11 2017-03-02 09:05:00 +01:00
Peter Simons
86c51da755 LTS Haskell 8.3 2017-03-02 09:04:25 +01:00
Peter Simons
feffadefed haskell generic-builder: Revert "Pass through the ghcEnv."
This reverts commit a27bc8b317. Please don't add
random stuff to the interface provided by the generic builder without
coordinating with others. There is a proper effort underway to provide that
information in https://github.com/NixOS/nixpkgs/pull/23023.
2017-03-01 19:57:40 +01:00
Peter Simons
3001b821c9 haskell generic-builder: Revert "Pass through the list of haskell build inputs."
This reverts commit c153036525. Please don't add
random stuff to the interface provided by the generic builder without
coordinating with others. There is a proper effort underway to provide that
information in https://github.com/NixOS/nixpkgs/pull/23023.
2017-03-01 19:57:18 +01:00
Shea Levy
c153036525 haskell generic-builder: Pass through the list of haskell build inputs.
Useful for building custom envs.
2017-03-01 13:00:57 -05:00
Robin Gloster
b2919b454f
haskellPackages.cabal-lenses: fix build 2017-03-01 17:26:09 +01:00
Shea Levy
dbd7a73d0b Merge branch 'master' of github.com:NixOS/nixpkgs 2017-03-01 11:11:50 -05:00
Robin Gloster
a3e4321297
haskellPackages.rank1dynamic: fix build 2017-03-01 17:09:21 +01:00
Robin Gloster
fd770dd176
haskellPackages.OrderedBits: fix build 2017-03-01 17:09:21 +01:00
Shea Levy
a27bc8b317 haskell generic-builder: Pass through the ghcEnv.
Will be useful for nix-buffer
2017-03-01 11:05:50 -05:00
Robin Gloster
12ca09d14e
haskellPackages.machines: fix build 2017-03-01 15:56:16 +01:00
Robin Gloster
eea7819af8
haskellPackages.gl: fix build 2017-03-01 15:51:18 +01:00
Robin Gloster
080b28054a
haskellPackages.DPutils: fix build 2017-03-01 15:39:38 +01:00
Leon Isenberg
1a4ec414a4 haskell: ghc710x packages: fix megaparsec 2017-02-28 16:19:14 +01:00
Leon Isenberg
b59fd85dd6 haskell: ghc710x packages: fix gtk2hs-buildtools 2017-02-28 16:19:13 +01:00
Peter Simons
fdc716046f Merge pull request #23263 from expipiplus1/haskell-bench
haskell-packages: use benchmark over bench
2017-02-28 14:33:23 +01:00
Joe Hermaszewski
8788bfe762 haskell-packages: use benchmark over bench 2017-02-28 09:27:29 +00:00
Peter Simons
e1908d4e21 Merge branch 'master' into haskell-extensible 2017-02-28 09:14:50 +01:00
Leon Isenberg
386ddc739c haskell: add semigroups dependency to optparse-applicative for GHC < 8 2017-02-27 20:36:19 +01:00
Leon Isenberg
24c93619e9 haskell: break dependency cycle between QuickCheck and semigroups for GHC < 8
The cycle:
QuickCheck -> semigroups
semigroups -> hashable
semigroups -> unordered-containers
unordered-containers -> hashable
unordered-containers -> QuickCheck # test suite only
hashable -> QuickCheck # test suite only
2017-02-27 20:36:19 +01:00
Leon Isenberg
1aa6d77af4 haskell: add semigroups dependency to Quickcheck for GHC < 8 2017-02-27 20:36:19 +01:00
Leon Isenberg
172a2bbeaf haskell: ghc710x packages: remove obsolete configurations 2017-02-27 20:36:19 +01:00
Joe Hermaszewski
4ab570a6d0 haskell-packages: Add minimal benchDepends support
See also: https://github.com/NixOS/cabal2nix/pull/262
2017-02-27 12:23:11 +00:00
Domen Kožar
14b6f2a837 Merge pull request #23235 from expipiplus1/haskell-bench
haskell-packages: Add minimal benchDepends support
2017-02-27 12:57:25 +01:00
Joe Hermaszewski
fdd9d7fe4c haskell-packages: Add minimal benchDepends support
See also: https://github.com/NixOS/cabal2nix/pull/262
2017-02-27 11:56:33 +00:00
Domen Kožar
e649974271 Merge pull request #22613 from shajra/fix/9871-3
Haskell infrastructure: fix #9871 (overrideCabal)
2017-02-27 12:54:27 +01:00
Bjørn Forsman
3d104ab2b3 gst-plugins-base: align attrname with pkgname 2017-02-27 12:16:26 +01:00
Gabriel Gonzalez
8beee1ec2d Fix pkgs.haskellPackages.gtk build
Haskell's `gtk` package requires the `have-quartz-gtk` flag to be built on OS X
when using the Quartz backend
2017-02-26 13:21:35 -08:00
Charles Strahan
65a228a2b1
haskellPackages: use makeExtensible 2017-02-25 17:38:38 -05:00
Nikolay Amiantov
cf29810281 haskellPackages.lambdabot: jailbreak 2017-02-23 13:13:22 +03:00
Gabriel Ebner
b66ec6026c idris: jailbreak
Fixes #23048
2017-02-22 17:36:36 +01:00
Peter Simons
8bc0ece0f1 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.0.4-12-gf83834c from Hackage revision
fbb2c029b0.
2017-02-20 15:28:45 +01:00
Peter Simons
5e3eea0cd3 LTS Haskell 8.2 2017-02-20 15:28:38 +01:00
Domen Kožar
5fc89a6778
language-ecmascript: jailbreak 2017-02-19 20:30:13 +01:00
Peter Simons
7734d159d1 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.0.4-12-gf83834c from Hackage revision
cc52bff6e8.
2017-02-19 20:12:44 +01:00
Nikolay Amiantov
aefb01a945 haskellPackages.lambdabot: maintain 2017-02-19 20:12:44 +01:00
Rodney Lorrimar
1078758b12 haskellPackages.lentil: no longer needs overrides 2017-02-19 17:13:09 +00:00
Arseniy Seroka
fe5ea1ba82 Merge pull request #22742 from volhovM/feature/fix-orgmode-parse-tests
Disable orgmode-parse tests in configuration-common.nix
2017-02-19 16:16:54 +03:00
Benno Fünfstück
785fbfac65 haskell: add nix-specific fixes for various packages in stackage"
This reverts commit fd0e0cdc76.

http-streams test suite is no longer broken, but still needs to be
disabled due to cyclic dependencies (http-streams(test) -> snap ->
http-streams)
2017-02-19 11:34:21 +01:00
Thomas Tuegel
fd0e0cdc76
Revert "haskell: add nix-specific fixes for various packages in stackage"
This reverts commit 17c5ca9018.

This commit causes an evaluation error due to infinite recursion, which can be
tested by running:
```
$ nix-env -f . -qa \* --meta --xml --drv-path --show-trace > /dev/null
```
2017-02-18 12:48:05 -06:00
Nikolay Amiantov
32560d2699 haskellPackages.lambdabot: fix build 2017-02-18 19:33:22 +03:00
Nikolay Amiantov
713918a094 haskellPackages.pointfree: fix build 2017-02-18 19:33:22 +03:00
Benno Fünfstück
17c5ca9018 haskell: add nix-specific fixes for various packages in stackage
With these overrides, nearly all of the stackage packages in the latest
stackage release should compile now.
2017-02-18 14:34:53 +01:00
Vladimír Čunát
432dba859e
Merge branch 'staging'
A security update of libxml2 is within.
2017-02-18 08:59:29 +01:00
Sarah Brofeldt
d26ac6afa4 haskellPackages.xmonad-extras: jailbreak to allow xmonad 0.13 (#22927)
Fixes https://github.com/NixOS/nixpkgs/issues/22919
2017-02-18 04:07:55 +01:00
Vladimír Čunát
e962a3c95f
Merge branch 'master' into staging 2017-02-16 19:02:37 +01:00
Peter Simons
3c0b1919e7 git-annex: update sha256 hash for the new version 2017-02-16 11:49:42 +01:00
Peter Simons
5e910bcbf6 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.0.4-12-gf83834c from Hackage revision
2701517fd6.
2017-02-16 11:49:11 +01:00
Peter Simons
918a5926c6 hackage2nix: drop obsolete extra packages 2017-02-16 11:48:10 +01:00
Bas van Dijk
8a928708b4 haskell: add support for Haskell Program Coverage (HPC) to the generic builder
A function is added to enable the generation of a HPC report. For example:

  pkgs.haskell.lib.doCoverage drv

will create a HPC report of the Haskell package drv in the directory:

  $out/share/hpc

Closes https://github.com/NixOS/nixpkgs/pull/22797/files.
2017-02-15 16:17:41 +01:00
Peter Simons
1a0cddad80 Merge pull request #22834 from Profpatsch/data-pprint
haskellPackages: data-pprint jailbreak
2017-02-15 16:06:58 +01:00
Profpatsch
d6fdba7f45 haskellPackages: data-pprint jailbreak 2017-02-15 15:44:30 +01:00
Peter Simons
cb2499acd0 Merge pull request #22805 from LumiGuide/fix-hoogle-ghcjs
ghcWithHoogle: fix for ghcjs
2017-02-15 13:05:06 +01:00
Jude Taylor
0637f83fb8
update xmonad nix patch to apply to new xmonad 2017-02-14 16:51:55 -08:00
Bas van Dijk
057fae5ea0 ghcWithHoogle: fix for ghcjs
`haskell.packages.ghcjs.ghcWithHoogle` failed because the following line:

  for docdir in ${ghc.doc}/${docLibGlob}/*; do

failed because `doc` is not an attribute of `ghc` when `ghc` is
substituted for ghcjs.
2017-02-14 22:50:29 +01:00
John Wiegley
3a0efcc4ca
configuration-common: http-api-data is now at version 0.3.5 2017-02-14 10:42:46 -08:00
Rickard Nilsson
8665250844 haskellPackages.dirstream: jailbreak 2017-02-14 13:48:44 +01:00
Rickard Nilsson
232639ccbb haskellPackages: Remove jailbreak for xxhash and Glob (fixed upstream) 2017-02-14 13:47:12 +01:00
Michael Raskin
3508b4832f haskellPackages: fgl, fgl-arbitrary: jailbreak (w.r.t. hspec for tests) 2017-02-14 13:23:28 +01:00
Mikhail Volkhov
035e2028d8
Disable orgmode-parse tests in config-common.nix 2017-02-13 17:13:02 +03:00
Domen Kožar
1b02439b61
servant-server: disable testsuite 2017-02-13 14:54:55 +01:00
Peter Simons
8821b3899e haskell-lens: disable doctest suite to work around https://github.com/ekmett/lens/issues/713 2017-02-13 12:22:18 +01:00
Peter Simons
216d277095 haskell-servant: update hash for the documentation download 2017-02-13 12:22:17 +01:00
Peter Simons
e60992354b haskell-hspec-contrib: disable test suite due to https://github.com/hspec/hspec/issues/307 2017-02-13 12:22:17 +01:00
Peter Simons
c37e51fa68 haskell-stack: jailbreak to work around https://github.com/commercialhaskell/stack/issues/3001 2017-02-13 12:22:17 +01:00
Peter Simons
7a6648f20e haskell-uuid{,-types}: jailbreak to work around https://github.com/hvr/uuid/issues/28 2017-02-13 12:22:17 +01:00
Peter Simons
30b762a977 haskell-vector: disable the test suite to work around https://github.com/haskell/vector/issues/138 2017-02-13 12:22:17 +01:00
Peter Simons
8968bff461 haskell-case-insensitive: jailbreak to work around https://github.com/basvandijk/case-insensitive/issues/24 2017-02-13 12:22:16 +01:00
Peter Simons
0583ffb7c2 haskell-system-filepath: disable test suite to remove dependency on chell-quickcheck
chell-quickcheck does not support recent versions of QuickCheck and
therefore does not compile in LTS 8.x.
2017-02-13 12:22:16 +01:00
Peter Simons
7b96859cab haskell-parsec: jailbreak to work around https://github.com/aslatter/parsec/issues/68 2017-02-13 12:22:16 +01:00
Peter Simons
29a1db9a97 haskell-lifted-base: jailbreak to work around https://github.com/basvandijk/lifted-base/issues/34 2017-02-13 12:22:16 +01:00
Peter Simons
958b100827 haskell-common: drop overrides that have become obsolete with LTS 8.x 2017-02-13 12:22:09 +01:00
Peter Simons
5d3bb96f62 LTS Haskell 8.0
This includes an update to hackage-packages.nix, which was generated by hackage2nix v2.0.4-11-gd82133a
from Hackage revision 53fcf98366.
2017-02-13 12:21:04 +01:00
Sukant Hajra
98617ccb99 Haskell infrastructure: fix #9871 (overrideCabal)
As per the recommendation by @Mathnerd314, this change seems to work
with the testing I did.

It makes sense to me why it works, but I think it's in an important
enough place that someone with much deeper knowledge of Haskell
infrastructure in Nixpkgs should give it a really heavy review.

I also consolidated all the overrideCabal definitions (there were two)
into a single definition in haskell-modules/lib.nix.
2017-02-09 23:07:40 -06:00
Peter Simons
055ab6ba74 Merge pull request #21589 from NixOS/ghc-split-sections
GHC 8.0.2: use -split-sections
2017-02-09 11:17:31 +01:00
Nikolay Amiantov
45368ed49d haskellPackages.typed-process: disable tests
Networking is required for them.
2017-02-08 17:39:55 +03:00
Domen Kožar
01ca916411
haskell: distribute servant-{elm,docs,auth,auth-server} and logging-effect 2017-02-08 06:11:04 +01:00
Benno Fünfstück
b33124a143 haskell-download: don't test (requires networking) 2017-02-07 15:13:30 +01:00
Benno Fünfstück
57507f08e8 haskell-modules: split off nix-specific overrides and common ones
This allows the nix-specific overrides to be reused for other purposes,
with different haskell package sets, etc.
2017-02-07 15:13:23 +01:00
Peter Simons
5a0368b87c hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.0.4-10-g05c4803 from Hackage revision
5720a6c584.
2017-02-07 15:13:15 +01:00
Peter Simons
d0492177e3 hackage2nix: update list of broken packages 2017-02-07 15:12:13 +01:00
Peter Simons
868eb826e1 LTS Haskell 7.19 2017-02-07 15:12:13 +01:00
Domen Kožar
f031f3105a
GHC 8.0.2: use -split-sections
-split-sections replaced -split-objs with following upsides:

1) -split-objs adds considerable overhead to compile time

2) combined with stripping, it causes issues when cross-compiling

For upstream see https://ghc.haskell.org/trac/ghc/ticket/8405

This is supported only for Linux/Windows using ld linker.

GHC master also turns on -split-sections by default.

Example using stack:

Without splitting

  $ du /nix/store/5paayhibayr73zqfaj458g4k4mv108jn-stack-1.3.2
  4       /nix/store/5paayhibayr73zqfaj458g4k4mv108jn-stack-1.3.2/share/bash-completion/completions
  4       /nix/store/5paayhibayr73zqfaj458g4k4mv108jn-stack-1.3.2/share/bash-completion
  4       /nix/store/5paayhibayr73zqfaj458g4k4mv108jn-stack-1.3.2/share
  23416   /nix/store/5paayhibayr73zqfaj458g4k4mv108jn-stack-1.3.2/bin
  23420   /nix/store/5paayhibayr73zqfaj458g4k4mv108jn-stack-1.3.2

With -split-objs

  $ du /nix/store/fypymm529adpx71gdzm0851xz42wdbz0-stack-1.3.2
  20632   /nix/store/fypymm529adpx71gdzm0851xz42wdbz0-stack-1.3.2/bin
  4 /nix/store/fypymm529adpx71gdzm0851xz42wdbz0-stack-1.3.2/share/bash-completion/completions
  4 /nix/store/fypymm529adpx71gdzm0851xz42wdbz0-stack-1.3.2/share/bash-completion
  4       /nix/store/fypymm529adpx71gdzm0851xz42wdbz0-stack-1.3.2/share
  20636   /nix/store/fypymm529adpx71gdzm0851xz42wdbz0-stack-1.3.2

With -split-sections

  $ du /nix/store/40l6krinx1zx41lr87c4m12hxj4ldf3x-stack-1.3.2
  4       /nix/store/40l6krinx1zx41lr87c4m12hxj4ldf3x-stack-1.3.2/share/bash-completion/completions
  4       /nix/store/40l6krinx1zx41lr87c4m12hxj4ldf3x-stack-1.3.2/share/bash-completion
  4       /nix/store/40l6krinx1zx41lr87c4m12hxj4ldf3x-stack-1.3.2/share
  20672   /nix/store/40l6krinx1zx41lr87c4m12hxj4ldf3x-stack-1.3.2/bin
  20676   /nix/store/40l6krinx1zx41lr87c4m12hxj4ldf3x-stack-1.3.2

Note: you currently need following overrides to build stack on 802:

   vector-algorithms = dontCheck super.vector-algorithms;
   path-io = doJailbreak super.path-io;
   stack = doJailbreak super.stack;

Note: Should also work on GHC 8.0.1, but I'm being careful here.
      We could backport later on.
2017-02-07 14:21:54 +01:00
Peter Simons
1f18f65650 callCabal2nix: take "name" parameter as a function argument
The callCabal2nix function cannot reliably determine the appropriate "name" for
the package it's processing. Attempts to derive this information have led to
plenty of evaluation errors, and so I'd like to go for the obvious and reliable
solution now and let the caller specify that bit of information.

Here is an example that demonstrates how to use callCabal2nix.

    let
      pkgs = import <nixpkgs> {};
      src = pkgs.fetchFromGitHub {
        owner = "gtk2hs";
        repo = "gtk2hs";
        rev = "eee61d84edf1dd44f8d380d7d7cae2405de50124";
        sha256 = "12i53grimni0dyjqjydl120z5amcn668w4pfhl8dxscjh4a0l5nb";
      };
    in
      pkgs.haskellPackages.callCabal2nix "gtkhs-tools" "${src}/tools" {}
2017-02-05 21:18:27 +01:00
Peter Simons
956c1fe3e8 Merge pull request #22427 from 3noch/fix-callCabal2nix
haskellPackages.callCabal2nix: provide fallback name
2017-02-05 19:37:19 +01:00
3noch
8454a9e753
haskellPackages.callCabal2nix: provide fallback name if source is not package 2017-02-04 02:01:10 -05:00
Jörg Thalheim
c45f572c68
haskellPackages.mysql-simple: skip check 2017-02-04 01:41:45 +01:00
Domen Kožar
8cf376ecf8 Merge pull request #22379 from PierreR/swagger2-patch2
hackage2nix: remove swagger2 from the list of broken packages
2017-02-03 10:24:47 +01:00
Domen Kožar
0772e27bfd
haskell.lib.buildStackProject: fix #22386 2017-02-03 10:07:10 +01:00
Pierre Radermecker
28a324b01d hackage2nix: remove swagger2 from the list of broken packages 2017-02-02 17:43:04 +01:00
Bas van Dijk
9438cc264f shelly: fix build on GHC-8.0.2 2017-02-02 15:18:28 +01:00
Peter Simons
072ebacb01 Merge pull request #22369 from LumiGuide/haddock-api-ghc802-fix
haddock-api: fix build on GHC-8.0.2
2017-02-02 14:47:43 +01:00
Bas van Dijk
344227bfb9 haddock-api: fix build on GHC-8.0.2 2017-02-02 14:29:55 +01:00
Pierre Radermecker
f08bbb90c0 haskell-swagger2: don't haddock to fix haddock build error 2017-02-02 13:17:52 +01:00
Peter Simons
b5a1783be7 haskell-servant: update overrides for version 0.10 2017-02-02 10:59:33 +01:00
Peter Simons
30bdcd9a8e hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.0.4-8-g0d49e12 from Hackage revision
45587c1114.
2017-02-02 10:59:33 +01:00
Peter Simons
2be4214c68 hackage2nix: update list of broken packages 2017-02-02 10:59:32 +01:00
3noch
05ee54782e Add callCabal2nix to haskell packages
Closes https://github.com/NixOS/nixpkgs/pull/22191.
2017-02-01 15:04:48 +01:00
Domen Kožar
f4e67389cc
buildStackProject: set GIT_SSL_CAINFO and LANG 2017-02-01 10:45:37 +01:00
Peter Simons
a2018cedf5 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.0.4-8-g0d49e12 from Hackage revision
beea499740.
2017-01-30 11:49:09 +01:00
Peter Simons
522ab7efef LTS Haskell 7.18 2017-01-30 11:48:52 +01:00
Peter Simons
c1c0cf3de7 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.0.4-8-g0d49e12 from Hackage revision
4be631c833.
2017-01-29 20:20:29 +01:00
Peter Simons
3f774f6c51 hackage2nix: enable hydra builds for brick 2017-01-29 20:19:44 +01:00
Domen Kožar
fa18c37c71
haskellPackages.cryptonite-openssl: redistribute 2017-01-28 11:20:30 +01:00
Domen Kožar
0056a3a9c4
haskellPackages.hspec-expectations-pretty-diff: fix build 2017-01-28 10:56:22 +01:00
John Wiegley
1294909c2a
lens-family-th_0_4_1_0: Add to hackage-packages.nix for GHC 7.10 2017-01-25 16:56:51 -08:00
Peter Simons
e832d380de haskell-brick: fix reference to vty 2017-01-24 23:14:02 +01:00
Peter Simons
2bbf68eafb structured-haskell-mode: drop obsolete version override 2017-01-24 23:14:02 +01:00
William Casarin
663afff780 haskellPackages.HsOpenSSL: remove jailbreak
issue has been closed and it seems to work
2017-01-24 23:14:02 +01:00
William Casarin
dc3182a15c haskellPackages.store: enable check
looks like it works again
2017-01-24 23:14:02 +01:00
William Casarin
0cb43b920e haskellPackages.git-annex: remove overrides
they don't seem to be needed anymore
2017-01-24 23:14:02 +01:00
William Casarin
4e536a9f61 haskellPackages.elm-export: remove jailbreak
fixed here:

257962f512
2017-01-24 23:14:02 +01:00
William Casarin
a8aee189e8 haskellPackages.barrier: remove jailbreak
fixed here:

1d61f4db12
2017-01-24 23:14:02 +01:00
William Casarin
8ea8493889 haskellPackages.ReadArgs: remove jailbreak
fixed here:

90d6122d74
2017-01-24 23:14:02 +01:00
Peter Simons
d350650577 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.0.4-8-g0d49e12 from Hackage revision
e2cd120f15.
2017-01-24 23:14:02 +01:00
Andreas Herrmann
1a534e0aab diagrams: Fix the 1.4.* versions of the ecosystem
The affected packages now depend on:

   diagrams-core ==1.4.*
   diagrams-lib ==1.4.*
   optparse-applicative ==0.13.*
2017-01-24 18:36:14 +01:00
Robert Hensing
de8148d74c haskellPackages.doctest-discover: fix 2017-01-24 11:57:09 +01:00
Shea Levy
2154108270 haskell-modules/generic-builder: Fix copy-paste error 2017-01-23 11:35:59 -05:00
Shea Levy
0ff6b6fc0f (haskellPackages.callPackage foo).env: Set the right env vars when cross-compiling 2017-01-22 17:05:19 -05:00
Peter Simons
f0314dea93 haskell-http-api-data: update overrides for latest version 2017-01-21 20:06:32 +01:00
Peter Simons
0d6d18c098 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.0.4-8-g0d49e12 from Hackage revision
6d0e8a7e4b.
2017-01-21 20:06:32 +01:00
John Wiegley
35aebd45f2
haskellPackages.servant_09_1_1,servant-client_0_9_1_1: update http-api-data reference 2017-01-19 15:47:14 -08:00
Peter Simons
db4bcbe7e1 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.0.4-8-g0d49e12 from Hackage revision
de841f2282.
2017-01-19 19:01:03 +01:00
Peter Simons
87a5de01a7 LTS Haskell 7.16 2017-01-19 19:00:31 +01:00
Peter Simons
1489bb4cb9 haskell-http-api-data: fix override for latest 0.3.x version 2017-01-18 09:54:13 +01:00
Peter Simons
8f5937e36e haskell-distributive: fix build with ghc versions prior to 8.x 2017-01-18 09:54:12 +01:00
Peter Simons
73e2219927 stack: pin build to old version of hpack 2017-01-18 09:54:12 +01:00
Peter Simons
18df98fe98 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.0.4-8-g0d49e12 from Hackage revision
bb2f2e7902.
2017-01-18 09:54:04 +01:00
Peter Simons
7105f4baad hackage2nix: disable failing Hydry builds 2017-01-18 09:53:56 +01:00
Peter Simons
d034506556 haskell-hpack: keep old version around so that we can build stack 2017-01-18 09:52:40 +01:00
Michael Raskin
00965c05fb haskellPackages: turtle_1_3_*: 1_3_0 -> 1_3_1
I am not the correct person to patch haskellPackages, but this
expression was missing `super.turtle_1_3_0` before and builds now.

Real motivation: fix evaluation tests for `master`. Right now
`test-eval-release.sh` passes fine.
2017-01-17 10:59:33 +01:00
Anthony Cowley
15389b51ce haskell-packages: fix purescript_0_10_5 deps
purescript-0.10.5 requires bower-json >= 1.0.0.1 && < 1.1, which is
available as bower-json_1_0_0_1.
2017-01-16 14:53:41 -05:00
Peter Simons
656707ef80 Merge pull request #21916 from Profpatsch/ghcWithPackages-docs
haskell: add doc outputs to with-packages-wrapper.nix
2017-01-16 10:58:06 +01:00
Peter Simons
ad412ba63a Merge pull request #21900 from Profpatsch/servant-docs
haskell: add servant sphinx docs to build
2017-01-16 10:56:17 +01:00
Profpatsch
546d0c0460 haskell: add doc outputs to with-packages-wrapper.nix
We want to have all doc outputs as well (also e.g. ghc documentation).
Adds a bit of documentation to the postInstall script.
2017-01-16 00:13:13 +01:00
Profpatsch
0ef29213b5 haskell: add servant sphinx docs to build 2017-01-15 21:29:03 +01:00
Peter Simons
c85a8f0d2a Merge pull request #21876 from shlevy/ghcWithPackages-cross
ghc with-packages-wrapper: Add support for cross-compiling
2017-01-15 21:07:35 +01:00
Peter Simons
5b05266180 Merge pull request #21878 from rvl/master
haskellPackages.lentil: override dep versions
2017-01-15 21:04:59 +01:00
Peter Simons
5928e6d598 stack: update reference for http-client-tls to version 0.3.3.1 2017-01-15 17:03:32 +01:00
Michael Alan Dorman
4171ba5ecc git-annex: Remove versioned yesod-persistent override 2017-01-15 17:03:32 +01:00
Peter Simons
bdad3a69fe jailbreak-cabal: fix reference in ghc-HEAD overrides 2017-01-15 17:03:32 +01:00
Peter Simons
a37e0866f3 Hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.0.4-7-g48fad11 from Hackage revision
1b50a4ce72.
2017-01-15 17:02:15 +01:00
Peter Simons
2608adeb17 LTS Haskell 7.15 2017-01-15 17:00:39 +01:00
Jude Taylor
14da7be1b9
haskellPackages.GLUT: remove freeglut on darwin 2017-01-14 10:52:18 -08:00
Rodney Lorrimar
99d0e1d84b haskellPackages.lentil: override dep versions 2017-01-14 08:41:30 +00:00
Shea Levy
a798850675 ghc with-packages-wrapper: Add support for cross-compiling 2017-01-13 21:21:21 -05:00
Domen Kožar
45a677b978
haskell.packages.ghc802: dontCheck vector-algorithms 2017-01-12 16:35:08 +01:00
Domen Kožar
60435691f7
haskellPackages.servant-auth: fix build 2017-01-12 11:47:14 +01:00
Shea Levy
60918113af haskellPackages.mkDerivation: Use native hsc2hs when cross-compiling 2017-01-11 13:26:08 -05:00
Shea Levy
4687b6142c haskellPackages.mkDerivation: Use native jailbreak-cabal when cross-compiling 2017-01-11 13:25:50 -05:00
Domen Kožar
464c79ea9f
turtle_1_3_0: fix build 2017-01-09 18:19:25 +01:00
Peter Simons
6d58ab2edf jailbreak-cabal: ghc-HEAD needs version 1.3.2 due to API changes in Cabal
https://github.com/peti/jailbreak-cabal/issues/12
2017-01-08 21:11:18 +01:00
Peter Simons
dd0d71727a git-annex: fix build 2017-01-08 21:11:18 +01:00
Peter Simons
667c4e4925 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.0.4-7-g48fad11 from Hackage revision
47c259fc33.
2017-01-08 21:11:17 +01:00
Peter Simons
9729a8d015 haskell-esqueleto: keep version 2.4.x around so that we can still build git-annex 2017-01-08 21:11:17 +01:00
Shea Levy
71fc7f9748 ghc-head: Fixes for new base and Cabal 2017-01-07 10:28:48 -05:00
Gabriel Ebner
da9e9061f1 haskellPackages.hledger-diff: 0.2.0.6 -> 0.2.0.7
Currently hledger-diff is broken because of the hledger-lib version
bump.
2017-01-07 15:16:36 +01:00
Peter Simons
f8a1e87e07 git-annex: update to latest version 2017-01-06 11:01:54 +01:00
Peter Simons
d2e344616c hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.0.4-7-g48fad11 from Hackage revision
c6ccb98171.
2017-01-06 11:01:48 +01:00
Peter Simons
0761b0bc5b configuration-hackage2nix.yaml: don't follow LTS Haskell's version constraints on hledger-* 2017-01-06 11:01:13 +01:00
Peter Simons
a0c197102e configuration-hackage2nix.yaml: keep aeson 1.0.x around for stack 2017-01-06 11:01:13 +01:00
William Casarin
ac9b3d64ce configuration-hackage2nix.yaml: update jb55's packages 2017-01-06 11:01:13 +01:00
Domen Kožar
28c06567f8 haskellPackages.hakyll: fix build 2017-01-05 10:24:07 +01:00
Domen Kožar
f10dfd692f haskellPackages.mysql: fix #19593 2017-01-04 16:41:42 +01:00
Domen Kožar
17b7eb22c3 haskellPackages.wai-app-file-cgi: fix #21498 2017-01-03 23:28:58 +01:00
Domen Kožar
663048f378 Revert "haskell: workaround for bug with dynamic libraries on darwin"
This reverts commit 19e2e7290a.

See the correct fix in aa64994b48a29ea8d12323942f1743fa4133527a

General purpose solution will be once we implement
https://github.com/NixOS/nixpkgs/issues/21624
2017-01-03 23:10:24 +01:00
Peter Simons
494d695b97 Merge pull request #21393 from mpickering/master
Small improvements to development GHC derivations
2017-01-03 14:40:18 +01:00
Peter Simons
711c235777 haskell: clean-up for the generic builder
Clean up the implementation from d0250ad884.
2017-01-03 10:52:50 +01:00
Domen Kožar
d15c62a2a0 haskellPackages.Glob: jailbreak to support GHC 8.0.2-rc2 2016-12-29 18:00:56 +01:00
William Casarin
93fc4281ba hackage2nix.yaml: update jb55's packages 2016-12-28 17:34:19 +01:00
William Casarin
49ba174e7a elm-export: jailbreak 2016-12-28 17:34:19 +01:00
Peter Simons
9459dc42c8 haskell-stack: use latest http-client library 2016-12-28 17:30:16 +01:00
Peter Simons
d150e40975 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.0.4-1-gac3ba01 from Hackage revision
8db11916ad.
2016-12-28 17:30:16 +01:00
Shea Levy
2436fc1b11 ghcHEAD comes with a ghci package. 2016-12-27 08:24:20 -05:00
Matthew Pickering
9f7c7405fb Remove nokinds GHC build
This work has since been merged into GHC master branch and is enabled
with the TypeInType extension.
2016-12-26 13:30:07 +00:00
Peter Simons
7cd5ef772b rocksdb-haskell: enable Hydra builds on Darwin
ac3ba017bd
tells the automatic re-generation process to do the same thing in the next update.

Required by https://github.com/NixOS/nixpkgs/issues/21215.
2016-12-25 12:47:09 +01:00
Peter Simons
943f4345dd configuration-hackage2nix.yaml: update list of broken builds 2016-12-24 16:15:35 +01:00
Daiderd Jordan
19e2e7290a haskell: workaround for bug with dynamic libraries on darwin 2016-12-24 16:15:35 +01:00
Peter Simons
b87a59bc69 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.0.4 from Hackage revision
4ecc7e6432.
2016-12-24 16:15:28 +01:00
Peter Simons
076b90d5ee hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.0.4 from Hackage revision
c9f5faab75.
2016-12-21 10:17:49 +01:00
Peter Simons
17f42ee50f git-annex: switch to yesod-persistent-1.4.1.1 to fix build 2016-12-21 10:17:33 +01:00
Peter Simons
8809fa30b5 configuration-hackage2nix.yaml: update list of failing builds 2016-12-21 10:04:33 +01:00
Peter Simons
7e317d4ff8 LTS Haskell 7.14 2016-12-21 10:04:33 +01:00
Peter Simons
7906eed27e configuration-hackage2nix.yaml: update list of failing builds 2016-12-19 10:55:29 +01:00
Peter Simons
56c0f5de89 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.0.4 from Hackage revision
efd8c635e0.
2016-12-19 10:55:17 +01:00
Domen Kožar
5e5df0fea2 rocksdb-haskell: just compile rocksdb statically to fix #21215 2016-12-18 22:17:37 +01:00
Domen Kožar
d0250ad884 Haskell generic builder: enable parallel builds for GHC 8.0.2
This reverts https://github.com/NixOS/nixpkgs/pull/4554
2016-12-16 22:25:40 +01:00
Michael Alan Dorman
acbbf6a3cc Fixup haskell-src-exts version 2016-12-14 15:33:27 +01:00
Peter Simons
69c09c47e6 stack: version 1.3.x needs aeson 1.x to compile 2016-12-14 15:33:27 +01:00
Peter Simons
64afb52f6c git-annex: fix sha hash for the new version 2016-12-14 15:33:27 +01:00
Peter Simons
80c35f6f3d cabal-install: always use the latest version by default 2016-12-14 15:33:27 +01:00
Peter Simons
1e14698a58 haskell-Cabal: update latest version to 1.24.2.0 2016-12-14 15:33:26 +01:00
Peter Simons
f135c9fde7 configuration-hackage2nix.yaml: maintain hledger packages to ensure they build 2016-12-14 15:33:26 +01:00
Peter Simons
3e092a19f3 haskell-math-functions: test suite fails sporadically 2016-12-14 15:33:25 +01:00
Peter Simons
7f1d74d43b haskell-brick: update overrides with regard to vty 2016-12-14 15:33:25 +01:00
Peter Simons
7c3839b90c hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.0.3-13-gcb8e8a4 from Hackage revision
c76f2cde8d.
2016-12-14 15:33:16 +01:00
Peter Simons
a21a11bae2 LTS Haskell 7.13 2016-12-14 15:32:53 +01:00
Leonardo Taglialegne
7d134fc836 Fix typo in configuration-hackage2nix.yaml (#21129) 2016-12-14 01:05:14 +01:00
Profpatsch
570708183b haskellPackages: add hoogleLocal
The docs in `hoogle.nix` intend for it to be in the packageset as `hoogleLocal`
and that also makes a lot of sense from a user perspective.

`packages` is not a function `HaskellPackages -> [Package]`, but rather an
arbitrary set of packages.
That is good, because that way it can be used e.g. to merge package databases
from other versions of the packageset.

It’s done as function with default argument, because otherwise the user has to
use `overrideCabal` to override `packages` in `hoogle.nix`.
2016-12-12 14:27:04 +01:00
Profpatsch
5373ca9712 haskell/ghcjs: fix ghcjs-ffiqq, add ghcjs-vdom (#20614)
Both experimental libraries that are in the ghcjs GitHub organization, but are
not yet officially released on hackage.
2016-12-06 23:24:42 +01:00
Nikolay Amiantov
497e6d2f1d haskellPackages.haskell-src-exts-simple: build against new haskell-src-exts 2016-12-05 16:39:23 +03:00
Greg Hale
ad489cec10 Add pandoc dependency to heist to restore working heist tests 2016-12-05 01:53:44 +00:00
Domen Kožar
d8e2eba828 haskellPackages.turtle: enable tests again (they pass) 2016-12-03 12:31:30 +01:00
Peter Simons
297ea7550c haskellPackages.ghc-core: Revert "0.5.6 -> 2012-12-15"
This reverts commit c1b919ff5c. That kind of
change is a maintenance nightmare because it unconditionally overrides the
package's version specified in hackage-packages.nix with something else, i.e.
no future update will ever have an effect. This is not the proper way to do it.
The proper way is to add the relevant commit from Github as a patch.
2016-12-01 20:04:19 +01:00
Peter Simons
a571edecd0 haskell-jni: fix path to missing libjvm
libjvm.so is in a non-standard location and the build needs help finding it.
Closes https://github.com/NixOS/nixpkgs/issues/20669.
2016-12-01 19:58:28 +01:00
mingchuan
880ae3fd1e haskellPackages: fix brick and vty_5_13
brick 0.14 requires vty >= 5.12
2016-12-01 19:58:28 +01:00
Peter Simons
10b832e464 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.0.3-11-g4525071 from Hackage revision
7c09fb8e04.
2016-12-01 19:57:44 +01:00
Peter Simons
d80d92793e LTS Haskell 7.11 2016-12-01 19:57:43 +01:00
Profpatsch
10cf3b150e haskellPackages.HDBC-odbc: remove haddock fix again 2016-11-30 13:04:48 +01:00
Ruslan Babayev
f44023c485 haskellPackages.barrier: jailbreak 2016-11-28 17:18:21 -08:00
Michael Alan Dorman
d24a886419 hoogle: build with newest haskell-src-exts 2016-11-27 17:00:14 +01:00
Michael Alan Dorman
725e44cc04 hindent: fix 5.2.1 build 2016-11-27 17:00:14 +01:00
Peter Simons
1e62dc2929 configuration-hackage2nix.yaml: use latest hindent 2016-11-27 17:00:14 +01:00
Peter Simons
b74d732f67 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.0.3-8-gcc531ff.
2016-11-27 17:00:04 +01:00
Joe Hermaszewski
757638acae ghcWithPackages: fix env NIX_GHC_LIBDIR value
Ideally the duplication between the environment shellHook and the ghc
wrapper would be removed.

Fixes #20730
2016-11-26 12:06:56 +00:00
Peter Simons
baea6a8d82 Merge pull request #20619 from Profpatsch/ghcWithHoogle-empty-packagelist
haskell/hoogle.nix: make an empty packages list possible
2016-11-25 19:21:23 +01:00
Profpatsch
b8a69aaba9 haskell/hoogle.nix: make an empty packages list possible
Building hoogle environments with an empty list of packages threw a built-time
error. This was particularly confusing when giving e.g. `(hps: [hps.Cabal])`
which, since `Cabal` is set to `null` (because it’s a distribution package),
would have lead to the same error as an empty list.

It was not useful to throw an error at all, because sometimes one only wants to
build an environment for the distribution packages; also the default value for
packages wasn’t even a valid value, so it is removed.
2016-11-24 12:31:58 +01:00
Peter Simons
88fa370992 Merge pull request #20652 from Profpatsch/hdbc-odbc-haddock
haskellPackages: fix HDBC-odbc haddockPhase
2016-11-23 20:35:14 +01:00
Peter Simons
91225b8ba2 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.0.3-4-g1dfbad0 from Hackage revision
58a16d64a7.
2016-11-23 17:29:45 +01:00
Peter Simons
a02be6517a LTS Haskell 7.10 2016-11-23 17:29:27 +01:00
Profpatsch
54f8379321 haskellPackages: fix HDBC-odbc haddockPhase 2016-11-23 16:21:59 +01:00
Rodney Lorrimar
de2f9d6719 haskellPackages.ghcjs-dom: Add overrides (#20474) 2016-11-21 20:51:59 +01:00
Michael Alan Dorman
9cca22873a git-annex: fixup sha256 for new version 2016-11-21 09:55:59 +01:00
Peter Simons
f4cf7638fd hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.0.3-4-g1dfbad0 from Hackage revision
b21c267fad.
2016-11-21 09:55:53 +01:00
Pascal Wittmann
515974a66b haskellPackages.ReadArgs: jailbreak to fix build
fixes #20515
2016-11-20 21:41:55 +01:00
obadz
c1b919ff5c haskellPackages.ghc-core: 0.5.6 -> 2012-12-15 2016-11-20 16:25:54 +00:00
Nikolay Amiantov
5bfaa2d3ad lambdabot: fix to use new haskell-src-exts 2016-11-20 19:09:03 +03:00
Shea Levy
f198e4f52a socket-0.7.0.0: Pass new version of QuickCheck 2016-11-19 19:28:46 -05:00
Vladimír Čunát
2aea31b52e
Merge branch 'staging' 2016-11-19 21:55:26 +01:00
Profpatsch
786c13c884 Merge pull request #20534 from Profpatsch/ghcjs-sort-configuration
Ghcjs sort configuration
2016-11-19 14:28:43 +01:00
Shea Levy
64ec4dd87b Add haskell packages set for cross ghc 2016-11-18 10:44:53 -05:00
Profpatsch
06e0bac814 haskell/ghcjs: sort ghcjs packages alphabetically 2016-11-18 16:38:04 +01:00
Profpatsch
a7043808dd haskell/ghcjs: patch Safe out of fast-logger 2016-11-18 16:24:37 +01:00
Profpatsch
247d7c88d2 haskell.packages.ghcjs: fix entropy (#20446) 2016-11-18 16:17:14 +01:00
Peter Simons
80daa953c4 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.0.3-3-g5c816fd from Hackage revision
75f785093e.
2016-11-18 09:51:24 +01:00
Peter Simons
4306a53756 Declare "ghcjs-base" as a compiler-provided core package.
This change fixes several GHCJS-related packages in our Hackage database.

Cc: @Profpatsch
2016-11-18 09:51:14 +01:00
Peter Simons
29662304df configuration-hackage2nix.yaml: disable broken builds
Ping @abbradar because of broken lambdabot.
2016-11-18 09:51:06 +01:00
Peter Simons
0816860785 Merge pull request #20463 from Profpatsch/with-packages-drv-naming
ghc.withPackages: amend the derviation name
2016-11-17 17:09:28 +01:00
Profpatsch
499e4e6393 ghc.withPackages: amend the derviation name
Provide a clear difference between the compiler itself and link farms containing
additional packages.
2016-11-17 16:48:53 +01:00
Shea Levy
3995655d2c Revert "Merge pull request #17145 from kalhauge/haskell_darwin_dyld"
This fix doesn't actually fix the cabal bug (see #16357), but it does
cause other bugs (see #20476)

Fixes #20476

This reverts commit b89fa5fd5c, reversing
changes made to e4b146b041.
2016-11-17 07:25:42 -05:00
Peter Simons
fcb6a18f37 haskell-http-api-data: fix reference in configuration-common.nix 2016-11-16 11:16:10 +01:00
Peter Simons
1e43c159e2 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.0.3-3-g5c816fd from Hackage revision
4196e3bc37.
2016-11-16 11:16:02 +01:00
Peter Simons
734bd22f1b LTS Haskell 7.9 2016-11-16 11:15:13 +01:00
Michael Alan Dorman
7daf0b8b6e git-annex: update sha256 for new version 2016-11-14 10:04:15 +01:00