Ludovic Courtès
eb1360bd66
hwloc: Make it easy to disable optional dependencies; fix cross-builds.
...
svn path=/nixpkgs/trunk/; revision=31606
2012-01-17 16:34:10 +00:00
Peter Simons
729aea56b5
haskell-xml: updated to version 1.3.11
...
svn path=/nixpkgs/trunk/; revision=31603
2012-01-17 10:24:53 +00:00
Peter Simons
683d60e419
haskell-iteratee: updated to version 0.8.8.1
...
svn path=/nixpkgs/trunk/; revision=31602
2012-01-17 10:24:47 +00:00
Ludovic Courtès
4cbd319ce3
libffi: Revert to 3.0.9.
...
Version 3.0.10 fails to build on x86_64-freebsd8.2. Reported on
libffi-discuss@sourceware.org .
svn path=/nixpkgs/trunk/; revision=31601
2012-01-16 23:36:05 +00:00
Ludovic Courtès
92703a6d9e
libffi 3.0.10.
...
svn path=/nixpkgs/trunk/; revision=31600
2012-01-16 21:59:33 +00:00
Yury G. Kudryashov
6957240078
Fix typo
...
svn path=/nixpkgs/trunk/; revision=31599
2012-01-16 17:50:54 +00:00
Yury G. Kudryashov
ee0822153a
Upgrade libdrm and mesa to the latest versions
...
svn path=/nixpkgs/trunk/; revision=31598
2012-01-16 17:48:33 +00:00
Yury G. Kudryashov
81b4eef864
jasper: propagate libjpeg, kopete: remove 'fix'
...
svn path=/nixpkgs/trunk/; revision=31595
2012-01-16 17:36:59 +00:00
Eelco Dolstra
67f921896e
* nodejs 0.6.7 breaks npm, so go back to 0.6.6.
...
svn path=/nixpkgs/trunk/; revision=31594
2012-01-16 16:56:57 +00:00
Eelco Dolstra
fd6238d2c8
* NodeJS updated to 0.6.7.
...
svn path=/nixpkgs/trunk/; revision=31593
2012-01-16 16:34:13 +00:00
Peter Simons
5bcd4dd4dd
haskell-threadscope: updated to version 0.2.1
...
svn path=/nixpkgs/trunk/; revision=31592
2012-01-16 11:47:59 +00:00
Peter Simons
5d03943ec7
haskell-ghc-events: updated to version 0.4.0.0
...
svn path=/nixpkgs/trunk/; revision=31591
2012-01-16 11:47:57 +00:00
Peter Simons
4cc9c46240
haskell-xml-types: updated to version 0.3.1
...
svn path=/nixpkgs/trunk/; revision=31588
2012-01-16 11:33:55 +00:00
Peter Simons
a4d0d699ea
haskell-xml-conduit: updated to version 0.5.1
...
svn path=/nixpkgs/trunk/; revision=31587
2012-01-16 11:33:52 +00:00
Peter Simons
bae87bb714
haskell-random-shuffle: updated to version 0.0.3
...
svn path=/nixpkgs/trunk/; revision=31586
2012-01-16 11:33:50 +00:00
Peter Simons
bfb2f12099
haskell-http-conduit: updated to version 1.1.1
...
svn path=/nixpkgs/trunk/; revision=31585
2012-01-16 11:33:48 +00:00
Peter Simons
c74f588e8d
haskell-enumerator: updated to version 0.4.18
...
svn path=/nixpkgs/trunk/; revision=31584
2012-01-16 11:33:45 +00:00
Peter Simons
a9f5e79a1b
haskell-conduit: updated to version 0.0.4
...
svn path=/nixpkgs/trunk/; revision=31583
2012-01-16 11:33:42 +00:00
Peter Simons
89f9d84c5f
haskell-cereal: updated to version 0.3.5.1
...
svn path=/nixpkgs/trunk/; revision=31582
2012-01-16 11:33:40 +00:00
Peter Simons
4b229a7291
haskell-base64-bytestring: updated to version 0.1.1.0
...
svn path=/nixpkgs/trunk/; revision=31581
2012-01-16 11:33:38 +00:00
Peter Simons
4907bb6cf5
haskell-math-functions: added version 0.1.1.0
...
svn path=/nixpkgs/trunk/; revision=31580
2012-01-16 11:33:34 +00:00
Arie Middelkoop
c87285c255
Updated the coccinelle package to the latest release (1.0.0-RC9).
...
Added additional ocaml modules which are needed for coccinelle.
svn path=/nixpkgs/trunk/; revision=31579
2012-01-16 10:20:13 +00:00
Arie Middelkoop
3b833cc93b
Minor-version bump of ocaml-batteries.
...
The previous version did not compile with ocaml>=3.12, and this version is also backwards compatible with 3.11.
svn path=/nixpkgs/trunk/; revision=31578
2012-01-16 10:17:02 +00:00
Shea Levy
5c64d68344
Update ruby gems
...
svn path=/nixpkgs/trunk/; revision=31576
2012-01-16 02:05:41 +00:00
Peter Simons
b7c53fcc4c
ftgl: added meta information
...
svn path=/nixpkgs/trunk/; revision=31573
2012-01-15 11:44:11 +00:00
Peter Simons
116a7c4ac2
ftgl: fixed download URL
...
svn path=/nixpkgs/trunk/; revision=31571
2012-01-15 11:44:05 +00:00
Yury G. Kudryashov
6232b9129d
cairo: propagate more dependencies
...
svn path=/nixpkgs/trunk/; revision=31565
2012-01-14 18:04:28 +00:00
Yury G. Kudryashov
77c6648535
Propagate zlib
...
svn path=/nixpkgs/trunk/; revision=31551
2012-01-14 18:03:38 +00:00
Yury G. Kudryashov
51956f085d
ntrack-016, add meta
...
svn path=/nixpkgs/trunk/; revision=31550
2012-01-14 18:03:34 +00:00
Yury G. Kudryashov
b891f159b5
grantlee-0.2.0
...
svn path=/nixpkgs/trunk/; revision=31542
2012-01-14 18:03:05 +00:00
Yury G. Kudryashov
e7dccbfcb8
openbabel-2.3.1, depend on cairo
...
svn path=/nixpkgs/trunk/; revision=31540
2012-01-14 18:02:54 +00:00
Yury G. Kudryashov
cf207c3e83
libical-0.48
...
svn path=/nixpkgs/trunk/; revision=31539
2012-01-14 18:02:46 +00:00
Peter Simons
4e5092d0c6
Revert "libdrm: updated to version 2.4.29"
...
This reverts commit ebe85f30fa075507313fc9dfa6ceb96501c6e332.
svn path=/nixpkgs/trunk/; revision=31537
2012-01-14 12:13:53 +00:00
Peter Simons
729162873e
Revert "mesa: updated to version 7.11.2"
...
This reverts commit b18ddb0ac8bc232df2cfd2980bd22ee9beae7b12.
svn path=/nixpkgs/trunk/; revision=31536
2012-01-14 12:13:51 +00:00
Peter Simons
61ad4a1b2b
haskell-streamproc: updated to version 1.6
...
svn path=/nixpkgs/trunk/; revision=31535
2012-01-14 12:09:20 +00:00
Peter Simons
736b039b3f
libdrm: updated to version 2.4.29
...
svn path=/nixpkgs/trunk/; revision=31534
2012-01-14 12:09:15 +00:00
Peter Simons
0819c85d91
mesa: updated to version 7.11.2
...
svn path=/nixpkgs/trunk/; revision=31533
2012-01-14 12:09:09 +00:00
Peter Simons
5331d4e98b
haskell-wxdirect: updated to version 0.13.1.1
...
svn path=/nixpkgs/trunk/; revision=31519
2012-01-13 10:32:11 +00:00
Peter Simons
c334c8b547
haskell-wxcore: updated to version 0.13.2
...
svn path=/nixpkgs/trunk/; revision=31518
2012-01-13 10:32:08 +00:00
Peter Simons
e495d3345f
haskell-wx: updated to version 0.13.2
...
svn path=/nixpkgs/trunk/; revision=31517
2012-01-13 10:32:06 +00:00
Peter Simons
dd90ec0d92
wxGTK-2.x: enable support for media control
...
svn path=/nixpkgs/trunk/; revision=31516
2012-01-13 10:32:02 +00:00
Peter Simons
6284c83b15
wxGTK-2.x: enable parallel building
...
svn path=/nixpkgs/trunk/; revision=31515
2012-01-13 10:31:58 +00:00
Peter Simons
1585c62857
pkgs/development/libraries/wxGTK-2.8: strip trailing whitespace
...
svn path=/nixpkgs/trunk/; revision=31514
2012-01-13 10:31:56 +00:00
Peter Simons
d7985d419f
pkgs/development/libraries/wxGTK-2.9: renamed Nix files for consistency
...
svn path=/nixpkgs/trunk/; revision=31513
2012-01-13 10:31:52 +00:00
Peter Simons
4ae7c66bc0
haskell-xml-conduit: updated to version 0.5.0.1
...
svn path=/nixpkgs/trunk/; revision=31512
2012-01-13 09:27:15 +00:00
Peter Simons
9b408f567d
haskell-vty: updated to version 4.7.0.8
...
svn path=/nixpkgs/trunk/; revision=31511
2012-01-13 09:27:13 +00:00
Peter Simons
9f4723abd5
haskell-attoparsec-conduit: updated to version 0.0.0.1
...
svn path=/nixpkgs/trunk/; revision=31510
2012-01-13 09:27:10 +00:00
Peter Simons
c3cf936ff1
haskell-hxt: updated to version 9.1.6
...
svn path=/nixpkgs/trunk/; revision=31499
2012-01-12 15:21:22 +00:00
Peter Simons
7bcb27653d
haskell-hxt-unicode: updated to version 9.0.2
...
svn path=/nixpkgs/trunk/; revision=31498
2012-01-12 15:21:18 +00:00
Peter Simons
de7bd112f1
haskell-hxt-regex-xmlschema: updated to version 9.0.4
...
svn path=/nixpkgs/trunk/; revision=31497
2012-01-12 15:21:15 +00:00
Peter Simons
c9fc73ae45
haskell-hxt-charproperties: updated to version 9.1.1
...
svn path=/nixpkgs/trunk/; revision=31496
2012-01-12 15:21:11 +00:00
Peter Simons
867fb191cc
haskell-haskell-src-meta: updated to version 0.5.0.3
...
svn path=/nixpkgs/trunk/; revision=31495
2012-01-12 15:21:08 +00:00
Peter Simons
b6dc8c87d8
haskell-conduit: updated to version 0.0.3
...
svn path=/nixpkgs/trunk/; revision=31494
2012-01-12 15:20:50 +00:00
Peter Simons
0eeb206fb5
haskell-irc: updated to version 0.5.0.0
...
svn path=/nixpkgs/trunk/; revision=31479
2012-01-11 14:40:49 +00:00
Peter Simons
415ef89393
haskell-conduit: updated to version 0.0.2
...
svn path=/nixpkgs/trunk/; revision=31478
2012-01-11 14:40:44 +00:00
Eelco Dolstra
66da14b77c
* Added buildr and its dependencies.
...
svn path=/nixpkgs/trunk/; revision=31477
2012-01-10 23:50:31 +00:00
Eelco Dolstra
acf6a9c5e4
* Cleanup.
...
svn path=/nixpkgs/trunk/; revision=31476
2012-01-10 23:49:24 +00:00
Eelco Dolstra
73fda38d0a
* Enable libyaml support in Ruby by default. Libyaml is very small so
...
this shouldn't hurt much.
svn path=/nixpkgs/trunk/; revision=31474
2012-01-10 23:06:23 +00:00
Karn Kallio
9663bdebde
Advance version of Ur/Web compiler to 20120110
...
svn path=/nixpkgs/trunk/; revision=31467
2012-01-10 15:23:05 +00:00
Peter Simons
3be3fe0828
haskell-primitive: updated to version 0.4.1
...
svn path=/nixpkgs/trunk/; revision=31466
2012-01-10 15:20:26 +00:00
Peter Simons
79c34b96e1
haskell-failure: updated to version 0.1.2
...
svn path=/nixpkgs/trunk/; revision=31465
2012-01-10 15:20:23 +00:00
Peter Simons
83ed01cc12
haskell-zlib-bindings: updated to version 0.0.2
...
svn path=/nixpkgs/trunk/; revision=31454
2012-01-09 10:42:38 +00:00
Peter Simons
526f4172c2
haskell-skein: updated to version 0.1.0.4
...
svn path=/nixpkgs/trunk/; revision=31453
2012-01-09 10:42:34 +00:00
Yury G. Kudryashov
f4a079a76c
Upgrade xine-lib and xine-ui
...
svn path=/nixpkgs/trunk/; revision=31451
2012-01-09 10:25:56 +00:00
Yury G. Kudryashov
ff5134f8b0
Add lirc
...
svn path=/nixpkgs/trunk/; revision=31450
2012-01-09 10:25:49 +00:00
Yury G. Kudryashov
c80ed42cf1
Add GNU vcdimager
...
svn path=/nixpkgs/trunk/; revision=31449
2012-01-09 10:25:42 +00:00
Yury G. Kudryashov
7e66541ce8
Add bunch of kmymoney-4.6.1 dependencies
...
svn path=/nixpkgs/trunk/; revision=31436
2012-01-08 19:29:07 +00:00
Peter Simons
d85921798b
haskell-hakyll: updated to version 3.2.4.0
...
svn path=/nixpkgs/trunk/; revision=31427
2012-01-07 21:51:36 +00:00
Peter Simons
2da358e6f4
haskell-conduit: updated to version 0.0.1.1
...
svn path=/nixpkgs/trunk/; revision=31426
2012-01-07 21:51:32 +00:00
Yury G. Kudryashov
edd651131b
Revert "polkit-0.104"
...
This reverts revision 31411
polkit-0.104 depends on glib-2.30, so this upgrade goes to branches/glib-2.30
svn path=/nixpkgs/trunk/; revision=31423
2012-01-07 20:29:08 +00:00
Yury G. Kudryashov
a7f52f0fd0
xxdiff-4.0 beta (Qt4-based)
...
svn path=/nixpkgs/trunk/; revision=31422
2012-01-07 20:23:35 +00:00
Yury G. Kudryashov
3b672f9b75
(lib)gphoto-2.4.11
...
svn path=/nixpkgs/trunk/; revision=31412
2012-01-07 19:41:59 +00:00
Yury G. Kudryashov
b4c7de3b7e
polkit-0.104
...
svn path=/nixpkgs/trunk/; revision=31411
2012-01-07 19:41:52 +00:00
Yury G. Kudryashov
7e320a7043
State qt version (3/4) in packages, not in all-packages.nix
...
svn path=/nixpkgs/trunk/; revision=31406
2012-01-07 17:06:49 +00:00
Karn Kallio
4ae99c2e02
atkmm build was failing.
...
svn path=/nixpkgs/trunk/; revision=31398
2012-01-07 13:31:06 +00:00
Karn Kallio
f94927717c
Fix failing pangomm build.
...
svn path=/nixpkgs/trunk/; revision=31397
2012-01-07 13:19:13 +00:00
Karn Kallio
53d6a7b1ba
Openoffice.org does not build with libwpd 0.9.
...
svn path=/nixpkgs/trunk/; revision=31396
2012-01-07 13:19:06 +00:00
Yury G. Kudryashov
a5d1d871d7
libdbusmenu-qt: meta
...
svn path=/nixpkgs/trunk/; revision=31394
2012-01-07 09:50:53 +00:00
Yury G. Kudryashov
12e5f5b070
Build gdk-pixbuf-xlib
...
svn path=/nixpkgs/trunk/; revision=31392
2012-01-07 00:27:17 +00:00
Yury G. Kudryashov
8ba7a53129
gtk-2.x libs patchlevel upgrades
...
svn path=/nixpkgs/trunk/; revision=31383
2012-01-06 23:03:37 +00:00
Lluís Batlle i Rossell
11f55d273b
I found that instantiating xbursttools brought to the openssl evaluation
...
throwing an exception about an undefined platform.openssl.system.
That was introduced by r31330, which made openssl for the build system to
evaluate the platform.openssl.system, that should only be needed for the host
system.
I also revert supplying openssl.system for xbursttools.
svn path=/nixpkgs/trunk/; revision=31379
2012-01-06 21:31:29 +00:00
Lluís Batlle i Rossell
54aa31cca3
Updating the cross-build of elfutils so the perf for 2.6.37 builds too. (again, nanonote)
...
svn path=/nixpkgs/trunk/; revision=31378
2012-01-06 21:10:19 +00:00
Yury G. Kudryashov
b2aac0e831
libgsf-1.14.22
...
svn path=/nixpkgs/trunk/; revision=31374
2012-01-06 20:10:15 +00:00
Yury G. Kudryashov
9d03e96caa
Add itstool
...
svn path=/nixpkgs/trunk/; revision=31372
2012-01-06 20:09:39 +00:00
Yury G. Kudryashov
cee470de5a
Remove gtk+-2.16
...
svn path=/nixpkgs/trunk/; revision=31370
2012-01-06 19:02:07 +00:00
Yury G. Kudryashov
206d17c17f
Remove wxGTK-2.6
...
svn path=/nixpkgs/trunk/; revision=31369
2012-01-06 19:01:56 +00:00
Peter Simons
d7edd1e22c
haskell-epic: updated to version 0.9.2
...
svn path=/nixpkgs/trunk/; revision=31364
2012-01-06 18:41:23 +00:00
Yury G. Kudryashov
69f2dfe7da
cogl-1.8.2
...
svn path=/nixpkgs/trunk/; revision=31362
2012-01-06 18:13:43 +00:00
Yury G. Kudryashov
5a4b9fc92b
gtk-2.x: use atk-2.2.x
...
svn path=/nixpkgs/trunk/; revision=31357
2012-01-06 18:13:00 +00:00
Lluís Batlle i Rossell
cae619da08
Updating elfutils/perf to cross-build. I tested this for the nanonote.
...
I add newt, checking that it cross-builds too.
I update perf to have newt support, and now it's also finding python, whatever
that means. I've not tested if 'python' as buildInputs is enough.
svn path=/nixpkgs/trunk/; revision=31353
2012-01-06 16:45:14 +00:00
Ludovic Courtès
7232a1e33a
OpenSSL: Further fix `Configure' for GNU builds.
...
svn path=/nixpkgs/trunk/; revision=31348
2012-01-06 14:07:02 +00:00
Peter Simons
d88a86d8ee
haskell-unix-compat: updated to version 0.3.0.1
...
svn path=/nixpkgs/trunk/; revision=31347
2012-01-06 13:30:08 +00:00
Peter Simons
e40df74665
haskell-yesod-core: updated to version 0.9.4.1
...
svn path=/nixpkgs/trunk/; revision=31346
2012-01-06 13:30:05 +00:00
Peter Simons
671455b8be
haskell-maude: updated to version 0.3.0
...
svn path=/nixpkgs/trunk/; revision=31345
2012-01-06 13:30:02 +00:00
Peter Simons
25995d5fb6
haskell-iteratee: updated to version 0.8.7.6
...
svn path=/nixpkgs/trunk/; revision=31344
2012-01-06 13:29:59 +00:00
Peter Simons
5667c155bf
haskell-http-enumerator: updated to version 0.7.2.3
...
svn path=/nixpkgs/trunk/; revision=31343
2012-01-06 13:29:57 +00:00
Peter Simons
3dafbad90f
haskell-http-conduit: updated to version 1.1.0.1
...
svn path=/nixpkgs/trunk/; revision=31342
2012-01-06 13:29:53 +00:00
Peter Simons
e840fafaf7
haskell-conduit: updated to version 0.0.1
...
svn path=/nixpkgs/trunk/; revision=31341
2012-01-06 13:29:50 +00:00
Yury G. Kudryashov
dc9bf79b54
attica-0.3.0
...
svn path=/nixpkgs/trunk/; revision=31336
2012-01-06 00:55:48 +00:00
Yury G. Kudryashov
53d922475d
gtkLibs3x.glib: 2.30.2
...
svn path=/nixpkgs/trunk/; revision=31335
2012-01-06 00:55:42 +00:00
Ludovic Courtès
3d0f767b91
OpenSSL: Fix compilation on GNU/Hurd.
...
svn path=/nixpkgs/trunk/; revision=31330
2012-01-05 23:46:17 +00:00
Yury G. Kudryashov
ba80f4337f
taglib{,-extras}: use buildNativeInputs, meta
...
svn path=/nixpkgs/trunk/; revision=31329
2012-01-05 23:43:22 +00:00
Yury G. Kudryashov
ce32f3b5db
Add meta to qtscriptgenerator
...
svn path=/nixpkgs/trunk/; revision=31327
2012-01-05 23:16:12 +00:00
Yury G. Kudryashov
18f1e5b594
libgpod-0.8.2
...
svn path=/nixpkgs/trunk/; revision=31326
2012-01-05 23:16:06 +00:00
Yury G. Kudryashov
49c2aebc3d
libimobiledevice-1.0.6
...
disable swig version check
use libplist.swig
svn path=/nixpkgs/trunk/; revision=31325
2012-01-05 23:16:00 +00:00
Yury G. Kudryashov
2b20492775
libplist: use swig2
...
libplist compilation with swig1 fails in stdenv-updates
svn path=/nixpkgs/trunk/; revision=31324
2012-01-05 23:15:54 +00:00
Yury G. Kudryashov
b00d19d775
elfutils-0.152, pass zlib, bzip2 and xz
...
svn path=/nixpkgs/trunk/; revision=31323
2012-01-05 23:15:48 +00:00
Yury G. Kudryashov
d15e2f70d9
Add swig-2.x
...
svn path=/nixpkgs/trunk/; revision=31320
2012-01-05 23:15:24 +00:00
Yury G. Kudryashov
f490ef82b8
Pass xz to libwpg
...
svn path=/nixpkgs/trunk/; revision=31316
2012-01-05 18:05:18 +00:00
Yury G. Kudryashov
f84a08bac3
Upgrade libwpd and libwpg to latest versions
...
svn path=/nixpkgs/trunk/; revision=31313
2012-01-05 17:05:31 +00:00
Michael Raskin
e048801966
Update chipmunk
...
svn path=/nixpkgs/trunk/; revision=31310
2012-01-05 11:56:32 +00:00
Florian Friesdorf
2c9461ebdd
freeglut-2.8.0
...
svn path=/nixpkgs/trunk/; revision=31304
2012-01-04 23:05:41 +00:00
Lluís Batlle i Rossell
4b4022a4e0
Add meta for mono.
...
svn path=/nixpkgs/trunk/; revision=31297
2012-01-04 21:18:50 +00:00
Eelco Dolstra
ca73b1fb33
* Resolve a collision between OpenSSL and man-pages
...
(in ‘share/man/man3/err.3’).
svn path=/nixpkgs/trunk/; revision=31296
2012-01-04 19:48:08 +00:00
Peter Simons
8869873f10
haskell-random-fu: updated to version 0.2.1.1
...
svn path=/nixpkgs/trunk/; revision=31294
2012-01-04 17:49:07 +00:00
Peter Simons
a227e558ee
haskell-numeric-prelude: updated to version 0.3
...
svn path=/nixpkgs/trunk/; revision=31293
2012-01-04 17:49:04 +00:00
Peter Simons
e822279529
haskell-xml-enumerator: updated to version 0.4.4.1
...
svn path=/nixpkgs/trunk/; revision=31292
2012-01-04 17:49:01 +00:00
Peter Simons
35807a138d
haskell-http-enumerator: updated to version 0.7.2.2
...
svn path=/nixpkgs/trunk/; revision=31291
2012-01-04 17:48:58 +00:00
Peter Simons
b515072dbe
haskell-http-conduit: updated to version 1.0.0.1
...
svn path=/nixpkgs/trunk/; revision=31290
2012-01-04 17:48:55 +00:00
Peter Simons
18bf57c213
haskell-haskeline: updated to version 0.6.4.6
...
svn path=/nixpkgs/trunk/; revision=31289
2012-01-04 17:48:53 +00:00
Peter Simons
cde76888f9
haskell-gamma: updated to version 0.9.0.2
...
svn path=/nixpkgs/trunk/; revision=31288
2012-01-04 17:48:50 +00:00
Peter Simons
9bd85d5cf2
haskell-continued-fractions: updated to version 0.9.1.1
...
svn path=/nixpkgs/trunk/; revision=31287
2012-01-04 17:48:47 +00:00
Peter Simons
883ae24a70
haskell-conduit: updated to version 0.0.0.2
...
svn path=/nixpkgs/trunk/; revision=31286
2012-01-04 17:48:44 +00:00
Peter Simons
660701471c
Dropped obsolete versions of haskell-primitive and haskell-vector.
...
svn path=/nixpkgs/trunk/; revision=31285
2012-01-04 17:48:40 +00:00
Peter Simons
2f3cb61b98
haskell-sendfile: updated to version 0.7.4
...
svn path=/nixpkgs/trunk/; revision=31284
2012-01-04 17:48:36 +00:00
Peter Simons
aac6654ed5
haskell-vector: updated to version 0.9.1
...
svn path=/nixpkgs/trunk/; revision=31283
2012-01-04 17:48:32 +00:00
Eelco Dolstra
0348f11e22
* DBD::SQLite updated to 1.35.
...
svn path=/nixpkgs/trunk/; revision=31277
2012-01-04 14:23:41 +00:00
Lluís Batlle i Rossell
25db5f1a9d
Adding libgdiplus for mono, and making mono reference it.
...
svn path=/nixpkgs/trunk/; revision=31276
2012-01-04 13:55:54 +00:00
Lluís Batlle i Rossell
fb0d088b33
Updating mono.
...
svn path=/nixpkgs/trunk/; revision=31262
2012-01-04 08:14:07 +00:00
Lluís Batlle i Rossell
e43bd7c4ce
Made lua and task warrior unstable crossbuild fine
...
svn path=/nixpkgs/trunk/; revision=31251
2012-01-03 19:12:06 +00:00
Yury G. Kudryashov
29d613ba0e
Add a warning to cmake/default.nix
...
svn path=/nixpkgs/trunk/; revision=31248
2012-01-03 18:00:02 +00:00
Eelco Dolstra
5386b47ead
* Revert. Cmake is still broken on i686-linux.
...
svn path=/nixpkgs/trunk/; revision=31244
2012-01-03 17:22:11 +00:00
Yury G. Kudryashov
71c6de7338
cmake-2.8.7
...
svn path=/nixpkgs/trunk/; revision=31241
2012-01-03 16:38:53 +00:00
Yury G. Kudryashov
a988b581a0
Add libkvkontakte
...
svn path=/nixpkgs/trunk/; revision=31240
2012-01-03 16:15:22 +00:00
Yury G. Kudryashov
5321904c4e
ortp-0.18.0
...
svn path=/nixpkgs/trunk/; revision=31238
2012-01-03 15:39:05 +00:00
Lluís Batlle i Rossell
2833652d5a
Moving openssl 1.0.0e.nix to default.nix, as Eelco suggests. The 1.0.0e expression was moremaintained.
...
When I updated openssl, I didn't know there was such a file.
svn path=/nixpkgs/trunk/; revision=31233
2012-01-03 14:31:11 +00:00
Yury G. Kudryashov
046ddeb32a
fltk-1.3.0
...
svn path=/nixpkgs/trunk/; revision=31223
2012-01-03 10:02:33 +00:00
Lluís Batlle i Rossell
709ae01f34
Updating openssl.
...
svn path=/nixpkgs/trunk/; revision=31215
2012-01-02 18:18:04 +00:00
Peter Simons
e195f5b358
monad-control: use consistent naming scheme for all supported versions
...
svn path=/nixpkgs/trunk/; revision=31211
2012-01-02 14:51:23 +00:00
Yury G. Kudryashov
a6c6878f5b
libdbusmenu-qt-0.9.0, disable apidocs
...
svn path=/nixpkgs/trunk/; revision=31201
2012-01-02 11:35:13 +00:00
Peter Simons
2a0453e43e
haskell-enumerator: updated to version 0.4.17
...
svn path=/nixpkgs/trunk/; revision=31200
2012-01-02 11:22:58 +00:00
Yury G. Kudryashov
0c824aa456
Pass pkgconfig to strigi
...
svn path=/nixpkgs/trunk/; revision=31199
2012-01-02 11:16:48 +00:00
Yury G. Kudryashov
78c300f015
soprano-2.7.4, pass pkgconfig explicitly
...
svn path=/nixpkgs/trunk/; revision=31198
2012-01-02 11:12:27 +00:00
Peter Simons
a0e7016709
haskell-texmath: updated to version 0.5.0.4
...
svn path=/nixpkgs/trunk/; revision=31195
2012-01-01 21:24:20 +00:00
Peter Simons
ff5e4c4f4b
haskell-syb-with-class: updated to version 0.6.1.3
...
svn path=/nixpkgs/trunk/; revision=31194
2012-01-01 21:24:17 +00:00
Peter Simons
e2c7b54f8c
haskell-derive: updated to version 2.5.5
...
svn path=/nixpkgs/trunk/; revision=31193
2012-01-01 21:24:14 +00:00
Peter Simons
25db17f1b3
haskell-data-accessor: updated to version 0.2.2.1
...
svn path=/nixpkgs/trunk/; revision=31192
2012-01-01 21:24:11 +00:00
Florian Friesdorf
096d86bfb1
startup-notification-0.12 (works with xcb-util-0.3.8)
...
svn path=/nixpkgs/trunk/; revision=31172
2011-12-31 04:05:57 +00:00
Florian Friesdorf
19246750bf
libev-4.04 (frees awesome build from many warnings)
...
svn path=/nixpkgs/trunk/; revision=31170
2011-12-31 04:05:44 +00:00
Peter Simons
6dfd7b1446
haskell-yaml: updated to version 0.5.1.1
...
svn path=/nixpkgs/trunk/; revision=31159
2011-12-30 17:05:20 +00:00
Peter Simons
573455fd44
haskell-data-object-yaml: updated to version 0.3.4
...
svn path=/nixpkgs/trunk/; revision=31158
2011-12-30 17:05:17 +00:00
Eelco Dolstra
633a194994
* PIL updated to 1.1.7.
...
svn path=/nixpkgs/trunk/; revision=31142
2011-12-29 16:53:14 +00:00
Peter Simons
de1a6e09d7
haskell-path-pieces: added version 0.1.0
...
haskell-attoparsec-conduit: added version 0.0.0
haskell-blaze-builder-conduit: added version 0.0.0
haskell-conduit: added version 0.0.0.1
haskell-http-conduit: added version 1.0.0
haskell-lifted-base: added version 0.1.0.2
haskell-xml-conduit: added version 0.5.0
haskell-zlib-conduit: added version 0.0.0
svn path=/nixpkgs/trunk/; revision=31141
2011-12-29 16:42:08 +00:00
Florian Friesdorf
daa459cc8a
popt-0.16
...
Thanks to Peter Simons for preparing this. Make sure you have nixos 31132.
svn path=/nixpkgs/trunk/; revision=31133
2011-12-28 21:48:55 +00:00
Peter Simons
2afb111ad5
haskell-wai-logger: updated to version 0.1.2
...
svn path=/nixpkgs/trunk/; revision=31124
2011-12-28 10:31:37 +00:00
Peter Simons
4528363ead
haskell-persistent: updated to version 0.6.4.4
...
svn path=/nixpkgs/trunk/; revision=31123
2011-12-28 10:31:34 +00:00
Peter Simons
2cc6165e7e
haskell-gloss: updated to version 1.6.0.1
...
svn path=/nixpkgs/trunk/; revision=31122
2011-12-28 10:31:30 +00:00
Peter Simons
d74fd84210
haskell-blaze-html: updated to version 0.4.3.1
...
svn path=/nixpkgs/trunk/; revision=31121
2011-12-28 10:31:27 +00:00
Peter Simons
c6814a8951
haskell-zipper: updated to version 0.4.1
...
svn path=/nixpkgs/trunk/; revision=31112
2011-12-27 17:49:40 +00:00
Peter Simons
577b55a0de
haskell-yesod: updated to version 0.9.4.1
...
svn path=/nixpkgs/trunk/; revision=31111
2011-12-27 17:49:35 +00:00
Peter Simons
d0543a8af1
Added missing meta.maintainers section.
...
svn path=/nixpkgs/trunk/; revision=31110
2011-12-27 17:49:31 +00:00
Karn Kallio
2ae07a853f
Clean version 2.4
...
svn path=/nixpkgs/trunk/; revision=31107
2011-12-27 01:48:57 +00:00
Peter Simons
42a4cda59d
haskell-yesod: updated to version 0.9.4
...
svn path=/nixpkgs/trunk/; revision=31102
2011-12-26 15:37:02 +00:00
Peter Simons
3553c0f867
haskell-yesod-static: updated to version 0.3.2.1
...
svn path=/nixpkgs/trunk/; revision=31101
2011-12-26 15:36:58 +00:00
Peter Simons
1592e39ced
haskell-yesod-json: updated to version 0.2.3
...
svn path=/nixpkgs/trunk/; revision=31100
2011-12-26 15:36:52 +00:00
Peter Simons
aa1be5c36f
haskell-yesod-form: updated to version 0.3.4.2
...
svn path=/nixpkgs/trunk/; revision=31099
2011-12-26 15:36:46 +00:00
Peter Simons
8923112c1d
haskell-yesod-core: updated to version 0.9.4
...
svn path=/nixpkgs/trunk/; revision=31098
2011-12-26 15:36:42 +00:00
Peter Simons
d0dc6f0ba8
haskell-warp: updated to version 0.4.6.3
...
svn path=/nixpkgs/trunk/; revision=31097
2011-12-26 15:36:37 +00:00
Peter Simons
51254f668a
haskell-wai-extra: updated to version 0.4.6
...
svn path=/nixpkgs/trunk/; revision=31096
2011-12-26 15:36:32 +00:00
Peter Simons
d9c27a4387
haskell-simple-sendfile: updated to version 0.2.0
...
svn path=/nixpkgs/trunk/; revision=31095
2011-12-26 15:36:27 +00:00
Peter Simons
381ebfe994
haskell-shakespeare-js: updated to version 0.10.4
...
svn path=/nixpkgs/trunk/; revision=31094
2011-12-26 15:36:23 +00:00
Peter Simons
ba991ec100
haskell-shakespeare-css: updated to version 0.10.5
...
svn path=/nixpkgs/trunk/; revision=31093
2011-12-26 15:36:18 +00:00
Peter Simons
9ccf9b3674
haskell-regular: updated to version 0.3.4
...
svn path=/nixpkgs/trunk/; revision=31092
2011-12-26 15:36:12 +00:00
Peter Simons
4a0e29f53c
haskell-multirec: updated to version 0.7.1
...
svn path=/nixpkgs/trunk/; revision=31091
2011-12-26 15:36:07 +00:00
Peter Simons
7c5c365003
haskell-http-enumerator: updated to version 0.7.2.1
...
svn path=/nixpkgs/trunk/; revision=31090
2011-12-26 15:36:02 +00:00
Peter Simons
c551acaec6
haskell-hmatrix: updated to version 0.13.0.0
...
svn path=/nixpkgs/trunk/; revision=31089
2011-12-26 15:35:57 +00:00
Peter Simons
8cc81a726d
haskell-hamlet: updated to version 0.10.6
...
svn path=/nixpkgs/trunk/; revision=31088
2011-12-26 15:35:53 +00:00
Peter Simons
481a96b2ed
haskell-shakespeare-i18n: added version 0.0.0
...
svn path=/nixpkgs/trunk/; revision=31087
2011-12-26 15:35:48 +00:00
Peter Simons
5aacd74bf8
haskell-wai-logger: added version 0.1.1
...
svn path=/nixpkgs/trunk/; revision=31086
2011-12-26 15:35:42 +00:00
Peter Simons
2d972e96ad
haskell-fast-logger: added version 0.0.1
...
svn path=/nixpkgs/trunk/; revision=31085
2011-12-26 15:35:37 +00:00
Peter Simons
e4f3dcda83
haskell-byteorder: added version 1.0.3
...
svn path=/nixpkgs/trunk/; revision=31084
2011-12-26 15:35:33 +00:00
Peter Simons
70b696e83e
haskell-HTTP: added version 4000.2.2
...
svn path=/nixpkgs/trunk/; revision=31083
2011-12-26 15:35:30 +00:00
Yury G. Kudryashov
50fb545705
qt48: make "gtkStyle = true" work
...
svn path=/nixpkgs/trunk/; revision=31078
2011-12-25 16:22:36 +00:00
Peter Simons
8755735a06
haskell-cabal2nix: updated to version 1.23
...
svn path=/nixpkgs/trunk/; revision=31077
2011-12-25 16:18:34 +00:00
Peter Simons
6dbd367227
haskell-yesod-json: updated to version 0.2.2.2
...
svn path=/nixpkgs/trunk/; revision=31076
2011-12-25 16:06:47 +00:00
Peter Simons
5968d4645b
haskell-yesod-auth: updated to version 0.7.9
...
svn path=/nixpkgs/trunk/; revision=31075
2011-12-25 16:06:41 +00:00
Peter Simons
8d7110cb66
haskell-string-combinators: updated to version 0.6.0.2
...
svn path=/nixpkgs/trunk/; revision=31074
2011-12-25 16:06:35 +00:00
Peter Simons
1b722dcc80
haskell-repr: updated to version 0.4.1.2
...
svn path=/nixpkgs/trunk/; revision=31073
2011-12-25 16:06:28 +00:00
Peter Simons
27fa436674
haskell-dstring: updated to version 0.4.0.3
...
svn path=/nixpkgs/trunk/; revision=31072
2011-12-25 16:06:23 +00:00
Peter Simons
bbd45bcdc6
haskell-aeson: updated to version 0.5.0.0
...
svn path=/nixpkgs/trunk/; revision=31071
2011-12-25 16:06:20 +00:00
Peter Simons
46084dbc3c
haskell-repr: added version 0.4.1.2
...
svn path=/nixpkgs/trunk/; revision=31070
2011-12-25 16:06:17 +00:00
Peter Simons
6a9bbeac0f
haskell-string-combinators: added version 0.6.0.2
...
svn path=/nixpkgs/trunk/; revision=31069
2011-12-25 16:06:11 +00:00
Peter Simons
658f4ae7e2
haskell-dstring: added version 0.4.0.3
...
svn path=/nixpkgs/trunk/; revision=31068
2011-12-25 16:06:00 +00:00
Andres Löh
8af094c99f
Updated ghc HEAD snapshot to ghc-7.4.1-rc1.
...
svn path=/nixpkgs/trunk/; revision=31066
2011-12-25 00:12:52 +00:00
Yury G. Kudryashov
6b5dff3bb9
Qt-4.8.0
...
Hardcode paths to many dlopen()ed libraries. This should fix:
* Print dialog fails to find CUPS;
* flashplugin.
Add optional support for GTK style. Disabled by default.
svn path=/nixpkgs/trunk/; revision=31064
2011-12-24 21:52:08 +00:00
Peter Simons
aa49dde3d9
haskell-yesod-form: updated to version 0.3.4.1
...
svn path=/nixpkgs/trunk/; revision=31063
2011-12-24 18:57:45 +00:00
Peter Simons
a43d5444d9
haskell-fclabels: updated to version 1.1.0.1
...
svn path=/nixpkgs/trunk/; revision=31062
2011-12-24 18:57:42 +00:00
Peter Simons
0ea5780f75
haskell-text: updated use of 0.11.1.11 to 0.11.1.12
...
svn path=/nixpkgs/trunk/; revision=31061
2011-12-24 18:57:39 +00:00
Peter Simons
06d7dce3e0
haskell-uu-parsinglib: updated to version 2.7.3.2
...
svn path=/nixpkgs/trunk/; revision=31054
2011-12-23 11:58:30 +00:00
Peter Simons
2eaf159e2f
haskell-snap-server: updated to version 0.7.0.1
...
svn path=/nixpkgs/trunk/; revision=31053
2011-12-23 11:58:23 +00:00
Peter Simons
0ec4f26ffe
haskell-snap-core: updated to version 0.7.0.1
...
svn path=/nixpkgs/trunk/; revision=31052
2011-12-23 11:58:13 +00:00
Peter Simons
638d859229
haskell-aeson: updated to version 0.4.0.1
...
svn path=/nixpkgs/trunk/; revision=31051
2011-12-23 11:58:05 +00:00
Peter Simons
25373e78d3
haskell-ListLike: updated to version 3.1.4
...
svn path=/nixpkgs/trunk/; revision=31050
2011-12-23 11:57:56 +00:00
Peter Simons
e4a2d3ff6d
haskell-text: updated version 0.11.1.10 to 0.11.1.11
...
svn path=/nixpkgs/trunk/; revision=31049
2011-12-23 11:57:45 +00:00
Peter Simons
f0fccbb3f0
haskell-uuagc: updated to version 0.9.40.2
...
svn path=/nixpkgs/trunk/; revision=31040
2011-12-22 12:19:28 +00:00
Peter Simons
1a316e3ef2
haskell-uuagc-cabal: updated to version 1.0.2.0
...
svn path=/nixpkgs/trunk/; revision=31039
2011-12-22 12:19:24 +00:00
Peter Simons
ee7bedf20c
haskell-uuagc-bootstrap: updated to version 0.9.40.2
...
svn path=/nixpkgs/trunk/; revision=31038
2011-12-22 12:19:18 +00:00
Peter Simons
2f02b3d8e0
haskell-unordered-containers: updated to version 0.1.4.6
...
svn path=/nixpkgs/trunk/; revision=31037
2011-12-22 12:19:14 +00:00
Peter Simons
f683bc76dd
haskell-system-filepath: updated to version 0.4.4
...
svn path=/nixpkgs/trunk/; revision=31036
2011-12-22 12:19:10 +00:00
Peter Simons
06265922f8
haskell-split: updated to version 0.1.4.2
...
svn path=/nixpkgs/trunk/; revision=31035
2011-12-22 12:19:05 +00:00
Peter Simons
8c3e81a5d4
haskell-fclabels: updated to version 1.1.0
...
svn path=/nixpkgs/trunk/; revision=31034
2011-12-22 12:18:58 +00:00
Peter Simons
cad2c575b4
haskell-colour: updated to version 2.3.2
...
svn path=/nixpkgs/trunk/; revision=31033
2011-12-22 12:18:54 +00:00
Peter Simons
569b33edbc
haskell-NanoProlog: updated to version 0.3
...
svn path=/nixpkgs/trunk/; revision=31032
2011-12-22 12:18:50 +00:00
Peter Simons
498508fd59
haskell-uhc-svn: updated to revision 2381
...
svn path=/nixpkgs/trunk/; revision=31031
2011-12-22 12:18:46 +00:00
Peter Simons
8854fa0da5
haskell-parallel: updated use of version 3.2.0.0 to 3.2.0.2
...
svn path=/nixpkgs/trunk/; revision=31030
2011-12-22 12:18:42 +00:00
Peter Simons
53f4402059
haskell-text: updated use of version 0.11.1.9 to 0.11.1.10
...
svn path=/nixpkgs/trunk/; revision=31029
2011-12-22 12:18:38 +00:00
Russell O'Connor
83452ba0ab
adding two versions of metaocaml
...
svn path=/nixpkgs/trunk/; revision=31026
2011-12-21 21:51:35 +00:00
Peter Simons
b2bdf7aa9f
haskell-zipper: updated to version 0.4
...
svn path=/nixpkgs/trunk/; revision=31012
2011-12-21 10:49:44 +00:00
Peter Simons
0074dfb9be
haskell-yesod-auth: updated to version 0.7.8
...
svn path=/nixpkgs/trunk/; revision=31011
2011-12-21 10:49:40 +00:00
Peter Simons
6e3d06e0f5
haskell-unordered-containers: updated to version 0.1.4.5
...
svn path=/nixpkgs/trunk/; revision=31010
2011-12-21 10:49:37 +00:00
Peter Simons
8a1883e481
haskell-tls: updated to version 0.8.4
...
svn path=/nixpkgs/trunk/; revision=31009
2011-12-21 10:49:34 +00:00
Peter Simons
71d11df0da
haskell-tls-extra: updated to version 0.4.2
...
svn path=/nixpkgs/trunk/; revision=31008
2011-12-21 10:49:31 +00:00
Peter Simons
b3b9660af0
haskell-monad-par: updated to version 0.1.0.3
...
svn path=/nixpkgs/trunk/; revision=31007
2011-12-21 10:49:28 +00:00
Peter Simons
48c73ad753
haskell-double-conversion: updated to version 0.2.0.4
...
svn path=/nixpkgs/trunk/; revision=31006
2011-12-21 10:49:25 +00:00
Peter Simons
fa0e948cba
haskell-bmp: updated to version 1.2.0.2
...
svn path=/nixpkgs/trunk/; revision=31005
2011-12-21 10:49:21 +00:00
Peter Simons
e368ea1e85
haskell-blaze-textual: updated to version 0.2.0.6
...
svn path=/nixpkgs/trunk/; revision=31004
2011-12-21 10:49:17 +00:00
Peter Simons
1715549207
haskell-blaze-html: updated to version 0.4.3.0
...
svn path=/nixpkgs/trunk/; revision=31003
2011-12-21 10:49:13 +00:00
Peter Simons
eda37d4b2b
haskell-base16-bytestring: updated to version 0.1.1.4
...
svn path=/nixpkgs/trunk/; revision=31002
2011-12-21 10:49:09 +00:00
Peter Simons
9d4254bf8b
haskell-authenticate: updated to version 0.10.4
...
svn path=/nixpkgs/trunk/; revision=31001
2011-12-21 10:49:05 +00:00
Peter Simons
d70b6515f6
haskell-asn1-data: updated to version 0.6.1.2
...
svn path=/nixpkgs/trunk/; revision=31000
2011-12-21 10:49:02 +00:00
Peter Simons
3f4358a02a
haskell-multirec: dropped obsolete version 0.5.1
...
svn path=/nixpkgs/trunk/; revision=30999
2011-12-21 10:48:57 +00:00
Shea Levy
ec305ac161
clang builds on darwin now
...
Also, get rid of the clang bootstrap, there's no need for it
svn path=/nixpkgs/trunk/; revision=30973
2011-12-19 23:58:57 +00:00
Lluís Batlle i Rossell
121a926167
Updating Google Protocol Buffers, and removing an old version because
...
I think it is unreferenced.
svn path=/nixpkgs/trunk/; revision=30969
2011-12-19 16:03:55 +00:00
Shea Levy
cf247dcce0
Try to fix tarball
...
svn path=/nixpkgs/trunk/; revision=30968
2011-12-19 13:40:33 +00:00
Peter Simons
87c3b5f727
haskell-zeromq-haskell: updated to version 0.8.2
...
svn path=/nixpkgs/trunk/; revision=30967
2011-12-19 13:27:53 +00:00
Peter Simons
72df7d358e
haskell-transformers-base: updated to version 0.4.1
...
svn path=/nixpkgs/trunk/; revision=30966
2011-12-19 13:27:50 +00:00
Peter Simons
8845eaa7f8
haskell-monad-control: updated to version 0.3.1
...
svn path=/nixpkgs/trunk/; revision=30965
2011-12-19 13:27:48 +00:00
Peter Simons
a6904c2aef
haskell-http-types: updated to version 0.6.8
...
svn path=/nixpkgs/trunk/; revision=30964
2011-12-19 13:27:45 +00:00
Peter Simons
f3b1ee8f82
haskell-dataenc: updated to version 0.14.0.3
...
svn path=/nixpkgs/trunk/; revision=30963
2011-12-19 13:27:43 +00:00
Peter Simons
2c451670b2
haskell-base-unicode-symbols: updated to version 0.2.2.3
...
svn path=/nixpkgs/trunk/; revision=30962
2011-12-19 13:27:41 +00:00
Peter Simons
c4e802e22d
haskell-QuickCheck: added version 2.4.2
...
svn path=/nixpkgs/trunk/; revision=30961
2011-12-19 13:27:38 +00:00
Peter Simons
4c05021dcb
haskell-QuickCheck: dropped obsolete version 2.1.0.3
...
svn path=/nixpkgs/trunk/; revision=30960
2011-12-19 13:27:35 +00:00
Peter Simons
22bbe11e65
haskell-multirec: updated to version 0.7
...
svn path=/nixpkgs/trunk/; revision=30959
2011-12-19 13:27:32 +00:00
Shea Levy
dfb27bd181
llvm should build on darwin now
...
svn path=/nixpkgs/trunk/; revision=30958
2011-12-19 13:00:03 +00:00
Shea Levy
2a033caa1d
llvm+clang don't yet build on non-Linux platforms
...
svn path=/nixpkgs/trunk/; revision=30957
2011-12-19 12:53:07 +00:00
Shea Levy
006d8dcdc1
clang-3.0
...
This required moving to the cmake build for llvm in order to build clang
separately from llvm.
svn path=/nixpkgs/trunk/; revision=30956
2011-12-19 12:48:09 +00:00
Andres Löh
8116b29c33
Adding metadata for the Haskell Platform.
...
svn path=/nixpkgs/trunk/; revision=30955
2011-12-19 12:28:58 +00:00
Andres Löh
e20ab8d9b3
Added Haskell Platform 2011.4.0.0.
...
svn path=/nixpkgs/trunk/; revision=30951
2011-12-18 10:22:48 +00:00
Florian Friesdorf
d8e5cb01b5
pyside-1.0.9
...
svn path=/nixpkgs/trunk/; revision=30950
2011-12-17 20:16:45 +00:00
Yury G. Kudryashov
dc2af32b74
polkit-qt-1-0.103.0
...
Fixes crash https://bugs.kde.org/show_bug.cgi?id=258916
svn path=/nixpkgs/trunk/; revision=30942
2011-12-16 19:55:48 +00:00