alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
113469 commits 217 branches 121 tags 4.5 GiB
Commit graph

2405 commits

Author SHA1 Message Date
Peter Simons 7b17f00f2f Merge pull request #25400 from ljli/hse-simple-no-conf 
haskell: haskell-src-exts-simple: Remove configuration
 2017-05-02 08:59:09 +02:00
Peter Simons c609aecede Merge pull request #25389 from roberth/fix-haskell-tasty-discover 
haskellPackages.tasty-discover: bootstrap itself using an untested build
 2017-05-02 08:44:43 +02:00
Shea Levy 9f2bbf65af haskellSrc2nix: preferLocalBuild and use unwrapped cabal2nix. 
No need to download bazaar etc...
 2017-05-01 18:21:42 -04:00
Ryan Trinkle 1927361e44 gi-webkit2: fix gi-javascriptcore dependency 2017-05-01 15:21:57 -04:00
Leon Isenberg 299fdf7441 haskell: haskell-src-exts-simple: Remove configuration 2017-05-01 19:07:50 +02:00
Robert Hensing 14244d0f33 haskellPackages.tasty-discover: bootstrap itself using an untested build 
The tasty-discover test suite depends on tasty-discover in $PATH during
test-suite compilation. Adding an untested build of itself to build
tools fixes the problem, without putting the untested version in
the package set.
 2017-05-01 17:28:45 +02:00
Shea Levy 99c28df9e5 hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.1.1-8-g19ebdb9 from Hackage revision
3fcb79c182.
 2017-04-29 21:31:34 -04:00
Pascal Wittmann 959fadb86e yesod-auth-oauth2: jailbreak because of outdated dependencies 2017-04-28 14:40:26 +02:00
Peter Simons cd4d91eb11 Merge pull request #25254 from nh2/generic-stack-builder-no-stack-setup-lts-8.3 
generic Haskell builder: Don't call `stack setup`.
 2017-04-27 10:44:56 +02:00
Niklas Hambüchen 139b1377d4 generic Haskell builder: Don't call stack setup. 
`stack setup` should not be called inside `nix-build` because
that makes stack download a GHC instead of using nix's one
(the one provided `generic-stack-builder.nix` as the `ghc` argument),
which will not work.
Further evidence for this is that the `stack --nix` support
intentionally uses `--system-ghc` for the same purpose.
 2017-04-26 20:20:36 +02:00
Benno Fünfstück 6b36d26a24 haskell: add more callPackageWithScope docs 2017-04-25 16:08:44 +02:00
Benno Fünfstück 731e0fa742 haskell: preserve overrideScope on override 
We want code such as `(pkg.override {}).overrideScope (self: super: {})` to
work. This didn't work before, since `override` will call the original package
again, and the attribute `overideScope`, which `callPackageWithScope` added,
wasn't added again. The fix for this is to modify the package function itself
to include the `callPackageWithScope` attribute, so it'll be re-added whenever
the function is overriden for with arguments.

There is a small problem here though: since callPackage uses some magic
(`builtins.functionArgs`) to determine the auto-arguments of a function, we
can't just write `callPackageWith scope drvScope`, since
`builtins.functionArgs drvScope` will be `{}`. To fix this, we implement our own
`callPackageWith`.

Fixes https://github.com/NixOS/nixpkgs/issues/7953.
Closes https://github.com/NixOS/nixpkgs/pull/9336.
 2017-04-25 16:08:43 +02:00
Michael Alan Dorman 9b74549c0b purescript: remove overrides 
It now supports recent versions of various dependencies.
 2017-04-25 16:08:43 +02:00
Peter Simons 9fa927f106 hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.1.1-8-g19ebdb9 from Hackage revision
14048552ae.
 2017-04-25 16:08:38 +02:00
