Commit Graph

4944 Commits

Author SHA1 Message Date
Alexander Foremny
d987fedd43 Merge remote-tracking branch 'upstream/master' into haskell-snap
Conflicts:
	pkgs/development/libraries/haskell/comonad-transformers/default.nix
	pkgs/development/libraries/haskell/semigroupoids/default.nix
	pkgs/top-level/haskell-packages.nix
2012-07-26 12:27:59 +02:00
Alexander Foremny
932574a529 Add package haskell-snap and dependencies
comonad-1.1.1.6
comonad-3.0.0.1
configurator-0.2.0.0
contravariant-0.2.0.2
data-lens-2.10.1
data-lens-template-2.1.5
distributive-0.2.2
heist-0.8.1.1
semigroupoids-1.3.4
snap-0.9.1.1
xmlhtml-0.2.0.0
2012-07-26 12:17:26 +02:00
Peter Simons
da63b3d2e7 haskell-benchpress: update to version 0.2.2.6 2012-07-26 11:07:00 +02:00
Lluís Batlle i Rossell
beb64d1bea readline: picking more patches from upstream
I'm particularly interested in 003, which solves a copy-paste trouble I have
copying matrices into octave, having enabled fltk.
2012-07-25 18:14:52 +02:00
Shea Levy
3a37f47fd4 v8: build with gyp.
The scons build has been deprecated
2012-07-25 11:42:15 -04:00
Shea Levy
a9cd20e601 v8: Update to 3.11.10.15 2012-07-25 10:26:34 -04:00
Peter Simons
2302e45632 haskell-vector-space: update to version 0.8.2 2012-07-25 15:48:12 +02:00
Peter Simons
076d0635b3 haskell-tls: update to version 0.9.8 2012-07-25 15:48:12 +02:00
Peter Simons
99903896a8 haskell-snap: update to version 0.9.1.1 2012-07-25 15:48:11 +02:00
Peter Simons
6d7f1e10ad haskell-semigroupoids: update to version 3.0 2012-07-25 15:48:11 +02:00
Peter Simons
2cadf555b0 haskell-data-lens: update to version 2.10.1 2012-07-25 15:48:11 +02:00
Peter Simons
1d5c4851a0 haskell-comonad: update to version 3.0.0.1 2012-07-25 15:48:10 +02:00
Peter Simons
acd0cdbe72 haskell-comonad-transformers: update to version 3.0 2012-07-25 15:48:10 +02:00
Peter Simons
96fd0e446a haskell-HsOpenSSL: update to version 0.10.3.2 2012-07-25 15:48:10 +02:00
Eelco Dolstra
63b257e0e1 Revert "ffmpeg: Update to latest version 0.11.1."
This reverts commit c6a2a1f885.
2012-07-24 11:43:31 -04:00
Eelco Dolstra
bb8ac70291 Revert "ffmpeg: Add option to enable x11grab support."
This reverts commit 05831d3a66.
2012-07-24 11:43:30 -04:00
Eelco Dolstra
605f9bec52 Revert "ffmpeg: Add alsaLib to dependencies."
This reverts commit d9f08cf6f2.
2012-07-24 11:43:29 -04:00
Eelco Dolstra
bf4c4d7a36 Revert "ffmpeg: Add optional Jack audio support."
This reverts commit fe42f8add9.
2012-07-24 11:43:24 -04:00
Florian Friesdorf
471a9615a2 fix mpich2 and mplayer 2012-07-24 14:17:45 +02:00
Peter Simons
65235ec558 Merge pull request #54 from aszlig/ffmpeg-x11grab
ffmpeg: Add option to enable x11grab support.
2012-07-23 11:22:09 -07:00
Peter Simons
bef1738d0e Merge pull request #57 from dstcruz/snap
Haskell libraries required for Snap development
2012-07-23 11:18:43 -07:00
Lluís Batlle i Rossell
8686b20bec opencv: update from 2.4.1 to 2.4.2 2012-07-23 16:09:45 +02:00
Peter Simons
1e9adc147d haskell-tls: update to version 0.9.7 2012-07-23 11:56:21 +02:00
Peter Simons
176e44ab69 haskell-terminfo: update to version 0.3.2.4 2012-07-23 11:56:21 +02:00
Peter Simons
7ffb4c1471 haskell-shakespeare: update to version 1.0.1 2012-07-23 11:56:21 +02:00
Peter Simons
3c92eb2e66 haskell-shakespeare-text: update to version 1.0.0.3 2012-07-23 11:56:21 +02:00
Peter Simons
49a87bc72b haskell-shakespeare-js: update to version 1.0.0.4 2012-07-23 11:56:21 +02:00
Peter Simons
0909580c51 haskell-shakespeare-css: update to version 1.0.1.3 2012-07-23 11:56:21 +02:00
Peter Simons
17c2d161d8 haskell-process-extras: update to version 0.1.1 2012-07-23 11:56:21 +02:00
Peter Simons
4bfa404d75 haskell-directory-tree: update to version 0.10.1 2012-07-23 11:56:21 +02:00
Peter Simons
f110ebe38e haskell-benchpress: update to version 0.2.2.5 2012-07-23 11:56:21 +02:00
Peter Simons
974fcebd7f haskell-AspectAG: update to version 0.3.5 2012-07-23 11:56:21 +02:00
Peter Simons
b400d48a99 haskell-HUnit: update to version 1.2.5.1 2012-07-23 11:37:23 +02:00
Lluis Batlle
d23b81b6ee libextractor: Fixing about videoSupport builtInputs.
I don't know how could I commit the weird lines I fix.
2012-07-22 10:28:04 +02:00
Lluís Batlle i Rossell
a78098451e webkit-1.4: fix build (perl versions)
Setting perl 5.10 later on buildInputs so it detects this 5.10 perl instead of
the 5.14 that comes through some propagatedBuildInputs. I don't know what one.
2012-07-21 15:46:23 +02:00
Daniel Santa Cruz
a2762b5254 Haskell libraries required for Snap development 2012-07-19 22:37:21 -04:00
Cillian de Róiste
fe42f8add9 ffmpeg: Add optional Jack audio support.
The author of this commit is @cillianderoiste because he made the patch and I'm
just committing it.

