Ludovic Courtès
e8a30536b6
Cairo: Add dependency on Gettext on non-GNU systems; build it.
...
svn path=/nixpkgs/trunk/; revision=29495
2011-09-26 12:07:24 +00:00
Ludovic Courtès
b7d32054da
GNU Automake: Add TODO.
...
svn path=/nixpkgs/trunk/; revision=29494
2011-09-26 12:07:21 +00:00
Yury G. Kudryashov
1d9c2ff413
Let hydra build SDL_image on all platforms
...
svn path=/nixpkgs/trunk/; revision=29486
2011-09-25 23:36:20 +00:00
Yury G. Kudryashov
e496b86594
Remove kde3.kcachegrind
...
Use kde4.kcachegrind instead.
svn path=/nixpkgs/trunk/; revision=29484
2011-09-25 22:56:48 +00:00
Michael Raskin
d65cab3852
Adding Allegro 5
...
svn path=/nixpkgs/trunk/; revision=29482
2011-09-25 21:07:48 +00:00
Michael Raskin
503536703e
Fix Allegro URL
...
svn path=/nixpkgs/trunk/; revision=29481
2011-09-25 18:12:40 +00:00
Peter Simons
8a8cb04533
haskell-numeric-prelude: updated to version 0.2.2.1
...
svn path=/nixpkgs/trunk/; revision=29480
2011-09-25 17:11:23 +00:00
Yury G. Kudryashov
2b67f92ec9
allegro-4.4.2; compiles against libpng-1.5.4
...
svn path=/nixpkgs/trunk/; revision=29477
2011-09-25 03:39:23 +00:00
Yury G. Kudryashov
bfc84fec9b
Add a notice about libpng branch
...
svn path=/nixpkgs/trunk/; revision=29474
2011-09-24 20:44:11 +00:00
Yury G. Kudryashov
449e03648a
opencv-2.3.1a
...
* pkgconfig and cmake are buildNativeInputs
* drop xineLib dependency. It was not used anyway.
svn path=/nixpkgs/trunk/; revision=29473
2011-09-24 20:40:58 +00:00
Michael Raskin
4d6030f56b
Adding hyenae - patch by MarcWeber
...
svn path=/nixpkgs/trunk/; revision=29470
2011-09-24 09:14:21 +00:00
Peter Simons
0a5f021abd
haskell-uuagc-cabal: updated to version 1.0.0.7
...
svn path=/nixpkgs/trunk/; revision=29466
2011-09-24 07:27:07 +00:00
Andres Löh
a154670250
Added haskell-derp.
...
svn path=/nixpkgs/trunk/; revision=29465
2011-09-24 02:49:04 +00:00
Andres Löh
62a77eb641
Added maintainers for haskell-numInstances.
...
svn path=/nixpkgs/trunk/; revision=29464
2011-09-24 02:48:40 +00:00
Florian Friesdorf
0c32d209ca
python wrapper that sets PYTHONHOME to the profile it is in
...
svn path=/nixpkgs/trunk/; revision=29462
2011-09-23 17:00:13 +00:00
Peter Simons
8770aaea0e
haskell-vector-space: updated to version 0.7.8
...
svn path=/nixpkgs/trunk/; revision=29460
2011-09-23 16:09:05 +00:00
Peter Simons
31d8e3cada
haskell-neither: updated to version 0.3.0
...
svn path=/nixpkgs/trunk/; revision=29459
2011-09-23 16:09:01 +00:00
Peter Simons
45e9e5e66b
haskell-cryptohash: updated to version 0.7.3
...
svn path=/nixpkgs/trunk/; revision=29458
2011-09-23 16:08:57 +00:00
Peter Simons
03deb61330
haskell-NumInstances: added version 1.0
...
svn path=/nixpkgs/trunk/; revision=29457
2011-09-23 16:08:52 +00:00
Shea Levy
35d07a5c34
Bump rubygems
...
svn path=/nixpkgs/trunk/; revision=29455
2011-09-23 15:37:05 +00:00
Shea Levy
f5e5bc24be
Get ruby-1.9.2-p290 to build
...
svn path=/nixpkgs/trunk/; revision=29453
2011-09-23 15:08:55 +00:00
Karn Kallio
637e57fc93
Advance version of ur/web compiler to 20110917
...
svn path=/nixpkgs/trunk/; revision=29448
2011-09-23 02:46:05 +00:00
Ludovic Courtès
8628e00f45
GnuTLS 2.12.11.
...
svn path=/nixpkgs/trunk/; revision=29444
2011-09-22 19:46:33 +00:00
Peter Simons
aecdd27b42
haskell-happy-meta: updated to version 0.2.0.3
...
svn path=/nixpkgs/trunk/; revision=29443
2011-09-22 15:25:52 +00:00
Peter Simons
a407341c8c
haskell-alex-meta: updated to version 0.2.0.2
...
svn path=/nixpkgs/trunk/; revision=29442
2011-09-22 15:25:45 +00:00
Peter Simons
b57a4c5e17
haskell-BNFC-meta: updated to version 0.2.2
...
svn path=/nixpkgs/trunk/; revision=29441
2011-09-22 15:25:36 +00:00
Peter Simons
a10e8a4d07
haskell-xml: updated to version 1.3.10
...
svn path=/nixpkgs/trunk/; revision=29440
2011-09-22 15:25:29 +00:00
Peter Simons
f64620a11f
haskell-skein: updated to version 0.1
...
svn path=/nixpkgs/trunk/; revision=29439
2011-09-22 15:25:21 +00:00
Florian Friesdorf
cadbee1ab1
indeed fix talloc build on darwin
...
svn path=/nixpkgs/trunk/; revision=29431
2011-09-21 23:31:51 +00:00
Florian Friesdorf
ad3d180d6f
attempt to fix talloc build on darwin
...
see: https://bugzilla.samba.org/show_bug.cgi?id=7000
svn path=/nixpkgs/trunk/; revision=29430
2011-09-21 23:23:12 +00:00
Peter Simons
d709ef5d30
openssl: avoid the need for a recursive expression
...
svn path=/nixpkgs/trunk/; revision=29426
2011-09-21 18:48:04 +00:00
Peter Simons
6fcd493d5f
openssl: added myself as a maintainer
...
svn path=/nixpkgs/trunk/; revision=29425
2011-09-21 18:45:52 +00:00
Peter Simons
865b08c151
haskell-system-fileio: updated to version 0.3.2.1
...
svn path=/nixpkgs/trunk/; revision=29423
2011-09-21 16:47:27 +00:00
Peter Simons
981ad994f5
haskell-hmatrix: updated to version 0.12.0.1
...
svn path=/nixpkgs/trunk/; revision=29422
2011-09-21 16:47:23 +00:00
Peter Simons
353d1e7882
haskell-clientsession: updated to version 0.7.3
...
svn path=/nixpkgs/trunk/; revision=29421
2011-09-21 16:47:19 +00:00
Peter Simons
b40cab3fab
haskell-aeson-native: updated to version 0.3.3.1
...
svn path=/nixpkgs/trunk/; revision=29420
2011-09-21 16:47:14 +00:00
Peter Simons
ac569c9b63
haskell-RSA: updated to version 1.0.6.2
...
svn path=/nixpkgs/trunk/; revision=29419
2011-09-21 16:47:07 +00:00
Peter Simons
4821046eb3
haskell-skein: added version 0.1
...
svn path=/nixpkgs/trunk/; revision=29418
2011-09-21 16:46:59 +00:00
Peter Simons
54acb66473
haskell-prolog: added version 0.1
...
haskell-prolog-graph: added version 0.1.0.2
haskell-prolog-graph-lib: added version 0.1
svn path=/nixpkgs/trunk/; revision=29417
2011-09-21 16:46:54 +00:00
Peter Simons
6bc5b0f215
haskell-maude: added version 0.2.1
...
svn path=/nixpkgs/trunk/; revision=29414
2011-09-21 16:46:39 +00:00
Lluís Batlle i Rossell
53cecc13b4
Fixing strace build inputs for cross building.
...
svn path=/nixpkgs/trunk/; revision=29407
2011-09-21 06:59:09 +00:00
Lluís Batlle i Rossell
03892b3e01
Making bison 2.5 cross build.
...
svn path=/nixpkgs/trunk/; revision=29405
2011-09-21 06:15:15 +00:00
Peter Simons
f844c8730e
haskell-json: added version 0.5
...
svn path=/nixpkgs/trunk/; revision=29402
2011-09-20 20:30:20 +00:00
Peter Simons
df1a47bda2
haskell-hakyll: updated to version 3.2.0.7
...
svn path=/nixpkgs/trunk/; revision=29401
2011-09-20 20:25:31 +00:00
Alexander Tsamutali
a26835c2bc
development/libraries/nss: Fix building on Linux 3.x.
...
svn path=/nixpkgs/trunk/; revision=29399
2011-09-20 19:46:40 +00:00
Yury G. Kudryashov
de89582238
Add gtk-3.x libraries
...
Let hydra build it but do not show in nix-env -qa
svn path=/nixpkgs/trunk/; revision=29398
2011-09-20 16:18:12 +00:00
Eelco Dolstra
a3a15545f6
* wxPython updated to 2.8.12.0.
...
svn path=/nixpkgs/trunk/; revision=29395
2011-09-20 11:19:55 +00:00
Yury G. Kudryashov
31d77b3e2f
gtkmm-2.24
...
svn path=/nixpkgs/trunk/; revision=29388
2011-09-20 06:23:27 +00:00
Yury G. Kudryashov
1c6d328898
Add atkmm
...
svn path=/nixpkgs/trunk/; revision=29387
2011-09-20 06:23:17 +00:00
Yury G. Kudryashov
501cc845a0
pangomm-2.28
...
svn path=/nixpkgs/trunk/; revision=29386
2011-09-20 06:23:08 +00:00
Yury G. Kudryashov
ff25d193ad
glibmm-2.28
...
svn path=/nixpkgs/trunk/; revision=29385
2011-09-20 06:22:59 +00:00
Yury G. Kudryashov
8d5fecc4f7
gtk-2.24.6 + some review
...
svn path=/nixpkgs/trunk/; revision=29384
2011-09-20 06:22:51 +00:00
Yury G. Kudryashov
83a44e5a65
wxGTK: rely on gtk.propagatedBuildInputs
...
gtkLibs224.gtk actually propagates libpng etc. through gdk_pixbuf,
so using gtk.libpng etc. makes no sense.
Remove unused 'inherit lib*;' in gtk.
svn path=/nixpkgs/trunk/; revision=29383
2011-09-20 06:22:39 +00:00
Yury G. Kudryashov
e803d715c2
pango: pkg-config is a native buildInput
...
switch to fetchurl_gnome
svn path=/nixpkgs/trunk/; revision=29382
2011-09-20 06:22:30 +00:00
Yury G. Kudryashov
72b58e2218
Review glib expression
...
* Use buildNativeInputs
* Use .tar.xz
* Add TODO
svn path=/nixpkgs/trunk/; revision=29381
2011-09-20 06:22:22 +00:00
Yury G. Kudryashov
4e9fbf18ed
Build cairo-gobject library
...
Move cairo to gtkLibs.cairo
svn path=/nixpkgs/trunk/; revision=29380
2011-09-20 06:22:14 +00:00
Yury G. Kudryashov
e5062a4c5c
atk: perl and pkgconfig are buildNativeInputs
...
Switch to fetchurl_gnome
svn path=/nixpkgs/trunk/; revision=29379
2011-09-20 06:22:04 +00:00
Yury G. Kudryashov
058fc8da82
gdk-pixbuf-2.24
...
svn path=/nixpkgs/trunk/; revision=29378
2011-09-20 06:21:56 +00:00
Yury G. Kudryashov
c67fde4a47
Sorry, this is the hash of .tar.xz
...
svn path=/nixpkgs/trunk/; revision=29376
2011-09-20 06:14:29 +00:00
Yury G. Kudryashov
ab81388587
libpng-1.2.46
...
OK, libpng-1.5.x breaks stuff but why revert to a version with security holes?
svn path=/nixpkgs/trunk/; revision=29375
2011-09-20 06:13:39 +00:00
Rob Vermaas
2c33be2d8b
revert previous commits related to libpng 1.2.44, until we are able to build 1.2.45
...
svn path=/nixpkgs/trunk/; revision=29373
2011-09-19 23:05:02 +00:00
Piotr Pietraszkiewicz
9827fd060d
libgadu-1.11.0
...
svn path=/nixpkgs/trunk/; revision=29369
2011-09-19 22:02:11 +00:00
Rob Vermaas
30e9cae7d2
added some python packages, add variant for libpng 1.2.44 as matplotlib does not compile with newer versions
...
svn path=/nixpkgs/trunk/; revision=29366
2011-09-19 21:00:37 +00:00
Yury G. Kudryashov
0297229504
libpng-1.5
...
See CVE-2011-269{0,1,2}
svn path=/nixpkgs/trunk/; revision=29363
2011-09-19 19:01:40 +00:00
Peter Simons
c8d3fcd1b3
haskell-aeson: updated to version 0.3.2.12
...
svn path=/nixpkgs/trunk/; revision=29362
2011-09-19 18:56:38 +00:00
Peter Simons
363510a983
haskell-cabal2nix: updated to version 1.17
...
svn path=/nixpkgs/trunk/; revision=29356
2011-09-19 16:51:15 +00:00
Peter Simons
c9a0666da7
pkgs/development/compilers/pakcs: minor cosmetic changes
...
svn path=/nixpkgs/trunk/; revision=29354
2011-09-19 16:38:43 +00:00
Peter Simons
5a8e3f5b4e
haskell-http-enumerator: updated to version 0.7.1
...
svn path=/nixpkgs/trunk/; revision=29352
2011-09-19 16:38:28 +00:00
Peter Simons
1d3a00e51a
haskell-HaskellForMaths: updated to version 0.4.0
...
svn path=/nixpkgs/trunk/; revision=29351
2011-09-19 16:38:22 +00:00
Peter Simons
5bb330db07
swi-prolog: updated to version 5.10.5
...
svn path=/nixpkgs/trunk/; revision=29350
2011-09-19 16:38:16 +00:00
Yury G. Kudryashov
071700bcbc
Remove unused files
...
svn path=/nixpkgs/trunk/; revision=29343
2011-09-19 10:03:14 +00:00
Yury G. Kudryashov
63959f2a5a
Let poppler use ${POPPLER_DATADIR}
...
Also upgrade poppler-data
svn path=/nixpkgs/trunk/; revision=29342
2011-09-19 08:35:30 +00:00
Yury G. Kudryashov
a5864633f3
SDL_net: propagate sdl
...
svn path=/nixpkgs/trunk/; revision=29340
2011-09-19 05:16:49 +00:00
Yury G. Kudryashov
595d141a30
avahi-0.6.30
...
svn path=/nixpkgs/trunk/; revision=29332
2011-09-18 13:54:54 +00:00
Shea Levy
2cc9e52aec
python-2.7: Attempt to fix the nixpkgs evaluation error
...
svn path=/nixpkgs/trunk/; revision=29327
2011-09-17 18:52:28 +00:00
Alexander Tsamutali
cca42b5cc0
development/interpreters/python/2.7: Fix building on Linux 3.x (iirc, that was the problem).
...
svn path=/nixpkgs/trunk/; revision=29325
2011-09-17 16:29:40 +00:00
Peter Simons
051b50143a
haskell-cabal2nix: updated to version 1.16
...
svn path=/nixpkgs/trunk/; revision=29324
2011-09-17 13:45:06 +00:00
Peter Simons
c0204a42b9
haskell-hp2any-graph: regenerated expression with latest version of cabal2nix
...
svn path=/nixpkgs/trunk/; revision=29323
2011-09-17 13:42:38 +00:00
Peter Simons
9d5848cb99
haskell-unordered-containers: updated to version 0.1.4.3
...
svn path=/nixpkgs/trunk/; revision=29322
2011-09-17 13:35:15 +00:00
Peter Simons
195831a3bf
haskell-dimensional: updated to version 0.10.1.2
...
svn path=/nixpkgs/trunk/; revision=29321
2011-09-17 13:35:09 +00:00
Ludovic Courtès
5583e6f741
GNU Linear Programming Kit 4.47.
...
svn path=/nixpkgs/trunk/; revision=29318
2011-09-17 10:09:48 +00:00
Ludovic Courtès
4fe98cdc02
GNU GLOBAL 6.0.
...
svn path=/nixpkgs/trunk/; revision=29316
2011-09-17 10:09:33 +00:00
Lluís Batlle i Rossell
98f6452a70
Adding the gnunet 0.9 (svn), which works incompatible with the latest gnunet released.
...
I updated some libs to get it built.
svn path=/nixpkgs/trunk/; revision=29313
2011-09-16 20:50:24 +00:00
Peter Simons
6ed0f99b70
haskell-helium: the package has disappeared from the upstream web server
...
svn path=/nixpkgs/trunk/; revision=29311
2011-09-16 18:29:32 +00:00
Peter Simons
2f736e0ca0
haskell-Hipmunk: avoid build error in the haddock documentation
...
svn path=/nixpkgs/trunk/; revision=29309
2011-09-16 18:19:15 +00:00
Peter Simons
95ae45256a
haskell-get-options: the package doesn't build, because the upstream archive has vanished
...
svn path=/nixpkgs/trunk/; revision=29308
2011-09-16 18:17:20 +00:00
Eelco Dolstra
7df0d1cc58
* Updated IO::Compress.
...
svn path=/nixpkgs/trunk/; revision=29301
2011-09-16 10:32:37 +00:00
Andres Löh
54039c51f8
Added haskell-gloss and modified haskell-GLURaw.
...
I know that GLURaw is currently a modification of the generated file.
Not making the change prevents GLURaw from being loaded into ghci.
svn path=/nixpkgs/trunk/; revision=29290
2011-09-15 05:03:31 +00:00
Peter Simons
89ebfa875d
haskell-yesod: updated to version 0.9.2.2
...
svn path=/nixpkgs/trunk/; revision=29279
2011-09-14 17:13:34 +00:00
Peter Simons
eb7be9c030
haskell-yesod-form: updated to version 0.3.2.1
...
svn path=/nixpkgs/trunk/; revision=29278
2011-09-14 17:13:30 +00:00
Peter Simons
d2272469b7
haskell-hledger: updated to version 0.15.2
...
svn path=/nixpkgs/trunk/; revision=29277
2011-09-14 17:13:26 +00:00
Peter Simons
061057a253
haskell-hledger-web: updated to version 0.15.3
...
svn path=/nixpkgs/trunk/; revision=29276
2011-09-14 17:13:22 +00:00
Peter Simons
393a0dba1c
haskell-hledger-vty: updated to version 0.15.2
...
svn path=/nixpkgs/trunk/; revision=29275
2011-09-14 17:13:18 +00:00
Peter Simons
135ccb3feb
haskell-hledger-lib: updated to version 0.15.2
...
svn path=/nixpkgs/trunk/; revision=29274
2011-09-14 17:13:14 +00:00
Peter Simons
ac7bad192b
haskell-hledger-chart: updated to version 0.15.2
...
svn path=/nixpkgs/trunk/; revision=29273
2011-09-14 17:13:10 +00:00
Piotr Pietraszkiewicz
28ab7935b7
made myself a maintainer of sword
...
svn path=/nixpkgs/trunk/; revision=29257
2011-09-13 20:50:39 +00:00
Peter Simons
3c5ff4a118
haskell-hledger-web: added version 0.15.3
...
svn path=/nixpkgs/trunk/; revision=29243
2011-09-13 17:35:18 +00:00
Peter Simons
6557b25b37
haskell-io-storage: added version 0.3
...
svn path=/nixpkgs/trunk/; revision=29242
2011-09-13 17:35:12 +00:00
Peter Simons
8c8d88080d
haskell-time: updated to version 1.4
...
svn path=/nixpkgs/trunk/; revision=29241
2011-09-13 17:35:07 +00:00
Peter Simons
93955eabc5
haskell-cabal2nix: updated to version 1.15
...
svn path=/nixpkgs/trunk/; revision=29227
2011-09-12 17:31:15 +00:00
Eelco Dolstra
17925a9d3c
* OpenSSL: Allow the location of the X509 certificate file (the CA
...
bundle) to be set through the environment variable
‘OPENSSL_X509_CERT_FILE’. This is necessary because the default
location ($out/ssl/cert.pem) doesn't exist, and hardcoding something
like /etc/ssl/cert.pem is impure and cannot be overriden
per-process. For security, the environment variable is ignored for
setuid binaries.
svn path=/nixpkgs/trunk/; revision=29224
2011-09-12 16:57:34 +00:00
Peter Simons
631772e028
haskell-svgcairo: updated to version 0.12.1
...
svn path=/nixpkgs/trunk/; revision=29222
2011-09-12 16:46:10 +00:00
Peter Simons
7c6aa89222
haskell-pango: updated to version 0.12.1
...
svn path=/nixpkgs/trunk/; revision=29221
2011-09-12 16:46:06 +00:00
Peter Simons
a69572d3a5
haskell-gtksourceview2: updated to version 0.12.3
...
svn path=/nixpkgs/trunk/; revision=29220
2011-09-12 16:46:02 +00:00
Peter Simons
dc0a01018e
haskell-gtk2hs-buildtools: updated to version 0.12.1
...
svn path=/nixpkgs/trunk/; revision=29219
2011-09-12 16:45:57 +00:00
Peter Simons
676a2a355e
haskell-gtk: updated to version 0.12.1
...
svn path=/nixpkgs/trunk/; revision=29218
2011-09-12 16:45:51 +00:00
Peter Simons
2f28f47997
haskell-glib: updated to version 0.12.1
...
svn path=/nixpkgs/trunk/; revision=29217
2011-09-12 16:45:47 +00:00
Peter Simons
c59d360c6a
haskell-glade: updated to version 0.12.1
...
svn path=/nixpkgs/trunk/; revision=29216
2011-09-12 16:45:39 +00:00
Peter Simons
f0e8a10ff4
haskell-cairo: updated to version 0.12.1
...
svn path=/nixpkgs/trunk/; revision=29215
2011-09-12 16:45:35 +00:00
Peter Simons
744450f9c4
haskell-yesod: updated to version 0.9.2.1
...
svn path=/nixpkgs/trunk/; revision=29214
2011-09-12 16:45:31 +00:00
Peter Simons
775896c15f
haskell-epic: updated to version 0.1.13
...
svn path=/nixpkgs/trunk/; revision=29213
2011-09-12 16:45:27 +00:00
Peter Simons
20c7526891
haskell-vector-algorithms: dropped obsolete version 0.4
...
svn path=/nixpkgs/trunk/; revision=29212
2011-09-12 16:45:23 +00:00
Peter Simons
107201f99f
haskell-case-insensitive: dropped obsolete version 0.3
...
svn path=/nixpkgs/trunk/; revision=29211
2011-09-12 16:45:18 +00:00
Peter Simons
d1219f3e3a
haskell-snap-server: updated to version 0.5.4
...
svn path=/nixpkgs/trunk/; revision=29210
2011-09-12 16:45:13 +00:00
Peter Simons
3ac8f8c892
haskell-snap-core: updated to version 0.5.4
...
svn path=/nixpkgs/trunk/; revision=29209
2011-09-12 16:45:08 +00:00
Eelco Dolstra
3e54387efd
* Added OpenSSL 1.0.0e (not updating the default yet because a lot
...
depends on it). Also, install the manpages in $out/share/man rather
than $out/ssl/man.
svn path=/nixpkgs/trunk/; revision=29208
2011-09-12 16:09:00 +00:00
Eelco Dolstra
41d9959ed3
* Better description.
...
svn path=/nixpkgs/trunk/; revision=29207
2011-09-12 13:02:54 +00:00
Eelco Dolstra
6a73467eac
* Chromium updated to the latest version. Because Chromium now used
...
Gold, this requires a new patchelf.
* Changed the package name from ‘chrome’ to ‘chromium’.
svn path=/nixpkgs/trunk/; revision=29197
2011-09-11 20:48:02 +00:00
Shea Levy
d1808a89d3
haskellPackages.{cairo,pango,glib,gtk}: Depend on the stdenv libc instead of glibc
...
svn path=/nixpkgs/trunk/; revision=29190
2011-09-11 18:48:46 +00:00
Michael Raskin
7bb4bf3fe0
Adding LOVE Lua-based game framework/interpreter
...
svn path=/nixpkgs/trunk/; revision=29188
2011-09-11 17:05:48 +00:00
Michael Raskin
8351a946d2
Adding libmodplug
...
svn path=/nixpkgs/trunk/; revision=29186
2011-09-11 16:45:42 +00:00
Peter Simons
8993dabdf4
haskell-yesod: updated to version 0.9.2
...
svn path=/nixpkgs/trunk/; revision=29178
2011-09-11 10:34:26 +00:00
Peter Simons
5557e9dcf2
haskell-yesod-form: updated to version 0.3.2
...
svn path=/nixpkgs/trunk/; revision=29177
2011-09-11 10:34:22 +00:00
Peter Simons
e4f516bda4
haskell-yesod-core: updated to version 0.9.2
...
svn path=/nixpkgs/trunk/; revision=29176
2011-09-11 10:34:17 +00:00
Peter Simons
4be1a78270
haskell-yesod-auth: updated to version 0.7.2
...
svn path=/nixpkgs/trunk/; revision=29175
2011-09-11 10:34:13 +00:00
Peter Simons
e8375ba69c
haskell-warp: updated to version 0.4.5
...
svn path=/nixpkgs/trunk/; revision=29174
2011-09-11 10:34:04 +00:00
Peter Simons
06a51a4a46
haskell-wai: updated to version 0.4.2
...
svn path=/nixpkgs/trunk/; revision=29173
2011-09-11 10:33:56 +00:00
Peter Simons
e85eca5f8d
haskell-shakespeare: updated to version 0.10.1
...
svn path=/nixpkgs/trunk/; revision=29172
2011-09-11 10:33:49 +00:00
Peter Simons
8b42338143
haskell-shakespeare-text: updated to version 0.10.1
...
svn path=/nixpkgs/trunk/; revision=29171
2011-09-11 10:33:43 +00:00
Peter Simons
74d68f2be9
haskell-shakespeare-css: updated to version 0.10.1
...
svn path=/nixpkgs/trunk/; revision=29170
2011-09-11 10:33:36 +00:00
Peter Simons
e75afee27c
haskell-persistent: updated to version 0.6.2
...
svn path=/nixpkgs/trunk/; revision=29169
2011-09-11 10:33:31 +00:00
Peter Simons
eb588afe73
haskell-persistent-template: updated to version 0.6.2
...
svn path=/nixpkgs/trunk/; revision=29168
2011-09-11 10:33:23 +00:00
Peter Simons
af78f75777
haskell-authenticate: updated to version 0.10.2.1
...
svn path=/nixpkgs/trunk/; revision=29167
2011-09-11 10:33:15 +00:00
Peter Simons
e364367ec9
haskell-hamlet: updated to version 0.10.1
...
svn path=/nixpkgs/trunk/; revision=29166
2011-09-11 10:33:08 +00:00
Peter Simons
ee57346eb9
haskell-shakespeare-text: added version 0.10.1
...
svn path=/nixpkgs/trunk/; revision=29165
2011-09-11 10:32:59 +00:00
Andres Löh
829a5e3209
Bump GHC HEAD snapshot.
...
svn path=/nixpkgs/trunk/; revision=29164
2011-09-11 09:14:22 +00:00
Peter Simons
49bf0b50a8
haskell-cabal-ghci: updated to version 0.1.1
...
svn path=/nixpkgs/trunk/; revision=29152
2011-09-10 11:27:13 +00:00
Marco Maggesi
3f94f217d1
Add clooj, IDE for clojure
...
svn path=/nixpkgs/trunk/; revision=29149
2011-09-09 21:15:20 +00:00
Andres Löh
bc3c074cb8
Added unbound, RepLib, type-equality.
...
svn path=/nixpkgs/trunk/; revision=29148
2011-09-09 20:45:04 +00:00
Andres Löh
19995681f3
Added instant-generics.
...
svn path=/nixpkgs/trunk/; revision=29139
2011-09-09 19:43:04 +00:00
Andres Löh
6a754d3119
Minor fix.
...
svn path=/nixpkgs/trunk/; revision=29138
2011-09-09 19:35:31 +00:00
Andres Löh
29de18d262
Added generic-deriving.
...
svn path=/nixpkgs/trunk/; revision=29137
2011-09-09 19:30:53 +00:00
Peter Simons
b917ed0493
haskell-deepseq-th: added version 0.1.0.2
...
svn path=/nixpkgs/trunk/; revision=29136
2011-09-09 18:44:40 +00:00
Peter Simons
4b66e4ce25
haskell-happstack-hamlet: added version 6.2.0
...
svn path=/nixpkgs/trunk/; revision=29135
2011-09-09 18:44:33 +00:00
Peter Simons
3864892222
haskell-happstack-server: updated to version 6.2.4
...
svn path=/nixpkgs/trunk/; revision=29134
2011-09-09 18:44:26 +00:00
Peter Simons
a13bbb3b10
haskell-cabal-ghci: added version 0.1
...
svn path=/nixpkgs/trunk/; revision=29133
2011-09-09 18:44:19 +00:00
Peter Simons
8dbe7158f5
haskell-happstack-server: updated to version 6.2.3
...
svn path=/nixpkgs/trunk/; revision=29114
2011-09-08 18:39:58 +00:00
Peter Simons
3a1d709073
haskell-cryptohash: updated to version 0.7.2
...
svn path=/nixpkgs/trunk/; revision=29113
2011-09-08 18:39:54 +00:00
Peter Simons
4a2b9bbaa8
haskell-Crypto: updated to version 4.2.4
...
svn path=/nixpkgs/trunk/; revision=29112
2011-09-08 17:25:19 +00:00
Peter Simons
e0b8620b50
haskell-uuagc-cabal: updated to version 1.0.0.6
...
svn path=/nixpkgs/trunk/; revision=29111
2011-09-08 17:25:15 +00:00
Peter Simons
050d264bfc
haskell-deepseq: added version 1.2.0.1
...
svn path=/nixpkgs/trunk/; revision=29110
2011-09-08 17:25:09 +00:00
Lluís Batlle i Rossell
f4ba87948a
Updating gdb. They hit the trouble of GPL violation too like binutils, and the
...
tarball went away.
svn path=/nixpkgs/trunk/; revision=29108
2011-09-08 10:30:24 +00:00
Yury G. Kudryashov
cded4473e7
Apply upstream patches to ntrack\n\nProbably fixes 100% CPU problem in kded module
...
svn path=/nixpkgs/trunk/; revision=29105
2011-09-07 22:53:31 +00:00
Peter Simons
c292d234ea
haskell-system-filepath: added version 0.4.1
...
haskell-system-fileio: added version 0.3.2
svn path=/nixpkgs/trunk/; revision=29100
2011-09-07 20:21:01 +00:00
Eelco Dolstra
f47cea8699
* Updated neon to 0.29.6.
...
svn path=/nixpkgs/trunk/; revision=29098
2011-09-07 18:08:59 +00:00
Peter Simons
7dc8b51b68
haskell-MissingH: updated to version 1.1.1.0
...
svn path=/nixpkgs/trunk/; revision=29097
2011-09-07 17:41:00 +00:00
Peter Simons
d923ec714e
haskell-WebBits-Html: added version 1.0.2
...
svn path=/nixpkgs/trunk/; revision=29096
2011-09-07 17:30:07 +00:00
Peter Simons
05db155ad3
haskell-repa-io: updated to version 2.2.0.1
...
svn path=/nixpkgs/trunk/; revision=29093
2011-09-07 17:29:54 +00:00
Peter Simons
08bdadc357
haskell-repa-examples: updated to version 2.2.0.1
...
svn path=/nixpkgs/trunk/; revision=29092
2011-09-07 17:29:50 +00:00
Peter Simons
08d6c0a1d3
haskell-repa-bytestring: updated to version 2.2.0.1
...
svn path=/nixpkgs/trunk/; revision=29091
2011-09-07 17:29:46 +00:00
Peter Simons
ca93a87e0f
haskell-repa-algorithms: updated to version 2.2.0.1
...
svn path=/nixpkgs/trunk/; revision=29090
2011-09-07 17:29:42 +00:00
Peter Simons
41dcf578ef
haskell-repa: updated to version 2.2.0.1
...
Note that the latest version requires GHC 7.2.1 or later; older GHC
versions are no longer supported.
svn path=/nixpkgs/trunk/; revision=29089
2011-09-07 17:29:38 +00:00
Peter Simons
4fba6f2bf3
haskell-vector: added version 0.9
...
svn path=/nixpkgs/trunk/; revision=29086
2011-09-07 16:53:27 +00:00
Peter Simons
0d137ccd67
haskell-primitive: added version 0.4.0.1
...
svn path=/nixpkgs/trunk/; revision=29085
2011-09-07 16:53:20 +00:00
Peter Simons
c710e9e0e6
haskell-hakyll: updated to version 3.2.0.6
...
svn path=/nixpkgs/trunk/; revision=29084
2011-09-07 16:53:15 +00:00
Shea Levy
dcd147a141
Add note in binutils/default.nix to warn about the problematic source tarball
...
svn path=/nixpkgs/trunk/; revision=29067
2011-09-06 20:47:27 +00:00
Peter Simons
70c6cc780a
haskell-xml-enumerator: updated to version 0.4.1
...
svn path=/nixpkgs/trunk/; revision=29066
2011-09-06 17:17:43 +00:00
Peter Simons
051326b8c7
haskell-Hipmunk: updated to version 5.2.0.3
...
svn path=/nixpkgs/trunk/; revision=29065
2011-09-06 17:17:38 +00:00
Shea Levy
14c11b349a
ruby/generated.nix: Add rails and its dependencies (which automatically updated rake)
...
svn path=/nixpkgs/trunk/; revision=29055
2011-09-06 05:37:59 +00:00
Eelco Dolstra
bf69a3f6b6
* Layout.
...
svn path=/nixpkgs/trunk/; revision=29049
2011-09-05 23:26:06 +00:00
Eelco Dolstra
41c9a5ebd3
* Fix the binutils URL.
...
svn path=/nixpkgs/trunk/; revision=29047
2011-09-05 20:54:53 +00:00
Peter Simons
8889207542
haskell-cabal2nix: updated to version 1.14
...
svn path=/nixpkgs/trunk/; revision=29045
2011-09-05 20:49:41 +00:00
Peter Simons
bbc00bd0e7
haskell-packages.nix: removed more obsolete manual overrides
...
svn path=/nixpkgs/trunk/; revision=29042
2011-09-05 19:45:49 +00:00
Peter Simons
72ae88b019
haskell-WebBits: renamed nix file for consistency
...
svn path=/nixpkgs/trunk/; revision=29041
2011-09-05 19:45:45 +00:00
Peter Simons
b1277cea39
haskell-ghc-paths: updated default version to 0.1.0.8 (and dropped obsolete older versions)
...
svn path=/nixpkgs/trunk/; revision=29040
2011-09-05 19:31:49 +00:00
Peter Simons
ed864ff8c3
haskell-happy: fixed build of version 1.18.4
...
svn path=/nixpkgs/trunk/; revision=29039
2011-09-05 19:31:42 +00:00
Peter Simons
65c90e5d01
haskell-packages.nix: removed lots of explicit argument assignments that have become obsolete
...
svn path=/nixpkgs/trunk/; revision=29038
2011-09-05 19:24:12 +00:00
Peter Simons
f67cf46ddc
haskell-ehc: updated to revision 2293
...
svn path=/nixpkgs/trunk/; revision=29037
2011-09-05 19:24:07 +00:00
Peter Simons
e373f558da
haskell-X11: updated build expression
...
svn path=/nixpkgs/trunk/; revision=29036
2011-09-05 19:24:01 +00:00
Peter Simons
fba79e58c5
haskell-yesod-auth: updated to version 0.7.1.1
...
svn path=/nixpkgs/trunk/; revision=29032
2011-09-05 17:29:45 +00:00
Peter Simons
440e448211
haskell-xml-enumerator: updated to version 0.4.0
...
svn path=/nixpkgs/trunk/; revision=29031
2011-09-05 17:29:41 +00:00
Peter Simons
c1183c17d7
haskell-http-enumerator: updated to version 0.7.0
...
svn path=/nixpkgs/trunk/; revision=29030
2011-09-05 17:29:37 +00:00
Peter Simons
116aa6a9e5
haskell-digest: updated to version 0.0.1.0
...
svn path=/nixpkgs/trunk/; revision=29029
2011-09-05 17:29:34 +00:00
Peter Simons
a2f91fa8b0
haskell-authenticate: updated to version 0.10.2
...
svn path=/nixpkgs/trunk/; revision=29028
2011-09-05 17:29:28 +00:00
Andres Löh
51124b08b5
Bumping the GHC HEAD snapshot.
...
svn path=/nixpkgs/trunk/; revision=29026
2011-09-05 13:29:33 +00:00
Andres Löh
1e6eeb9ad7
Updated ghc-events and threadscope.
...
svn path=/nixpkgs/trunk/; revision=29023
2011-09-05 09:52:34 +00:00
Ludovic Courtès
bad0bd10a8
GnuTLS 3.0.2.
...
svn path=/nixpkgs/trunk/; revision=29009
2011-09-04 23:05:42 +00:00
Ludovic Courtès
77f80e6310
GNU Nettle 2.4.
...
svn path=/nixpkgs/trunk/; revision=29008
2011-09-04 23:05:35 +00:00
Peter Simons
92153bc2d5
haskell-xss-sanitize: dropped obsolete version 0.2.6
...
svn path=/nixpkgs/trunk/; revision=29004
2011-09-04 13:44:39 +00:00
Peter Simons
5fb2b7c8eb
haskell-happstack-server: updated to version 6.2.2
...
svn path=/nixpkgs/trunk/; revision=29003
2011-09-04 13:44:31 +00:00
Peter Simons
27b2d8f8a9
haskell-gitit: updated to version 0.8.1
...
svn path=/nixpkgs/trunk/; revision=29002
2011-09-04 13:44:22 +00:00
Shea Levy
1fe20228b9
sphinxbase: Add flag to play with multiple outputs
...
svn path=/nixpkgs/trunk/; revision=28999
2011-09-03 20:01:06 +00:00
Shea Levy
04e4bf68c8
sphinxbase: The source tarball hash changed for some reason. That's disconcerting...
...
svn path=/nixpkgs/trunk/; revision=28998
2011-09-03 20:00:58 +00:00
Peter Simons
c79027e3ab
haskell-hxt: added version 9.1.4
...
haskell-hxt-charproperties: added version 9.1.0
haskell-hxt-regex-xmlschema: added version 9.0.1
haskell-hxt-unicode: added version 9.0.1
svn path=/nixpkgs/trunk/; revision=28995
2011-09-03 13:17:29 +00:00
Peter Simons
9bc7fee30d
haskell-hS3: added version 0.5.6
...
svn path=/nixpkgs/trunk/; revision=28994
2011-09-03 13:17:23 +00:00
Peter Simons
30c71f18b8
haskell-vector-space: updated to version 0.7.6
...
svn path=/nixpkgs/trunk/; revision=28992
2011-09-02 21:49:13 +00:00
Peter Simons
b07e579498
haskell-hledger: updated to version 0.15.1
...
svn path=/nixpkgs/trunk/; revision=28991
2011-09-02 21:49:08 +00:00
Peter Simons
df672edd89
haskell-hledger-vty: updated to version 0.15.1
...
svn path=/nixpkgs/trunk/; revision=28990
2011-09-02 21:49:02 +00:00
Peter Simons
afb859003f
haskell-hledger-chart: updated to version 0.15.1
...
svn path=/nixpkgs/trunk/; revision=28989
2011-09-02 21:48:57 +00:00
Peter Simons
afdabc50ff
Oops, forgot to delete the old file.
...
svn path=/nixpkgs/trunk/; revision=28986
2011-09-02 18:33:04 +00:00
Peter Simons
35e1b7ddee
haskell-vector-algorithms: updated to version 0.5.3
...
svn path=/nixpkgs/trunk/; revision=28985
2011-09-02 18:31:44 +00:00
Peter Simons
6295090cc6
haskell-unix-compat: added version 0.3
...
svn path=/nixpkgs/trunk/; revision=28984
2011-09-02 18:24:27 +00:00
Peter Simons
fb05c34051
haskell-HaskellForMaths: added version 0.3.4
...
svn path=/nixpkgs/trunk/; revision=28983
2011-09-02 18:20:35 +00:00
Peter Simons
89afa3dd58
haskell-hmatrix: updated to version 0.12.0.0
...
svn path=/nixpkgs/trunk/; revision=28981
2011-09-02 18:02:28 +00:00
Peter Simons
2442cf69f7
haskell-hledger: updated to version 0.15
...
svn path=/nixpkgs/trunk/; revision=28980
2011-09-02 18:02:24 +00:00
Peter Simons
79c008e863
haskell-hledger-vty: updated to version 0.15
...
svn path=/nixpkgs/trunk/; revision=28979
2011-09-02 18:02:20 +00:00
Peter Simons
232483a379
haskell-hledger-lib: updated to version 0.15
...
svn path=/nixpkgs/trunk/; revision=28978
2011-09-02 18:02:16 +00:00
Peter Simons
159adba352
haskell-hledger-chart: updated to version 0.15
...
svn path=/nixpkgs/trunk/; revision=28977
2011-09-02 18:02:10 +00:00
Andres Löh
33afa20575
Added HDBC-odbc.
...
svn path=/nixpkgs/trunk/; revision=28975
2011-09-02 15:11:52 +00:00
Michael Raskin
32754d3c19
Adding Regina-REXX interpreter
...
svn path=/nixpkgs/trunk/; revision=28969
2011-09-02 08:05:51 +00:00
Peter Simons
236ba05e06
haskell-yesod: updated to version 0.9.1.1
...
svn path=/nixpkgs/trunk/; revision=28966
2011-09-01 17:59:38 +00:00
Peter Simons
dfc019ad49
haskell-yesod-core: updated to version 0.9.1.1
...
svn path=/nixpkgs/trunk/; revision=28965
2011-09-01 17:59:34 +00:00
Peter Simons
9221fafcb1
haskell-regular: updated to version 0.3.3
...
svn path=/nixpkgs/trunk/; revision=28964
2011-09-01 17:59:30 +00:00
Peter Simons
7e165bb559
haskell-ranges: updated to version 0.2.4
...
svn path=/nixpkgs/trunk/; revision=28963
2011-09-01 17:59:26 +00:00
Peter Simons
70c47021a7
haskell-xhtml: updated to version 3000.2.0.4
...
svn path=/nixpkgs/trunk/; revision=28962
2011-09-01 17:59:22 +00:00
Marco Maggesi
a02960ae4e
Add clojure.
...
(Install with command
nix-env -i clojure-wrapper
start REPL with command
clojure)
svn path=/nixpkgs/trunk/; revision=28956
2011-09-01 13:38:59 +00:00
Peter Simons
7a0fe943aa
haskell-fclabels: updated to version 1.0.4
...
svn path=/nixpkgs/trunk/; revision=28945
2011-08-31 19:05:10 +00:00
Peter Simons
04b1ac31da
haskell-http-enumerator: updated to version 0.6.7
...
svn path=/nixpkgs/trunk/; revision=28943
2011-08-31 12:41:06 +00:00
Peter Simons
4758e8a71a
haskell-clientsession: updated to version 0.7.2
...
svn path=/nixpkgs/trunk/; revision=28942
2011-08-31 12:41:01 +00:00
Peter Simons
6358071c14
haskell-ListLike: updated to version 3.1.2
...
svn path=/nixpkgs/trunk/; revision=28941
2011-08-31 12:40:57 +00:00
Peter Simons
fe445aa5b2
haskell-xhtml: added version 3000.2.0.2
...
svn path=/nixpkgs/trunk/; revision=28940
2011-08-31 12:40:53 +00:00
Shea Levy
9496f3767b
gcc-apple64: Enable Objective C
...
darwin-updates was just merged, so I'm taking the liberty of messing with darwin's stdenv
svn path=/nixpkgs/trunk/; revision=28929
2011-08-30 13:46:05 +00:00
Ludovic Courtès
e84b9edc78
Merge from the `darwin-updates' branch.
...
svn path=/nixpkgs/trunk/; revision=28926
2011-08-30 13:08:33 +00:00
Peter Simons
92e3a9c6dc
haskell-blaze-textual: updated to version 0.2.0.4
...
svn path=/nixpkgs/trunk/; revision=28925
2011-08-30 09:49:12 +00:00
Peter Simons
84ff2da8c1
haskell-aeson: updated to version 0.3.2.11
...
svn path=/nixpkgs/trunk/; revision=28924
2011-08-30 09:49:08 +00:00
Peter Simons
3775dea86f
haskell-warp: updated to version 0.4.4
...
svn path=/nixpkgs/trunk/; revision=28922
2011-08-30 09:17:38 +00:00
Peter Simons
d26f4612b1
haskell-random-fu: updated to version 0.2.1.0
...
svn path=/nixpkgs/trunk/; revision=28921
2011-08-30 09:17:34 +00:00
Peter Simons
f17a4bc77e
haskell-pool: updated to version 0.1.1
...
svn path=/nixpkgs/trunk/; revision=28920
2011-08-30 09:17:30 +00:00
Peter Simons
d0803ce5c8
haskell-largeword: updated to version 1.0.1
...
svn path=/nixpkgs/trunk/; revision=28919
2011-08-30 09:17:26 +00:00
Peter Simons
61dd4707c9
haskell-SHA: updated to version 1.5.0.0
...
svn path=/nixpkgs/trunk/; revision=28918
2011-08-30 09:17:22 +00:00
Peter Simons
fb37aed285
Dropped obsolete versions of haskell-HaXml.
...
svn path=/nixpkgs/trunk/; revision=28917
2011-08-30 08:55:14 +00:00
Peter Simons
d84962624e
Dropped obsolete haskell-emgm.
...
The package doesn't build with any of our compilers.
svn path=/nixpkgs/trunk/; revision=28906
2011-08-29 21:46:22 +00:00
Piotr Pietraszkiewicz
63ace05051
added polish dictionary to the list
...
svn path=/nixpkgs/trunk/; revision=28905
2011-08-29 21:45:42 +00:00
Peter Simons
6f23bfc52f
Dropped obsolete haskell-MaybeT-transformers.
...
The package doesn't build with any of our compilers.
svn path=/nixpkgs/trunk/; revision=28904
2011-08-29 21:44:36 +00:00
Peter Simons
a96de07ceb
Dropped obsolete Haskell packages monads-fd, salvia, and salvia-protocol.
...
These packages don't build with any of our compilers.
svn path=/nixpkgs/trunk/; revision=28903
2011-08-29 21:44:30 +00:00
Peter Simons
04e2d193bd
haskell-yesod: updated to version 0.9.1
...
svn path=/nixpkgs/trunk/; revision=28902
2011-08-29 20:28:32 +00:00
Peter Simons
6b2839c361
haskell-yesod-static: updated to version 0.3.0.1
...
svn path=/nixpkgs/trunk/; revision=28901
2011-08-29 20:28:27 +00:00
Peter Simons
4e715256a7
haskell-yesod-persistent: updated to version 0.2.1
...
svn path=/nixpkgs/trunk/; revision=28900
2011-08-29 20:28:23 +00:00
Peter Simons
077c598c85
haskell-yesod-json: updated to version 0.2.1
...
svn path=/nixpkgs/trunk/; revision=28899
2011-08-29 20:28:19 +00:00
Peter Simons
5b948f85e5
haskell-yesod-form: updated to version 0.3.1
...
svn path=/nixpkgs/trunk/; revision=28898
2011-08-29 20:28:14 +00:00
Peter Simons
4aa21929ea
haskell-yesod-core: updated to version 0.9.1
...
svn path=/nixpkgs/trunk/; revision=28897
2011-08-29 20:28:10 +00:00
Peter Simons
682bf916a8
haskell-yesod-auth: updated to version 0.7.1
...
svn path=/nixpkgs/trunk/; revision=28896
2011-08-29 20:28:06 +00:00
Peter Simons
5836af8dc2
haskell-wai-extra: updated to version 0.4.2
...
svn path=/nixpkgs/trunk/; revision=28895
2011-08-29 20:28:02 +00:00
Peter Simons
9c0c9b9ba4
haskell-wai-app-static: updated to version 0.3.3
...
svn path=/nixpkgs/trunk/; revision=28894
2011-08-29 20:27:47 +00:00
Peter Simons
42a21dc8d6
haskell-persistent: updated to version 0.6.1
...
svn path=/nixpkgs/trunk/; revision=28893
2011-08-29 20:27:34 +00:00
Peter Simons
e5454cf33a
haskell-persistent-template: updated to version 0.6.1
...
svn path=/nixpkgs/trunk/; revision=28892
2011-08-29 20:27:28 +00:00
Peter Simons
ba9cc549fa
haskell-data-default: updated to version 0.3.0
...
svn path=/nixpkgs/trunk/; revision=28891
2011-08-29 20:27:20 +00:00
Peter Simons
e31db94550
haskell-clientsession: updated to version 0.7.0
...
svn path=/nixpkgs/trunk/; revision=28890
2011-08-29 20:27:15 +00:00
Peter Simons
e6273ab9d1
haskell-authenticate: updated to version 0.10.1
...
svn path=/nixpkgs/trunk/; revision=28889
2011-08-29 20:27:10 +00:00
Peter Simons
ddb2097b3f
haskell-packages.nix: added shakespeare packages
...
haskell-shakespeare-css: added version 0.10.0
haskell-shakespeare-js: added version 0.10.1
haskell-shakespeare: added version 0.10.0
svn path=/nixpkgs/trunk/; revision=28888
2011-08-29 20:27:05 +00:00