Peter Simons 2a34188f2c hackage2nix: update list of broken packages 2017-04-25 16:08:37 +02:00
Peter Simons 0f104177ad LTS Haskell 8.12 2017-04-25 16:08:00 +02:00
Peter Simons 4c0098f1dc haskell-old-time: fix build with GHC HEAD 2017-04-21 16:25:54 +02:00
Peter Simons 7462c7d2f7 haskell-utf8-string: fix build with GHC HEAD 2017-04-21 16:25:53 +02:00
Peter Simons 25a1ef369b haskell-hsdns: fix build with GHC 7.0.x and 7.2.x 2017-04-21 16:25:53 +02:00
Peter Simons f4ed1f98d1 haskell-gtksourceview: clean up overrides for versions 2 and 3 of the package 2017-04-21 16:25:53 +02:00
Benno Fünfstück 5f33eb493f haskell-packages: factor package set construction in new file 
Closes https://github.com/NixOS/nixpkgs/pull/24850.
 2017-04-21 16:25:53 +02:00
Peter Simons 9a7ba4e7a9 haskell-stack: fix build by passing an old version of "store" 2017-04-21 16:25:53 +02:00
Peter Simons 87ec7bb087 haskell-dbus: drop semicolons.patch; this change appears to have been included upstream 2017-04-21 16:25:52 +02:00
Peter Simons 4c8056a8d9 hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.1.1-8-g19ebdb9 from Hackage revision
0d6c9d1b64.
 2017-04-21 16:25:45 +02:00
Peter Simons 7cfb6509ed hackage2nix: provide old versions of "store" so that we can build stack 2017-04-21 16:24:54 +02:00
Peter Simons 6c36c19f7d LTS Haskell 8.11 2017-04-21 16:24:54 +02:00
Benno Fünfstück eb1e63505a wai-app-file-cgi: remove outdated overrides 2017-04-18 18:52:06 +02:00
Jörg Thalheim 26f5fa8f97 Merge pull request #24922 from phunehehe/haskell-shell-hook 
haskell-modules: fix shell hook
 2017-04-15 12:34:41 +02:00
Hoang Xuan Phu 2fde20e271 haskell-modules: fix shell hook 
26623240e9 lacks a newline
 2017-04-15 16:33:07 +08:00
John Ericson eec35cb6bd Merge pull request #24889 from formaltech/halvm-bump 
Remove hardening at HaLVM 2.4.0
 2017-04-14 12:58:46 -04:00
David Johnson 6f69681dad Add hardening, bump hash to HaLVM 2017-04-14 00:34:02 -05:00
Peter Simons 282bc88093 Merge pull request #24754 from shlevy/haskell-overrideSrc 
haskell-lib: Add overrideSrc helper
 2017-04-09 17:55:23 +02:00
Shea Levy a6c39ed207 haskell-lib: Add overrideSrc helper 2017-04-08 16:21:57 -04:00
Leon Isenberg 55e191d844 haskell: Correct dependencies for haskell-tools-*_0_6_0_0 2017-04-08 14:51:43 +02:00
Aristid Breitkreuz a0eabfbcbd Merge pull request #24715 from ljli/ghcjs-dep-cycle 
haskell: ghcjs packages: Break dependency cycle less invasive
 2017-04-08 12:25:54 +02:00
Aristid Breitkreuz e893646494 Merge pull request #24692 from LumiGuide/haskell-link-with-gold 
haskell: add the linkWithGold function to link packages with ld.gold
 2017-04-08 12:01:05 +02:00
Leon Isenberg 60e9371738 haskell: ghcjs packages: Remove ghcjs-prim 
It is wired into ghcjs now.
 2017-04-07 21:41:01 +02:00
Leon Isenberg 7a08e57b9e haskell: ghcjs packages: Break dependency cycle less invasive 
Between cabal and hscolour.
 2017-04-07 19:02:52 +02:00
Bas van Dijk c865b8e35e haskell: add the linkWithGold function to link packages with ld.gold 
Also support linking the double-conversion package with ld.gold.
 2017-04-07 09:44:11 +02:00
Shea Levy 5e984362f6 haskell generic builder: Use ghcjs's hsc2hs. 
This is required when using ghcjs to compile Setup.hs, which we do since #23614.

