Commit Graph

1151 Commits

Author SHA1 Message Date
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
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
Peter Simons
3c0b1919e7 git-annex: update sha256 hash for the new version 2017-02-16 11:49:42 +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
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
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
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
Jörg Thalheim
c45f572c68
haskellPackages.mysql-simple: skip check 2017-02-04 01:41:45 +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
Domen Kožar
0056a3a9c4
haskellPackages.hspec-expectations-pretty-diff: fix build 2017-01-28 10:56:22 +01: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
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
Peter Simons
f0314dea93 haskell-http-api-data: update overrides for latest version 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
1489bb4cb9 haskell-http-api-data: fix override for latest 0.3.x version 2017-01-18 09:54:13 +01:00
Peter Simons
73e2219927 stack: pin build to old version of hpack 2017-01-18 09:54:12 +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
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
0ef29213b5 haskell: add servant sphinx docs to build 2017-01-15 21:29:03 +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
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
Domen Kožar
60435691f7
haskellPackages.servant-auth: fix build 2017-01-12 11:47:14 +01:00
Domen Kožar
464c79ea9f
turtle_1_3_0: fix build 2017-01-09 18:19:25 +01:00
Peter Simons
dd0d71727a git-annex: fix build 2017-01-08 21:11:18 +01:00
Peter Simons
f8a1e87e07 git-annex: update to latest version 2017-01-06 11:01:54 +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
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
17f42ee50f git-annex: switch to yesod-persistent-1.4.1.1 to fix build 2016-12-21 10:17:33 +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
1e14698a58 haskell-Cabal: update latest version to 1.24.2.0 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
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
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
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
Profpatsch
54f8379321 haskellPackages: fix HDBC-odbc haddockPhase 2016-11-23 16:21:59 +01:00
Michael Alan Dorman
9cca22873a git-annex: fixup sha256 for new version 2016-11-21 09:55:59 +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
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
fcb6a18f37 haskell-http-api-data: fix reference in configuration-common.nix 2016-11-16 11:16:10 +01:00
Michael Alan Dorman
7daf0b8b6e git-annex: update sha256 for new version 2016-11-14 10:04:15 +01:00
Peter Simons
cb07aea0bd haskell-STMonadTrans: disable failing test suite to fix the build
Closes https://github.com/NixOS/nixpkgs/issues/20309.
2016-11-10 18:15:35 +01:00
Peter Simons
6a53da63b3 haskell-http-client: update reference in configuration-common.nix 2016-11-10 18:15:35 +01:00
Peter Simons
cef68b475e haskell-diff-parse: jailbreak to fix test suite build 2016-11-09 08:47:27 +01:00
Peter Simons
d268cef94a haskell-distributed-process-tests: don't run tests on Hydra 2016-11-07 08:36:20 +01:00
Peter Simons
488e460f27 configuration-common.nix: update reference to http-client_0_5_3_4 2016-11-07 08:36:00 +01:00
Peter Simons
d9c3f3fbaf haskell-Cabal: update from 1.24.0.0 to 1.24.1.0 2016-11-07 08:36:00 +01:00
Profpatsch
77f6453fe8 haskellPackages: libsystemd-journal unjailbreak
upper bound got fixed
2016-11-05 20:55:23 +01:00
Nikolay Amiantov
dd8f60fbd9 haskellPackages.dbus: fix for new DBUS_SESSION_BUS_ADDRESS format 2016-11-05 14:45:40 +03:00
Peter Simons
6a76ee237d haskell-hoogle doesn't work with haskell-src-exts-1.19.x. 2016-11-04 21:29:58 +01:00
Peter Simons
6fe22c643b haskell-servant: fix build of latest version
Closes https://github.com/NixOS/nixpkgs/pull/20068.
2016-11-03 17:37:20 +01:00
Peter Simons
b84f2a5165 Cosmetic. 2016-11-03 17:37:20 +01:00
Peter Simons
dbeb3f357c haskell-hspec-discover: enable the Haddock documentation again 2016-11-03 17:37:20 +01:00
Peter Simons
0018599a26 haskell-hoogle: use latest version by default 2016-11-03 17:37:19 +01:00
Peter Simons
38dc05fd06 Update hoogle and structured-haskell-mode to latest version of haskell-src-exts. 2016-11-03 17:37:19 +01:00
Peter Simons
306953581d haskell-swagger: disable Haddock phase
Citing from http://hydra.cryp.to/build/2035868/nixlog/1/raw:

  haddock: internal error: spliceURL UnhelpfulSpan