This change adds support for Jack audio "while we're at it", see discussion at
pull request #54.
2012-07-19 04:37:33 +02:00
aszlig
d9f08cf6f2 ffmpeg: Add alsaLib to dependencies.
As @cillianderoiste pointed out, it makes sense to have this in, not only to
record audio while grabbing the display. This is not optional in this case, as
it isn't a compile time option either. And on the other hand, having ffmpeg
running with OSS doesn't appear reasonable to me, as ffmpeg will fall back to
OSS if alsa isn't available anyway.
2012-07-18 17:27:24 +02:00
Eelco Dolstra
c101d6fd63 Fix Nixpkgs evaluation
http://hydra.nixos.org/build/2842914
2012-07-18 11:16:02 -04:00
Peter Simons
bdc0530f93 Revert updates to srcloc, mainland-pretty, and language-c-quote to un-break accelerate-cuda. 2012-07-18 16:05:10 +02:00
Peter Simons
24f7a2b72b haskell-hslogger-template: update to version 2.0.1 2012-07-18 14:37:08 +02:00
Peter Simons
05952b2e37 haskell-Hipmunk: update to version 5.2.0.10 2012-07-18 14:37:07 +02:00
Peter Simons
5b0edeb003 haskell-HUnit: add version 1.2.5.0 2012-07-18 14:37:01 +02:00
aszlig
05831d3a66 ffmpeg: Add option to enable x11grab support.
This is especially useful if you want to do screencasts and other sorts of
things like that.
2012-07-18 14:33:26 +02:00
aszlig
c6a2a1f885 ffmpeg: Update to latest version 0.11.1.
This is needed in order to enable x11grab, as it isn't included in 0.10.
2012-07-18 13:34:22 +02:00
Peter Simons
b6325a7213 tbb: add version 4.0-u5 2012-07-18 12:44:37 +02:00
Peter Simons
bf195b742e haskell-srcloc: update to version 0.2.0 2012-07-18 11:43:54 +02:00
Peter Simons
0ed4ac39b6 haskell-mainland-pretty: update to version 0.2.1 2012-07-18 11:43:53 +02:00
Peter Simons
11e260ec74 haskell-language-c-quote: update to version 0.4.0 2012-07-18 11:43:53 +02:00
Peter Simons
f3aa348936 haskell-benchpress: fix build with modern versions of GHC 2012-07-18 11:43:53 +02:00
Peter Simons
884e91e9a7 Merge pull request #45 from 7c6f434c/texlive-2012
TeXLive: update to 2012 snapshot from Debian
2012-07-18 02:39:42 -07:00
Peter Simons
3c167d0340 Add meta.maintainer to Haskell packages. 2012-07-18 11:36:17 +02:00
Peter Simons
63d6e4fe2e Merge pull request #49 from dmalikov/master
Add haskell-lambdabot
2012-07-18 02:35:41 -07:00
Andres Loeh
c432af3932 Revert "haskell-language-c-quote: update to version 0.4.0"
This reverts commit 3be2d8d9cd.