See comments on c35350a212
 2017-04-06 03:16:00 -04:00
Luke Clifton 5ffece7de1 llvm-hs: Point llvm-hs to llvm_4 2017-04-05 16:51:45 +08:00
Peter Simons fa365c2b9d haskell-language-nix: fix build with GHC 7.6.3 2017-04-04 16:29:12 +02:00
Peter Simons 046c5c57d0 haskell-binary: update 0.8.x branch to latest version 2017-04-04 16:29:12 +02:00
Peter Simons b232d2f4e4 hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.1.1 from Hackage revision
f68bd69837.
 2017-04-04 16:29:06 +02:00
Peter Simons 4f62f342f6 hackage2nix: disable Hydra builds for accelerate-* packages with unfree license 2017-04-04 16:29:04 +02:00
Peter Simons e0160f70da LTS Haskell 8.8 2017-04-04 16:29:04 +02:00
Shea Levy 1feca4cae3 haskellPackages: Export haskellSrc2nix and hackage2nix 
Allows using a different haskell package set to generate the nix
expressions (during eval time) than the one used to actually build the
package (at build time).
 2017-04-03 08:13:07 -04:00
Rickard Nilsson 37847f263c haskellPackages.tailfile-hinotify: Disable test suite 2017-03-31 11:15:17 +02:00
Peter Simons b6c93177e7 hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.1.1 from Hackage revision
16a802d4af.
 2017-03-30 19:30:30 +02:00
Peter Simons 4753a00caa haskell-QuickCheck: fix build with GHC 7.4.x 2017-03-29 20:30:29 +02:00
Peter Simons a4ce475b61 haskell-void: fix build with GHC 7.8.x 2017-03-29 20:30:29 +02:00
Peter Simons f79cb54cee haskell-extra: disable failing test suite on GHC 7.8.x 2017-03-29 20:30:28 +02:00
Peter Simons a77e74d409 haskell-QuickCheck: fix build with GHC 7.8.x 2017-03-29 20:30:28 +02:00
Leon Isenberg 2553ceb982 haskell: use GHCJS to build Setup.hs for GHCJS packages 
Closes https://github.com/NixOS/nixpkgs/pull/23614.
 2017-03-29 20:30:28 +02:00
Peter Simons 80a52e22b3 haskell-haddock-library: enable test suite again 2017-03-29 20:30:28 +02:00
Peter Simons 4c9306f4aa haskell-haddock-api: drop obsolete patches 2017-03-29 20:30:28 +02:00
Peter Simons c8375914ad haskell-arithmoi: re-enable test suite 2017-03-29 20:30:27 +02:00
Peter Simons b0136d38f6 hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.1-8-geba56da from Hackage revision
976e3524ee.
 2017-03-29 20:30:22 +02:00
Peter Simons c356cd69c8 hackage2nix: disable broken builds 2017-03-29 20:30:21 +02:00
Peter Simons 2ab1c0611f LTS Haskell 8.6 2017-03-29 20:30:21 +02:00
Robert Hensing 39af068aba mysql-haskell: dontCheck because check requires running server 2017-03-27 09:34:37 +02:00
Peter Simons 50cce50143 callCabal2nix: Revert "Don't rebuild unchanged cabal file" 
This reverts commit 24b47526ce since it broke
callCabal2nix, apparently. See https://github.com/NixOS/nixpkgs/issues/24245
for details.
 2017-03-27 09:00:06 +02:00
Peter Simons 24a69286e9 Merge pull request #23610 from ljli/hs-ghcjs-pkgs-inherit 
haskellPackages: apply GHC specific overrides before GHCJS
 2017-03-24 23:15:41 +01:00
Robin Gloster 693d0e7fea
haskellPackages.yi-keymap-vim: dontCheck 
Tries to access path outside of sandbox.
 2017-03-22 01:26:40 +01:00
Peter Simons 659ea1e24a Merge pull request #24099 from jerith666/friday-juicypixels-test 
friday-juicypixels: disable tests
 2017-03-20 17:39:31 +01:00
