Commit graph

2112 commits

Author SHA1 Message Date
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