2016-11-03 17:34:22 +01:00
Peter Simons
ed9f1c575b git-annex: update version 2016-11-03 17:34:21 +01:00
Profpatsch
5c197b2e38 haskellPackages: mark sindre broken 2016-11-02 16:22:29 +01:00
Profpatsch
83317f7d04 haskellPackages: fix libsystemd-journal 2016-11-02 01:11:10 +01:00
Joachim Fasting
31f8367c67
haskellPackages.dataenc: jailbreak
Relaxes overly strict bounds on base (3 > && < 4.8).  The dataenc
package is unmaintained so there is no corresponding upstream issue.
2016-11-01 13:30:50 +01:00
Shea Levy
4df3bb7e08 store-0.3: Build with the right version of store-core 2016-10-30 11:29:07 -04:00
Peter Simons
0cf03e02ae git-annex: update to latest version
(cherry picked from commit b6df43a2df3c1b998a3c4ce5fb1e54a1691e3f41)
2016-10-28 16:52:51 +02:00
Peter Simons
2a19aea54a haskell-stack: fix evaluation
(cherry picked from commit 9c31962c075933b6dae6ef5374f01768fe7a892b)
2016-10-28 16:52:51 +02:00
Joachim Fasting
620b364a87
haskellPackages.wai-app-file-cgi: fix build
Fixes https://github.com/NixOS/nixpkgs/issues/19611
Fixes https://github.com/NixOS/nixpkgs/issues/19612
2016-10-28 16:32:27 +02:00
John Wiegley
c60b3e4bfc
haskellPackages.hakyll: Fix the Darwin build (broken tests) 2016-10-27 15:10:39 -07:00
Peter Simons
6a35164874 haskell: drop obsolete jailbreaking overrides 2016-10-20 13:40:10 +02:00
Peter Simons
ad81560afc structured-haskell-mode: update to latestt Git revision
This update makes our local patches obsolete.
2016-10-20 13:40:10 +02:00
Michael Alan Dorman
a70e11adbf haskellPackages: jailbreak terminal-progress-bar 2016-10-18 18:02:40 +02:00
Peter Simons
56ea4f8098 haskell-stack: fix build 2016-10-18 18:02:40 +02:00
Peter Simons
3af8c6e306 git-annex: enable test suite again 2016-10-18 18:02:40 +02:00
Peter Simons
ea1a8cf5f0 git-annex: bump to latest version 2016-10-12 17:50:20 +02:00
Andreas Herrmann
7c741722e2 diagrams-pgf: Fix dependencies 2016-10-09 17:07:17 +02:00
Andreas Herrmann
50aff7e07b texrunner: Fix build
Tests fail due to nonexistent tex executables.
2016-10-09 15:39:05 +02:00
Theodore Witkamp
d4566400c9 haskellPackage.wai-cors: Disable cabal check
External program is used in tests.
2016-10-05 17:04:35 -07:00
Peter Simons
82d32feda9 haskell: jailbreak some packages to fix builds in LTS 7.x 2016-10-05 21:07:29 +02:00
Peter Simons
79f92f00f9 haskell-vector: jailbreak to fix test suite build 2016-10-02 23:44:00 +02:00
Peter Simons
8b5c1190d6 haskell-store: disable spuriously failing test suite 2016-10-01 19:37:13 +02:00
Peter Simons
26a7e0784f haskell-stack: fix build of the new version 2016-09-30 22:11:40 +02:00
Peter Simons
74434e4ab1 git-annex: update to latest version 2016-09-27 14:09:15 +02:00
Peter Simons
d126fbb89c hindent: don't try to byte compile elisp files
We don't have an up-to-date version of haskell-mode in Nix, which is a
dependency of that build.
2016-09-26 08:43:23 +02:00
Peter Simons
6ea55715b6 structured-haskell-mode: apply patches to fix the build 2016-09-26 08:43:23 +02:00
Peter Simons
0d38ff9d37 structured-haskell-mode: cosmetic 2016-09-26 08:43:23 +02:00
Peter Simons
24b64aab0f structured-haskell-mode: use output from "git describe" to identify the version 2016-09-26 08:43:23 +02:00
Peter Simons
8967a3f798 structured-haskell-mode: bump to latest git version
Hopefully, this will achieve support for Emacs 25.x.
2016-09-26 01:20:31 +02:00
Rodney Lorrimar
f318d62b5f haskellPackages.hasql-transaction: disable failing test suite
The tests want to connect to a postgresql server at localhost:5432.
2016-09-24 21:05:03 +01:00
Peter Simons
62606be9b0 haskell-hindent: disable failing test suite 2016-09-20 12:04:47 +02:00
Peter Simons
c999c9f636 haskell-mongoDB: disable failing test suite 2016-09-20 12:04:47 +02:00
Michael Alan Dorman
c3974031dd For the moment, we need a specific reference to 5.0.4
This will need to change if we stop arbitrarily tying "hoogle" to be
5.0.1.
2016-09-20 12:04:47 +02:00
Moritz Ulrich
01e44ac1f9 emacs: 24.5 -> 25.1
This commit removes all references to emacs24 with the exception of
emacs24-macports. The two folders in `pkgs/applications/editors` named
`emacs-24` and `emacs-24` are consolidated to a new `emacs` folder.