Matt McHenry cd426e66b8 friday-juicypixels: disable tests 
the tarball from
https://hackage.haskell.org/package/friday-juicypixels-0.1.2/friday-juicypixels-0.1.2.tar.gz
does not include the test/rgba8.png file, which causes the test
code to fail
 2017-03-20 12:19:02 -04:00
Peter Simons d59fe189fd haskell-configuration-nix: drop obsolete webkit-related overrides 2017-03-20 10:24:58 +01:00
Michael Alan Dorman 6236cd4716 pointfree: patch is no longer needed 2017-03-20 10:24:58 +01:00
Peter Simons 8f45ea6175 hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.1-7-g490c7d5 from Hackage revision
abc129b4f1.
 2017-03-20 10:24:58 +01:00
Peter Simons c3b0cb1ace hackage2nix: keep binary 0.8.x around 2017-03-20 10:24:57 +01:00
Peter Simons d3028ba6b5 LTS Haskell 8.5 2017-03-20 10:24:57 +01:00
Peter Simons 8c00f3432a Merge pull request #23982 from ElvishJerricco/callCabal2nix-dont-rebuild-cabalfile 
callCabal2nix: Fixed indentation
 2017-03-17 13:23:11 +01:00
Will Fancher 934c8c7a93 callCabal2nix: Fixed indentation 2017-03-17 04:32:34 -04:00
Domen Kožar a17e8e7e72
servant-auth-server, servant-swagger: enable hydra build 2017-03-16 15:13:04 +01:00
Peter Simons e916236130 Merge pull request #23615 from ljli/ghcjs-dom-jsffi-fix 
haskell: ghcjs packages: fix ghcjs-dom-jsffi with newer Cabal
 2017-03-14 16:09:37 +01:00
Will Fancher 24b47526ce callCabal2nix: Don't rebuild unchanged cabal file 
It can be quite annoying that callCabal2nix will build a new derivation
if anything in the source has changed, even if the cabal file hasn't.
 2017-03-13 22:20:56 -04:00
Domen Kožar 609f2fefce Merge pull request #23836 from expipiplus1/jailbreak-strict-io 
Haskell Packages: jailbreak strict-io
 2017-03-13 13:27:37 +01:00
Joe Hermaszewski 0867ac9963 Haskell Packages: jailbreak strict-io 2017-03-13 11:27:08 +00:00
Benno Fünfstück 6c99f88eec fix typo in comment 2017-03-12 22:47:28 +01:00
Benno Fünfstück 039c6a6dfa haskell: comment about configuration-nix.nix's intersectAttrs 2017-03-12 22:45:19 +01:00
Jörg Thalheim d0922896be Merge pull request #23097 from dmjio/halvm 
Initial commit of HaLVM support
 2017-03-12 18:31:29 +01:00
Vladimír Čunát 69448187a4
haskellPackages.llvm-general-darwin: fix #23794 
by hiding under llvm-general.  There seems no use in a separately named
attribute.  The derivations are unchanged.
 2017-03-12 18:19:35 +01:00
David Johnson 26623240e9 Init HaLVM at 2.4.0 2017-03-10 19:31:12 -06:00
Rickard Nilsson fb5369dbe9 haskellPackages.streaming-eversion: dontCheck 2017-03-08 17:18:18 +01:00
Leon Isenberg 07905c8f93 haskell: ghcjs packages: fix ghcjs-dom-jsffi with newer Cabal 2017-03-08 16:28:54 +01:00
Michael Alan Dorman 763e21e982 haskell-gi-base: propagate gobjectIntrospection dependency 
So the thinking is: anything that needs `haskell-gi-base` is going to
need `gobjectIntrospection` in order to work correctly; by adding this
one `buildDepends` (which therefore gets propagated), we put ourselves
in a position to simplify away a bunch of code in `cabal2nix`.
 2017-03-08 15:17:39 +01:00