Depends on recent version of mainland-pretty, which in turn depends on
srcloc-2 which in turns breaks accelerate-cuda.
2012-07-18 10:25:52 +02:00
Andres Loeh
fe4677de2f Revert "haskell-mainland-pretty: update to version 0.2.1"
This reverts commit 8e85516e04.

This depends on srcloc-2, and srcloc-2 breaks accelerate-cuda.
2012-07-18 10:25:52 +02:00
Andres Loeh
001fb53524 Revert "haskell-srcloc: update to version 0.2.0"
This reverts commit ffbdd377f1.

Version 0.2.0 breaks accelerate-cuda, and doesn't seem to be required
or used in many other places, so I'll just revert.
2012-07-18 10:25:52 +02:00
Andres Loeh
a6bf9b8bdf Add haskell-glpk-hs. 2012-07-18 10:25:52 +02:00
Dmitry Malikov
18c6e6c9d6 Bump lambdabot version 2012-07-18 08:56:41 +02:00
Dmitry Malikov
c145369e3c Add haskell/dataInttrie 2012-07-18 08:48:34 +02:00
Dmitry Malikov
71be80e8e9 Some correctness 2012-07-18 08:48:34 +02:00
Dmitry Malikov
d16ef6d182 Add haskell/unlambda 2012-07-18 08:48:34 +02:00
Dmitry Malikov
0e8b4cd7ad Add haskell/show 2012-07-18 08:48:34 +02:00
Dmitry Malikov
f3319f0cf6 Add haskell/oeis 2012-07-18 08:48:34 +02:00
Dmitry Malikov
67e105efd0 Add haskell/numbers 2012-07-18 08:48:34 +02:00
Dmitry Malikov
d972bae84f Add haskell/logict 2012-07-18 08:48:34 +02:00
Dmitry Malikov
0a5a20d365 Add haskell/lambdabot-utils 2012-07-18 08:48:33 +02:00
Dmitry Malikov
269f013d90 Add haskell-IOSpec 2012-07-18 08:48:33 +02:00
Dmitry Malikov
4c50696a1b Add haskell/data-memocombinators 2012-07-18 08:48:33 +02:00
Dmitry Malikov
cac9051fbf Add brainfuck 2012-07-18 08:48:33 +02:00
Dmitry Malikov
5c12df46cf Add haskell-lambdabot 2012-07-18 08:48:33 +02:00
Peter Simons
0b0babffc5 Add meta.maintainer attribute to Haskell packages. 2012-07-16 11:36:56 +02:00
Peter Simons
76c096e4ea haskell-hoogle: revert update to version 4.2.12
We need a current version of http-types for this update.
2012-07-16 11:22:51 +02:00
Peter Simons
ffbdd377f1 haskell-srcloc: update to version 0.2.0 2012-07-16 11:21:30 +02:00
Peter Simons
932ee764a4 haskell-simple-sendfile: update to version 0.2.5 2012-07-16 11:21:30 +02:00
Peter Simons
8e85516e04 haskell-mainland-pretty: update to version 0.2.1 2012-07-16 11:21:30 +02:00
Peter Simons
3be2d8d9cd haskell-language-c-quote: update to version 0.4.0 2012-07-16 11:21:29 +02:00
Peter Simons
666a1aa727 haskell-hoogle: update to version 4.2.12 2012-07-16 11:21:29 +02:00
Peter Simons
3c090b3f29 haskell-gitit: patch to support current version of hslogger 2012-07-16 11:21:29 +02:00
Peter Simons
e97fd3491a Merge pull request #50 from dstcruz/yesod
Packages needed for Yesod + Postgresql development
2012-07-16 01:19:49 -07:00
Daniel Santa Cruz
0d64ae8335 Packages needed for Yesod + Postgresql development 2012-07-15 14:40:58 -04:00
Peter Simons
d4f99e2395 haskell-yesod-json: update to version 1.0.1.0 2012-07-14 11:14:40 +02:00
Peter Simons
d5cbb3ce2c haskell-system-fileio: update to version 0.3.9 2012-07-14 11:14:40 +02:00
Peter Simons
58a5340112 haskell-symbol: update to version 0.1.3 2012-07-14 11:14:40 +02:00
Peter Simons
618a95a37b haskell-srcloc: update to version 0.1.2 2012-07-14 11:14:40 +02:00
Peter Simons
e2b33fbbca haskell-shelly: update to version 0.13.0.1 2012-07-14 11:14:39 +02:00
Peter Simons
50df34469d haskell-mainland-pretty: update to version 0.1.3.0 2012-07-14 11:14:39 +02:00
Peter Simons
f405ab6467 haskell-largeword: update to version 1.0.2 2012-07-14 11:14:39 +02:00
Peter Simons
b012e956ad haskell-language-c-quote: update to version 0.3.2 2012-07-14 11:14:39 +02:00
Peter Simons
3ff1801d9e haskell-hledger: update to version 0.18.2 2012-07-14 11:14:39 +02:00
Peter Simons
3a602ec029 haskell-hledger-web: update to version 0.18.2 2012-07-14 11:14:39 +02:00
Peter Simons
23dcb273a1 haskell-hledger-lib: update to version 0.18.2 2012-07-14 11:14:39 +02:00
Peter Simons
7a539c2b1b haskell-haxr: update to version 3000.9.0.1 2012-07-14 11:14:39 +02:00
Peter Simons
ad0f0d6817 haskell-hastache: update to version 0.4.1 2012-07-14 11:14:39 +02:00
Peter Simons
658b9855fe haskell-happstack-server: update to version 7.0.3 2012-07-14 11:14:39 +02:00
Peter Simons
6838d503ab haskell-hakyll: update to version 3.4.0.0 2012-07-14 11:14:38 +02:00
Peter Simons
39fb1d6f38 haskell-binary: update to version 0.5.1.1 2012-07-14 11:14:38 +02:00
Peter Simons
d29fe161ce haskell-base-unicode-symbols: update to version 0.2.2.4 2012-07-14 11:14:38 +02:00
Peter Simons
9dfeb7c0d0 haskell-async: update to version 2.0.1.1 2012-07-14 11:14:38 +02:00
Peter Simons
bb7be36700 haskell-Vec: update to version 1.0 2012-07-14 11:14:38 +02:00
Peter Simons
3b532b371a haskell-SHA: update to version 1.5.1 2012-07-14 11:14:38 +02:00