1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 22:50:49 +00:00
Commit graph

2178 commits

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