Various parts in nixpkgs also referenced `emacs24Packages` (pinned to
`emacs24`) explicitly where `emacsPackages` (non-pinned) is more
appropriate. These references get fixed by this commit too.
2016-09-18 13:38:21 +02:00
Peter Simons
2b1fea120c idris: disable failing test suite 2016-09-18 12:14:49 +02:00
Peter Simons
806d96b6a3 git-annex: test suite fails, reported upstream 2016-09-18 12:14:49 +02:00
Peter Simons
59e0dff09f hoogle: remove obsolete override 2016-09-18 12:14:49 +02:00
Profpatsch
bfc710b0f5 haskellPackages/pontarius-xmpp: dontCheck 2016-09-17 20:36:44 +02:00
Peter Simons
ef4eb283a9 haskell-MemoTrie: disable failing Haddock stage 2016-09-17 17:57:02 +02:00
Peter Simons
9921e7ce96 xmonad: disable failing test suite 2016-09-17 17:57:01 +02:00
Peter Simons
70150639a8 haskell-spy: drop obsolete override 2016-09-17 17:57:01 +02:00
Peter Simons
2140aca679 haskell-hasktags: drop obsolete override 2016-09-17 17:57:01 +02:00
Peter Simons
99b5c0cb9b haskell: disable plenty of broken LTS-7.x test suites 2016-09-17 17:57:01 +02:00
Peter Simons
6607b99168 haskell: port existing hardening overrides to use the new combinator 2016-09-15 09:12:03 +02:00
Kirill Boltaev
bccd75094f treewide: explicitly specify gtk and related package versions 2016-09-12 18:26:06 +03:00
Peter Simons
4da51ec637 structured-haskell-mode: link Haskell libraries statically into this executable
It's my understanding that Emacs runs the "structured-haskell-mode" binary
virtually every time you press a key in an Haskell buffer, and since
dynamically linked Haskell binaries take *much* longer to start up, switching
this particular package to statically linked libraries ought to result in a
performance boost.
2016-09-12 11:28:58 +02:00
Chris Martin
e4b146b041 haskell-hasktags: don't install the "test" binary
Closes https://github.com/NixOS/nixpkgs/pull/18403.
2016-09-10 22:09:11 +02:00
Peter Simons
51932e3d69 idris: clean up overrides
Closes https://github.com/NixOS/nixpkgs/pull/18309.
2016-09-10 22:01:15 +02:00
Peter Simons
04e4c495bb haskell-configuration-common: cosmetic 2016-09-10 21:00:22 +02:00
Peter Simons
7619f88eb8 haskell-gtk2hs-buildtools: this override does not belong into common 2016-09-10 21:00:22 +02:00
Peter Simons
d8af0db284 haskell-yi: remove obsolete "broken" marker
Fixes https://github.com/NixOS/nixpkgs/issues/18188.
2016-09-10 21:00:22 +02:00
Peter Simons
ea9a948fab haskell-servant-router: don't run the test suite
It times out after 2 hours: http://hydra.nixos.org/build/40065332.