Michael Alan Dorman d7496b560e gi-webkit2: fix gi-javascriptcore dependency 
This actually depends on the specially-versioned gi-javascriptcore
package.
 2017-03-08 15:17:39 +01:00
Peter Simons c71d1e72b2 LTS Haskell 8.4 2017-03-08 15:17:39 +01:00
Peter Simons 9d9cc7ba5f hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.1-2-g3de0b84 from Hackage revision
e5e1058cde.
 2017-03-08 15:17:39 +01:00
Leon Isenberg b9c7d291bc haskellPackages: apply GHC specific overrides before GHCJS 
GHCJS is effectively a backend for GHC, so all the GHC version specific package set overrides should in
general apply to the GHCJS package sets, too.
 2017-03-08 13:10:28 +01:00
Peter Simons 060f7cb94d haskell-generic-builder: remove unused nodePackages argument 2017-03-08 09:38:12 +01:00
Peter Simons f641e9022e Merge pull request #23609 from ljli/hs-lens-pkg-conf 
haskell: ghc710x packages: remove superflous configuration for lens
 2017-03-08 09:22:17 +01:00
Leon Isenberg 032de64e0f haskell: ghc710x packages: remove superflous configuration for lens 2017-03-07 20:21:27 +01:00
Domen Kožar db23fe1581
haskell: add justStaticExecutables combinator 2017-03-07 18:13:59 +01:00
Peter Simons e0908699ff haskell-QuickCheck: fix build with ghc-7.6.x 2017-03-07 15:43:19 +01:00
Peter Simons 85a06d6b8d haskell-shelly: drop obsolete overrides 2017-03-06 14:35:21 +01:00
Peter Simons 1329368d82 hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.1-2-g3de0b84 from Hackage revision
ea0774dfde.
 2017-03-06 14:35:21 +01:00
Peter Simons fb5b6ddab6 hackage2nix: revert to old version of store 2017-03-06 14:35:21 +01:00
Peter Simons dd20fbe5d1 hackage2nix: disable failing builds 2017-03-06 14:35:21 +01:00
Tom Hunger 6e5eaf58a3 purescript: pin dependencies. 2017-03-06 14:35:21 +01:00
Leon Isenberg 2b174d5114 haskell: ghc710x packages: fix dependent-map 2017-03-05 18:31:55 +01:00
Leon Isenberg 691b3bcd77 haskellPackages: fix dangling references 
haskeline_0_7_2_1 -> haskline_0_7_3_1
terminfo_0_4_0_1 -> terminfo_0_4_0_2
 2017-03-05 16:45:31 +01:00
Shea Levy ef5986e03c haskellSrc2nix: Change sha arg when sha256 is null. 
Otherwise it just fails due to no nix-prefetch-url
 2017-03-04 13:18:14 -05:00
Peter Simons e47a0ae767 haskell-arithmoi: test suite fails on i686 
(cherry picked from commit cb1af9fd4f)
 2017-03-04 14:11:55 +01:00
Peter Simons 7a9881de61 haskell-diagrams-lib: test suite fails on i686 
(cherry picked from commit 3e3dfdd085)
 2017-03-04 14:06:22 +01:00
Domen Kožar a32a00eb81
haskellPackages.http-api-data: dontCheck 
(cherry picked from commit 2f4003b561)
Signed-off-by: Domen Kožar <domen@dev.si>
 2017-03-03 11:46:09 +01:00
Peter Simons b923fd5253 git-annex 6.20170301.1 tarballs are no longer available anywhere; now we must use fetchgit 2017-03-02 22:11:58 +01:00
Peter Simons 090921fa5f hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.1-2-g3de0b84 from Hackage revision
163561eab9.
 2017-03-02 22:11:48 +01:00
Peter Simons 197236af88 hackage2nix: disable broken builds 2017-03-02 22:11:46 +01:00
Nikolay Amiantov 86a0a1eced haskellPackages.lambdabot-haskell-plugins: remove overrides 2017-03-02 21:41:25 +03:00
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