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
Peter Simons
65b67ce2a1
haskell-Hipmunk: update to version 5.2.0.9
2012-07-14 11:14:38 +02:00
Peter Simons
3f7c859b8e
haskell-maude: update to version 0.6.1
2012-07-14 11:02:38 +02:00
Peter Simons
b52336f242
haskell-process-extras: add version 0.1.0
2012-07-14 11:02:12 +02:00
Peter Simons
297982be34
haskell-mime-types: add version 0.1.0.0
2012-07-14 11:01:59 +02:00
Peter Simons
45f6ee29ec
haskell-JuicyPixels: add meta.maintainer
2012-07-14 10:55:23 +02:00
Peter Simons
b5d312a56c
haskell-hoauth: add meta.maintainer
2012-07-14 10:54:43 +02:00
Eelco Dolstra
ae67368e54
exif / libexif: Update to 0.6.21
...
Addresses CVE-2012-2812, CVE-2012-2813, CVE-2012-2814, CVE-2012-2836,
CVE-2012-2837, CVE-2012-2840, CVE-2012-2841 and CVE-2012-2845.
2012-07-13 12:34:22 -04:00
Michael Raskin
f2a77f5d9d
TeXLive: update to 2012 snapshot from Debian
2012-07-13 18:18:52 +04:00
Shea Levy
9e7363b750
Merge commit 'b9e1a3f'
...
Add JuicyPixels package from Hackage.
2012-07-11 22:13:31 -04:00
Alexander Foremny
b9e1a3f109
Add JuicyPixels Haskell package
...
Forgot to attach the Nix expression for that package. It is generated by
cabal2nix and works fine on my machine (i686, ghc7.4.1).
2012-07-11 21:55:39 +02:00
Lluís Batlle i Rossell
8fd57ff21e
libextractor: fixing the videoSupport = false
...
I comitted it wrong before.
2012-07-11 20:29:44 +02:00
Lluís Batlle i Rossell
b4e0565a86
libextractor: allow disabling video support.
2012-07-11 20:20:14 +02:00
Lluís Batlle i Rossell
6163742ea4
libgsf: fix build without gnome support
...
I recently committed it with broken without-gnome support.
2012-07-11 20:15:06 +02:00
Lluís Batlle i Rossell
db46c668b8
libgsf and libextractor: allow build without gtk/gnome
...
I leave them enabled by default though; I don't really know how much it helps,
having them built with gtk or gnome support.
I head towards building gnunet without gtk dependencies.
2012-07-11 20:05:36 +02:00
Alexander Foremny
0b71387b76
Add haskell-hoauth-0.3.4
2012-07-11 11:05:24 +02:00
Peter Simons
12c0998e03
libmng: build library with Automake 1.10.x; the build fails with later versions
2012-07-10 16:15:30 +02:00
Andres Loeh
91cfda020b
haskell-accelerate-cuda: Patch Setup file
2012-07-10 10:44:51 +02:00
Shea Levy
158e74fd43
Merge branch 'lv2-support' of https://github.com/cillianderoiste/nixpkgs-goibhniu
...
Add lv2 support
All builds, and the only change that's not a pure addition is to
ardour3, which Cillian maintains.
If there are future lv2 plugins coming, it may make sense to group them
somehow in all-packages.
2012-07-07 20:53:14 -04:00
Peter Simons
af61749b18
cyrus-sasl: update to version 2.1.25
2012-07-07 13:01:02 +02:00
Peter Simons
a59ed42a8b
boost-1.50: added 'taggedLayout' parameter to force use of tagged layout in single variant builds
2012-07-07 12:01:25 +02:00
Peter Simons
eb7ad413b8
boost-1.44: add 'taggedLayout' parameter to force use of tagged layout in single-variant builds
2012-07-07 11:57:14 +02:00
Peter Simons
fda57fdd5e
ccrtp-1.8: fix build with gcc 4.6
2012-07-07 11:44:28 +02:00
Peter Simons
2659c3be45
apr-util: enable SSL support by default and enable ldapSupport on Darwin, too
2012-07-07 08:47:19 +02:00
Peter Simons
2199730941
apr: strip trailing whitespace
2012-07-07 08:47:19 +02:00
Peter Simons
f47c5d6bd7
openldap: update to version 2.4.31
2012-07-07 08:47:19 +02:00
Ludovic Courtès
5debe94bb3
gmp: don't build fat binaries on Solaris
2012-07-07 00:59:40 +02:00
Lluís Batlle i Rossell
96a0a68598
ffmpeg: build the ffserver
...
Since the first expression of ffmpeg, it's disabled. I don't know why.
It does not require more dependencies.
2012-07-06 12:10:06 +02:00
Lluís Batlle i Rossell
8427f56203
ffmpeg: adding libdc1394 support (default false)
2012-07-06 12:01:58 +02:00
Lluís Batlle i Rossell
758209f075
Adding libdivsufsort.
...
Required for zpaq; I want to package it.
2012-07-06 12:01:49 +02:00
Cillian de Róiste
a2501c3561
Adding lv2 support
...
LV2 is a portable plugin standard for audio systems, similar in scope to LADSPA, VST, AU, and others. The Calf audio plugin pack uses LV2 and Ardour3 has also been updated to support LV2 Plugins
2012-07-05 23:29:45 +02:00
Ludovic Courtès
1ae3ea8385
hwloc: Propagate `pciutils'.
2012-07-05 11:55:24 +02:00
Peter Simons
622a53ca61
haskell-yesod-core: update to version 1.0.1.3
2012-07-05 11:22:36 +02:00
Peter Simons
6e6a037272
haskell-wxcore: update to version 0.90.0.3
2012-07-05 11:22:36 +02:00
Peter Simons
5784af1772
haskell-wxc: update to version 0.90.0.4
2012-07-05 11:22:36 +02:00
Peter Simons
54b28b0300
haskell-tls: update to version 0.9.6
2012-07-05 11:22:35 +02:00
Peter Simons
83c234b48a
haskell-async: update to version 2.0.1.0
2012-07-05 11:22:35 +02:00
Peter Simons
9fdec86356
haskell-syb: add version 0.3.7
2012-07-05 11:22:35 +02:00
Peter Simons
e8cbee8278
haskell-stm: add version 2.4
2012-07-05 11:22:35 +02:00
Lluís Batlle i Rossell
aa75c065d4
libmikmod and mikmod: update the former to 3.2.0, and add mikmod.
2012-07-04 23:43:25 +02:00
Lluís Batlle i Rossell
d0bfd4b623
opencv: updating to 2.4.1.
...
Let's hydra tell us if it breaks anything.
2012-07-04 09:59:31 +02:00
Lluís Batlle i Rossell
ef1d8eb915
xine-lib: removing a now unused patch
...
I forgot that in a previous commit.
2012-07-02 23:09:01 +02:00
Lluís Batlle i Rossell
946f2c10ea
xineLib: update to 1.2.2
2012-07-02 23:04:11 +02:00
Lluís Batlle i Rossell
f0e4e770f0
fltk: updating, the old url didn't work.
2012-07-02 22:26:38 +02:00
Lluís Batlle i Rossell
cace272941
opencv 2.1: fixing the build
...
Related to libpng versions, and the gcc change (ptrdiff_t vs std::ptrdiff_t)
2012-07-02 20:18:48 +02:00
Peter Simons
2e1e7fcc4c
gtkdatabox: add version 0.9.1.3
...
Patch submitted by Jan Malakhovski <oxij@oxij.org>.
2012-07-02 17:13:36 +02:00
Peter Simons
a2981c1d24
SDL_net: fix-up installed headers
...
Patch submitted by Jan Malakhovski <oxij@oxij.org>.
2012-07-02 16:53:54 +02:00
Peter Simons
225ee0a26c
ffmpeg: enable support for libvdpau acceleration
...
Patch submitted by Jan Malakhovski <oxij@oxij.org>.
2012-07-02 16:53:53 +02:00
Peter Simons
a2f4366497
libvdpau: simplify arguments to this function
...
Patch submitted by Jan Malakhovski <oxij@oxij.org>.
2012-07-02 16:53:52 +02:00
Peter Simons
281494cd51
libdrm: enable support for experimental radeon API
...
Patch submitted by Jan Malakhovski <oxij@oxij.org>.
2012-07-02 16:53:52 +02:00
Peter Simons
d98161617f
Update Haskell packages.
...
- hinotify: added meta.maintainers section
- hledger-lib: update to version 0.18.1
- hledger: update to version 0.18.1
- hledger-web: update to version 0.18.1
- lifted-base: update to version 0.1.1.1
- monad-control: update to version 0.3.1.4
- multiarg: update to version 0.4.0.0
- pandoc: update to version 1.9.4.2
- shelly: update to version 0.12.2
2012-07-02 10:46:19 +02:00
Shea Levy
4f8d6d0ee2
Merge remote-tracking branch 'peti/boost-cleanup'
...
Keep boost-1.49 for now.
2012-07-02 01:05:52 -04:00
Andres Loeh
823f7d012b
Add haskell-remote.
2012-07-01 18:58:50 +02:00
David Guibert
a97e27fc82
git-annex: update to 3.20120624
2012-06-29 21:09:52 +02:00
Peter Simons
b9f9ed68e8
haskell-shelly: update to version 0.12.1
2012-06-29 12:05:29 +02:00
Peter Simons
bcfe8814cc
haskell-resourcet: update to version 0.3.3.1
2012-06-29 12:05:29 +02:00
Peter Simons
42faecad0d
boost: delete unused versions 1.42.0, 1.48.0, and 1.49.0 as well as 1.49.0-headers
2012-06-28 18:06:59 +02:00
Peter Simons
8498c9b86c
boost: update to version 1.50.0
2012-06-28 16:42:41 +02:00
Peter Simons
c5c98b7617
Updated Haskell packages.
...
- derive: updated to version 2.5.9
- ghc-mod: updated to version 1.11.0
- hamlet: updated to version 1.0.1.4
- http-conduit: updated to version 1.4.1.10
- leksah: updated to version 0.12.1.3
- mmap: updated to version 0.5.8
- mtl: added version 2.1.2
- prolog-graph-lib: updated to version 0.2.0.1
- prolog: updated to version 0.2.0.1
- reactive-banana-wx: updated to version 0.6.0.1
- resourcet: updated to version 0.3.3
- shelly: updated to version 0.12.0.2
- simple-sendfile: updated to version 0.2.4
- syb: added version 0.3.6.2
- wai-app-static: updated to version 1.2.0.4
- wai: updated to version 1.2.0.3
- warp: updated to version 1.2.2
- xml-types: updated to version 0.3.2
- zlib-conduit: updated to version 0.4.0.2
2012-06-28 14:50:44 +02:00
Mathijs Kwik
38bcd42219
shelly: new package through cabal2nix
2012-06-28 11:41:58 +02:00
Mathijs Kwik
d4d440ae0a
libmatroska: upgrade 1.0.0 -> 1.3.0
2012-06-28 11:41:57 +02:00
Mathijs Kwik
af7fe29943
libebml: upgrade 1.0.0 -> 1.2.2
2012-06-28 11:41:57 +02:00
Shea Levy
9400646dcd
Merge remote-tracking branch 'aszlig/glibc_ssp_fix'
...
glibc 2.13 and 2.14 fail to build with our current stdenv unless the ssp is
disabled. For glibc 2.13, I've only disabled the ssp when it's being built with
a complete stdenv to avoid a stdenv rebuild
2012-06-27 11:11:36 -04:00
aszlig
f5a5915f6e
Work around SSP build failure in glibc214, too.
...
Glibc 2.14 also produces a build failure in Hydra, so we need to apply the same
fix here, too.
2012-06-27 16:41:33 +02:00
aszlig
572cc12321
Add tkabber dependency tcltls v1.6.
2012-06-22 14:47:34 -04:00
aszlig
3c7da30e12
Add tkabber dependency tcllib v1.14.
2012-06-22 14:47:34 -04:00