(cherry picked from commit 277efdd50eeec48a510672eaea5d7d664aac0b7c)
2016-09-09 13:55:40 +02:00
Peter Simons
83da50a505 git-annex: update version to 6.20160907 2016-09-09 13:55:39 +02:00
Peter Simons
f649d4eefa git-annex: fix GHC 8.x build 2016-09-09 13:55:39 +02:00
Peter Simons
26cc9b4d01 haste-compiler: mark as broken
Configuring haste-compiler-0.5.5.0...
  Setup: At least the following dependencies are missing:
  HTTP -any,
  bzlib -any,
  either -any,
  ghc-simple -any,
  system-fileio -any,
  tar -any
2016-09-09 13:55:39 +02:00
Peter Simons
743982d0f9 haste-cabal-install: mark as broken
The build depends on the broken haste-Cabal package.
2016-09-09 13:55:38 +02:00
obadz
973fd1aae1 haskellPackages.haste-Cabal: mark as broken 2016-09-07 01:35:23 +01:00
Tuomas Tynkkynen
8c4aeb1780 Merge staging into master
Brings in:
    - changed output order for multiple outputs:
      https://github.com/NixOS/nixpkgs/pull/14766
    - audit disabled by default
      https://github.com/NixOS/nixpkgs/pull/17916

 Conflicts:
	pkgs/development/libraries/openldap/default.nix
2016-09-01 13:27:27 +03:00
Peter Simons
a96160728e haskell-mueval: remove obsolete patch 2016-08-31 12:01:03 +02:00
Tuomas Tynkkynen
d3dc3d4130 Merge remote-tracking branch 'dezgeg/shuffle-outputs' into staging
https://github.com/NixOS/nixpkgs/pull/14766
2016-08-30 12:43:37 +03:00
Tuomas Tynkkynen
01f857409f haskellPackages.hcwiid: Fix output references to bluez 2016-08-30 03:02:33 +03:00
Peter Simons
67c57a9ce5 Merge pull request #18016 from Profpatsch/spy-patch
haskellPackages.spy: fix for new fsnotify version
2016-08-29 16:55:06 +02:00
Profpatsch
70ed0fd3de haskellPackages.spy: fix for new fsnotify version
Temporary fix, until it is merged upstream.
2016-08-26 16:21:30 +02:00
Franz Pletz
237320190e haskellPackages.git-annex: fix hash 2016-08-24 21:31:02 +02:00
obadz
24a9183f90 Merge branch 'hardened-stdenv' into staging
Closes #12895

Amazing work by @globin & @fpletz getting hardened compiler flags by
enabled default on the whole package set
2016-08-22 01:19:35 +01:00
Brian McKenna
04a022be6d idris: fix build not finding dynamic library 2016-08-21 12:57:57 +10:00
Peter Simons
d717d0dfb1 haskell-hans: revert commit 983ab7be1e
https://github.com/NixOS/nixpkgs/pull/17555 added an override that pins the
version of haskellPackages.hans to a specific Git revision. This means that any
version updates in the Haskell packages set will have no effect and that our
users will be stuck at that (arbitrary) version until the override is removed
again. Furthermore, it's bad practice to distribute a package dubbed as version
X when it's really version Y! The proper way to fix this issue IMHO is to
convince upstream to released a fixed version to Hackage.
2016-08-19 10:58:14 +02:00
Joachim Fasting
8d51c50570
haskellPackages.libmpd: upper-bound on time has been fixed upstream
This basically reverts d13378ffd1 (git
revert resulted in conflicts, which I'm too lazy to resolve).
2016-08-18 14:35:45 +02:00
Robin Gloster
33e1c78ae3 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-16 07:54:01 +00:00
obadz
6eb2ca2247 haskellPackages.Lazy-Pbkdf2.i686-linux: don't run tests that keep aborting 2016-08-15 13:05:55 +01:00
Robin Gloster
b7787d932e Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-12 09:46:53 +00:00
obadz
daf44055cd haskellPackages.stunclient: fix build error due to changing exports in deps 2016-08-11 16:42:28 +01:00
Nikolay Amiantov
cd7bd0b42f mueval: fix build 2016-08-11 17:12:31 +03:00
Daiderd Jordan
d764e55a1c Merge pull request #17564 from LnL7/darwin-haskell-fsnotify
haskellPackages.fsnotify: add darwin build dependency
2016-08-06 17:56:18 +02:00
Daiderd Jordan
7aaf75608f
haskellPackages.fsnotify: add darwin build dependency 2016-08-06 17:29:25 +02:00
Benno Fünfstück
22281009b7 haskell/GLUT: fix "unkown GLUT entry glutInit"
This fixes #17547
2016-08-06 17:21:12 +02:00
Aycan iRiCAN
983ab7be1e haskellPackages.hans: fixed major version bugs (#17555) 2016-08-06 14:29:01 +03:00
Robin Gloster
63c7b4f9a7 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-31 20:51:34 +00:00
Profpatsch
4741e9e051 haskellPackages.Glob: remove superfluous override
The override is already in the 7.10.x file, and we’d like to explicitely
override for every version that needs it.
2016-07-30 12:45:23 +02:00
Peter Simons
66ca9b9146 git-annex: update hash for new version 2016-07-26 10:37:55 +02:00
Robin Gloster
f222d98746 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-25 12:47:13 +00:00
Benno Fünfstück
2e48d838d0 haskell/Glob: fix build 2016-07-23 01:27:40 +02:00
Peter Simons
641fc0e683 haskell: remove all but the latest LTS package sets (version 6.7)
This is the first step towards dropping Stackage support. We keep LTS 6.x
around because I don't want to downgrade our default compiler to GHC 7.x,
but once LTS 7.x comes out we'll switch our main package set to that and
drop Nightly.

More details are at:

  http://permalink.gmane.org/gmane.linux.distributions.nixos/20505

Closes https://github.com/NixOS/nixpkgs/issues/14897.

Also relevant:

 - https://github.com/NixOS/nixpkgs/issues/16130
 - https://github.com/commercialhaskell/stack/issues/2259
2016-07-21 14:41:44 +02:00
Robin Gloster
1f04b4a566 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-21 00:56:43 +00:00
Peter Simons
c2656d6809 Merge pull request #15423 from dalaing/llvm-general-darwin
llvm-general: Adds Darwin compatibilty
2016-07-19 22:44:28 +02:00
Peter Simons
c0b5213aad haskell-hfsevents: remove obsolete override
cabal2nix generates correct build instructions now.
Fixes https://github.com/NixOS/nixpkgs/pull/17046.
2016-07-19 14:20:53 +02:00
Robin Gloster
203846b9de Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-19 10:37:02 +00:00
Robin Gloster
5185bc1773 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-15 14:41:01 +00:00
Peter Simons
9fc0347c93 Merge pull request #16262 from basvandijk/fix-inline-c-cpp-darwin
inline-c-cpp: fix build on darwin
2016-07-15 16:21:46 +02:00
Peter Simons
6a6b8fa36f cabal2nix: update to version 2.0 from Hackage
I've realized that publishing updates to Hackage is far easier than
publishing updates in Nixpkgs, and since all Hackage updates show up in
Nix automatically I've decided to go back to publishing cabal2nix on
Hackage again.

Unfortunately, this means that I'll have to change the version numbering
scheme to comply with the expectations of the Haskell PVP (which is used
by Stackage), so the new version 2.0 looks like a downgrade to Nix,
which used to have version 20160406. :-(

If in doubt, run "nix-env -u --always" to force the update. I am sorry
about the inconvenience.
2016-07-05 23:45:41 +02:00
Peter Simons
a7e33a1a1e cabal2nix: update to version 20160613-10-g57dddc7 2016-07-01 12:01:03 +02:00
Peter Simons
06d3636596 git-annex: update sha256 hash 2016-06-20 17:01:36 +02:00
Bas van Dijk
d0c7056b92 inline-c-cpp: fix build on darwin 2016-06-16 01:03:22 +02:00
Peter Simons
00bebe798c haskell-http2: remove obsolete override 2016-06-12 08:37:06 +02:00
Peter Simons
71f0092143 haskell-lhc: drop obsolete override 2016-06-12 08:37:05 +02:00
Peter Simons
0f7a0a0377 haskell-stack: apply small patch from Git to fix "stack repl" for GHC 8.x 2016-06-10 14:41:01 +02:00
Robin Gloster
8031cba2ab Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-06-10 09:27:04 +00:00
Peter Simons
7914242b37 haskell-timezone-series: fix build with GHC 8.0.1
- Fix the incorrect sha256 hash of the patch.
 - Apply the patch only when compiling with GHC 8.0.x.
2016-06-09 21:51:09 +02:00
Peter Simons
dc6f1cf4b3 Merge pull request #16080 from mstarzyk/timezone-series
haskellPackages.timezone-series: Add support for time-1.6 - applied p…
2016-06-09 12:09:12 +02:00
obadz
fcb0023e80 haskellPackages.intero: fix tests (thanks @rvl) 2016-06-09 08:53:47 +01:00
Maciek Starzyk
0158d124bd haskellPackages.timezone-series: Download patch instead of checking it into nixpkgs 2016-06-09 00:03:41 +02:00
Maciek Starzyk
10c87e69b4 haskellPackages.timezone-series: Add support for time-1.6 - applied patch https://github.com/ygale/timezone-series/pull/1 2016-06-08 23:35:44 +02:00
obadz
d13378ffd1 haskellPackages.libmpd: remove upper bound on time 2016-06-08 19:14:27 +01:00
Peter Simons
71fc5083be git-annex: work around Joey Hess' latest brain fart
Now we're releasing incomplete Hackage tarballs on purpose:

  http://git-annex.branchable.com/bugs/bash_completion_file_is_missing_in_the_6.20160527_tarball_on_hackage/

You know, I'll fix this shit one last time, but on the next occasion
upstream breaks the build for no apparent reason, I'm going to abandon
this project and leave it to someone else to package, because these kind
of wacko engineering decisions cast a bad light on the soundness of
git-annex as a whole, IMHO.
2016-06-07 21:59:52 +02:00
Peter Simons
3e4cd62903 Merge pull request #16053 from obadz/ghc-mod-ghc8
haskellPackages.ghc-mod: add support for GHC8
2016-06-07 21:50:35 +02:00
obadz
99717f7a56 haskellPackages.intero: don't run tests 2016-06-07 20:36:35 +01:00
obadz
679a51b116 haskellPackages.ghc-mod: add overrides to support ghc8 2016-06-07 20:33:48 +01:00
Peter Simons
c7639f4e56 haskell-esqueleto: remove broken overrides
These overrides didn't work, because they created a mixture of different
versions of 'persistent' in the build tree. Furthermore, we cannot pin
specific versions like that in configuration-common.nix because this
breaks builds in other package sets, i.e. the LTS variants.
2016-06-06 09:33:30 +02:00
Peter Simons
513d648f40 configuration-common.nix: drop obsolete overrides 2016-06-06 09:33:30 +02:00
Peter Simons
d27881c014 haskell-pandoc: fix build 2016-06-03 16:12:41 +02:00
Michael Alan Dorman
d631679b83 cabal: fix expressions 2016-06-02 09:30:38 +02:00
Michael Alan Dorman
76db3f6e63 esqueleto: fix dependencies 2016-06-02 09:30:38 +02:00
Nikolay Amiantov
d82b15d57b haskell.cabal-install: remove override 2016-06-02 01:11:01 +03:00
Nikolay Amiantov
adfe65edf2 haskell.cabal-install: use new Cabal 2016-06-02 00:59:08 +03:00
Michael Alan Dorman
5ca5a4f773 gtk2hs-buildtools: hand-code some dependencies
A change in the way the gtk2hs libraries make use of gtk2hs-buildtools
caused them to move the dependency into a stanza where cabal2nix doesn't
pick it up---so we need to do these by hand for the moment.
2016-05-31 22:09:57 +02:00
Michael Alan Dorman
b0f64b04fc pandoc: jailbreak 2016-05-31 22:09:57 +02:00
Michael Alan Dorman
20cf5c9750 hackage2nix: Compile with older deepseq-generics 2016-05-31 22:09:57 +02:00
Michael Alan Dorman
5c803214ee distribution-nixpkgs: Compile with older deepseq-generics 2016-05-31 22:09:57 +02:00
Michael Alan Dorman
607e123d11 ghc-mod: Depend on cabal-helper 0.6.3.1 2016-05-31 22:09:57 +02:00
Michael Alan Dorman
be6c46c3b3 gtk2hs-buildtools: ensure appropriate Cabal version 2016-05-31 22:09:56 +02:00
Robin Gloster
2382084e3b haskellPackages.gtk{,3}: disable fortify hardening 2016-05-31 12:22:17 +00:00
Franz Pletz
f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-05-18 17:10:02 +02:00
Dave Laing
0540a83789 llvm-general: Adds Darwin compatibilty 2016-05-13 09:41:15 +10:00
Michael Alan Dorman
d2387e3c4a haskellPackages.hjsonschema: remove hjsonpointer override 2016-05-10 12:28:36 +02:00
Michael Alan Dorman
deba002b3c haskellPackages.hindent: remove testing override 2016-05-10 12:28:36 +02:00
Michael Alan Dorman
d8c24dae8f haskellPackages.pipes-transduce: Remove foldl override 2016-05-10 12:28:36 +02:00
Peter Simons
f5a7f03bbe haskell-darcs: migrate overrides into cabal2nix generator 2016-05-05 12:51:47 +02:00
Peter Simons
17022a70f2 haskell-stack: migrate overrides into cabal2nix generator 2016-05-05 12:51:46 +02:00
Peter Simons
e5536b799a haskell-split: re-enable test suite
split version 0.2.3.1 ought to fix the issue we've had:

  a2e1692730 (commitcomment-17331531)
2016-05-05 12:51:13 +02:00
Peter Simons
ddb8c06c2d haskell-yi: mark as broken 2016-05-03 10:22:22 +02:00
Peter Simons
ec49307518 haskell-hakyll: fix test suite by providing "rev" in test environment 2016-05-03 10:22:22 +02:00
Robin Gloster
c92bca56f8 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-02 22:58:02 +00:00
Peter Simons
a2e1692730 haskell-split: disable test suite to avoid transient build failures
We have frequent build failures of "split" because the QuickCheck testsuite
cannot generate enough conclusive test cases, i.e. in

  https://hydra.nixos.org/build/34857780/nixlog/1/raw

Cc: @byorgey
2016-04-28 12:02:08 +02:00
Peter Simons
cf4a69e2ec haskell-tinc: move the tool into the haskellPackages hierarchy like all other Haskell packages 2016-04-24 20:13:27 +02:00
Robin Gloster
0087d16120 haskellPackages: clean up unnecessary overrides 2016-04-20 17:08:26 +00:00
Robin Gloster
9a8a9c43b4 haskellPackages.pango: turn off fortify hardening 2016-04-19 12:21:06 +00:00
Robin Gloster
33ef14fb62 haskellPackages: clean up unnecessary overrides 2016-04-19 12:15:23 +00:00
Robin Gloster
fd77c5c5a0 haskellPackages.gio: turn off fortify hardening 2016-04-19 10:56:55 +00:00
Robin Gloster
d020caa5b2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-18 13:49:22 +00:00
Anthony Cowley
3f845da22a haskell-modules: darwin configuration-common
- Reconfigure OpenGL/CL related packages to propagate the necessary
  framework dependencies.

- Disable tests on all versions of c2hs so package sets such as LTS
  releases work.

Closes https://github.com/NixOS/nixpkgs/pull/14609.
2016-04-14 09:17:55 +02:00
Vladimír Čunát
39ebb01d6e Merge branch 'staging', containing closure-size #7701 2016-04-13 09:25:28 +02:00
obadz
7f2163fc97 haskellPackages.haste-compiler: fix so that it now builds and runs
Required adding:
haskellPackages.haste-Cabal, and
haskellPackages.haste-cabal-install
2016-04-11 15:24:56 +01:00