Ludovic Courtès
bd1459a557
GNU SIP Witch 1.0.2.
...
svn path=/nixpkgs/trunk/; revision=27329
2011-05-30 21:49:50 +00:00
Ludovic Courtès
7e052f904e
GNU uCommon C++ 5.0.1.
...
svn path=/nixpkgs/trunk/; revision=27328
2011-05-30 21:49:43 +00:00
Ludovic Courtès
2a0744a264
GNU gv 3.7.2.
...
svn path=/nixpkgs/trunk/; revision=27327
2011-05-30 21:49:37 +00:00
Ludovic Courtès
99e79048d4
GNU Zile 2.3.24.
...
svn path=/nixpkgs/trunk/; revision=27326
2011-05-30 21:49:31 +00:00
Ludovic Courtès
b7f8a4a795
GNU SASL 1.6.1.
...
svn path=/nixpkgs/trunk/; revision=27325
2011-05-30 21:49:24 +00:00
Ludovic Courtès
947f4db2e9
GNU Libidn 1.22.
...
svn path=/nixpkgs/trunk/; revision=27324
2011-05-30 21:49:18 +00:00
Ludovic Courtès
1323580c9a
GNU Scientific Library 1.15.
...
svn path=/nixpkgs/trunk/; revision=27323
2011-05-30 21:49:12 +00:00
Ludovic Courtès
f86a5587d7
GNU IceCat 4.0.1.1.
...
svn path=/nixpkgs/trunk/; revision=27322
2011-05-30 21:49:06 +00:00
Ludovic Courtès
0add50ed1b
GNU GLOBAL 5.9.5.
...
svn path=/nixpkgs/trunk/; revision=27321
2011-05-30 21:48:55 +00:00
Ludovic Courtès
8bfb02d945
GNU Sharutils 4.11.1.
...
svn path=/nixpkgs/trunk/; revision=27320
2011-05-30 21:48:50 +00:00
Ludovic Courtès
71bc026ba4
GNU Parallel 20110522.
...
svn path=/nixpkgs/trunk/; revision=27319
2011-05-30 21:48:43 +00:00
Ludovic Courtès
bdc6f02ed0
GNU Parted 3.0.
...
svn path=/nixpkgs/trunk/; revision=27318
2011-05-30 21:48:37 +00:00
Ludovic Courtès
b35e60ff61
GnuTLS 2.12.5.
...
svn path=/nixpkgs/trunk/; revision=27317
2011-05-30 21:48:32 +00:00
Peter Simons
47452c351b
nbd: updated to version 2.9.22
...
svn path=/nixpkgs/trunk/; revision=27316
2011-05-30 20:08:18 +00:00
Michael Raskin
3e005d363a
Update nmap
...
svn path=/nixpkgs/trunk/; revision=27315
2011-05-30 06:25:38 +00:00
Michael Raskin
65cd495061
Adding CM-Unicode fonts
...
svn path=/nixpkgs/trunk/; revision=27311
2011-05-28 19:51:08 +00:00
Michael Raskin
da94743917
Adding Gentium font
...
svn path=/nixpkgs/trunk/; revision=27310
2011-05-28 19:01:59 +00:00
Michael Raskin
f709eff234
Add Tempora-LGC font
...
svn path=/nixpkgs/trunk/; revision=27309
2011-05-28 16:04:02 +00:00
Michael Raskin
a37fc29f81
Adding Theano font
...
svn path=/nixpkgs/trunk/; revision=27308
2011-05-28 15:59:45 +00:00
Michael Raskin
1e8b1fce5c
Adding Old Standard font
...
svn path=/nixpkgs/trunk/; revision=27307
2011-05-28 15:46:09 +00:00
Michael Raskin
9f3e6006e8
Adding Xconq turn-based strategy
...
svn path=/nixpkgs/trunk/; revision=27306
2011-05-28 15:36:56 +00:00
Michael Raskin
e0a4f988a4
Make Ekiga build
...
svn path=/nixpkgs/trunk/; revision=27305
2011-05-27 05:39:44 +00:00
Lluís Batlle i Rossell
074ef3fd85
Updating lrzip
...
svn path=/nixpkgs/trunk/; revision=27304
2011-05-25 22:19:53 +00:00
Marco Maggesi
e2b159dabe
ocaml batteries: https --> http
...
svn path=/nixpkgs/trunk/; revision=27303
2011-05-25 09:27:50 +00:00
Michael Raskin
579433500a
Update Lazarus
...
svn path=/nixpkgs/trunk/; revision=27302
2011-05-25 09:04:54 +00:00
Michael Raskin
21e9c28ce5
Update FPC
...
svn path=/nixpkgs/trunk/; revision=27301
2011-05-25 08:45:08 +00:00
Marco Maggesi
e8466deeff
ocaml batteries: fix download url
...
svn path=/nixpkgs/trunk/; revision=27300
2011-05-24 20:40:55 +00:00
Marco Maggesi
5b730d301c
Update ocaml_batteries and camomile (ocamlPackages)
...
* Add camomile 0.8.3 and 0.8.2 (for ocaml_batteries).
* Remove obsolete camomile 0.7.3 and 0.8.1.
* Update ocaml_batteries to version 1.3.0 (also add fixes for Darwin).
svn path=/nixpkgs/trunk/; revision=27299
2011-05-24 18:21:13 +00:00
Marco Maggesi
a3b617c8e3
Add platforms to OCaml 3.12.0
...
svn path=/nixpkgs/trunk/; revision=27298
2011-05-24 18:05:05 +00:00
Lluís Batlle i Rossell
c6d377eadf
Adding mainline ghostscript as an option.
...
svn path=/nixpkgs/trunk/; revision=27297
2011-05-24 15:35:38 +00:00
Lluís Batlle i Rossell
6ec672232a
Enabling most xcache settings
...
svn path=/nixpkgs/trunk/; revision=27296
2011-05-24 15:23:04 +00:00
Michael Raskin
a2579704f1
Update Libertine font
...
svn path=/nixpkgs/trunk/; revision=27295
2011-05-24 15:13:54 +00:00
Michael Raskin
1e868ce18b
Update XNeur
...
svn path=/nixpkgs/trunk/; revision=27294
2011-05-24 15:00:56 +00:00
Lluís Batlle i Rossell
5a2745ae1c
Updating fossil.
...
svn path=/nixpkgs/trunk/; revision=27293
2011-05-23 08:04:59 +00:00
Lluís Batlle i Rossell
087fc72f64
Updating google earth to what I've just downloaded.
...
svn path=/nixpkgs/trunk/; revision=27291
2011-05-21 11:22:20 +00:00
Marco Maggesi
1298fd8aba
Update hol_light and cleanup:
...
* Update hol_light to rev 90
* Remove dmtcp checkpoint (it doesn't work properly).
* General cleanup and simplification
svn path=/nixpkgs/trunk/; revision=27290
2011-05-21 11:18:35 +00:00
Marco Maggesi
6bfbe8253f
Make openssh compile on darwin by removing dependence on pam
...
svn path=/nixpkgs/trunk/; revision=27289
2011-05-21 08:24:27 +00:00
Cillian de Roiste
21dccfccc3
Updating the sha256, why is this changing?
...
svn path=/nixpkgs/trunk/; revision=27288
2011-05-21 07:31:07 +00:00
Michael Raskin
178d94606f
Remove hard-coded path to uname
...
svn path=/nixpkgs/trunk/; revision=27287
2011-05-21 05:07:53 +00:00
Michael Raskin
f2788f2837
missing hash
...
svn path=/nixpkgs/trunk/; revision=27286
2011-05-21 04:50:01 +00:00
Michael Raskin
92ad27cc88
Update veracity
...
svn path=/nixpkgs/trunk/; revision=27285
2011-05-21 04:27:40 +00:00
Lluís Batlle i Rossell
d1a44b3a8c
Making bluez install some of its test tools. Mainly, the bluez-simple-agent,
...
that can do a pincode handshake with the user.
svn path=/nixpkgs/trunk/; revision=27284
2011-05-20 22:21:34 +00:00
Marco Maggesi
3c99107e82
Fix compilation of apr-util on darwin by removing dependence on openldap
...
svn path=/nixpkgs/trunk/; revision=27283
2011-05-20 17:00:49 +00:00
Michael Raskin
186d36ca4b
Fix kernel configuration
...
svn path=/nixpkgs/trunk/; revision=27282
2011-05-20 08:37:25 +00:00
Michael Raskin
cc26b9877e
linuxPackages for 2.6.39
...
svn path=/nixpkgs/trunk/; revision=27281
2011-05-20 08:08:37 +00:00
Michael Raskin
d913275398
Update/fix MPlayer
...
svn path=/nixpkgs/trunk/; revision=27280
2011-05-20 08:06:02 +00:00
Michael Raskin
6719630316
Add Linux 2.6.39
...
svn path=/nixpkgs/trunk/; revision=27279
2011-05-19 11:17:34 +00:00
Eelco Dolstra
8310876955
* Update Flash player on i686-linux.
...
svn path=/nixpkgs/trunk/; revision=27278
2011-05-18 16:24:02 +00:00
Karn Kallio
b6acdba7fa
Update Ur/Web to latest release 2011057.
...
svn path=/nixpkgs/trunk/; revision=27276
2011-05-17 21:36:55 +00:00
Russell O'Connor
aaa09472bc
Update bitcoin to 0.3.21
...
svn path=/nixpkgs/trunk/; revision=27275
2011-05-17 11:34:18 +00:00
Andres Löh
0736b17460
Added repa library for Haskell.
...
svn path=/nixpkgs/trunk/; revision=27267
2011-05-16 13:48:03 +00:00
Michael Raskin
7dcbaadf78
Split WebKit into release expression and svn-trunk expression; WebKitGtk had a release recently, so it is not a big featurewise change
...
svn path=/nixpkgs/trunk/; revision=27259
2011-05-16 02:45:55 +00:00
Michael Raskin
b3e1663faf
Update WebKit
...
svn path=/nixpkgs/trunk/; revision=27255
2011-05-15 19:21:53 +00:00
Alexander Tsamutali
a9de562ef1
games/mars: Updated source hash.
...
svn path=/nixpkgs/trunk/; revision=27254
2011-05-15 13:31:43 +00:00
Marco Maggesi
8e5beab31f
Fix building of Isabelle2011
...
svn path=/nixpkgs/trunk/; revision=27253
2011-05-14 21:09:57 +00:00
Marco Maggesi
503f04ca54
ProofGeneral 4.0
...
svn path=/nixpkgs/trunk/; revision=27252
2011-05-14 20:59:53 +00:00
Peter Simons
bfa7c9791a
nbd: disable test suite to avoid failures on Hydra (NixOS)
...
svn path=/nixpkgs/trunk/; revision=27251
2011-05-13 18:30:36 +00:00
Marco Maggesi
bdace03143
Update PolyML to version 5.4
...
Also enable hydra build for linux
svn path=/nixpkgs/trunk/; revision=27250
2011-05-13 15:55:05 +00:00
Marco Maggesi
d2c9926e4d
os-specific/linux/blcr: Fix url and hash
...
svn path=/nixpkgs/trunk/; revision=27249
2011-05-13 15:37:13 +00:00
Sander van der Burg
e2897bdd52
Bumped versions of disnix and disnixos to deal with recent NixOS changes
...
svn path=/nixpkgs/trunk/; revision=27248
2011-05-13 13:23:13 +00:00
Eelco Dolstra
f0295b4771
* Enable JPEG and PNG support in qemu-kvm's VNC implementation.
...
svn path=/nixpkgs/trunk/; revision=27243
2011-05-13 12:10:33 +00:00
Andres Löh
22377172b2
Added logfloat. Some version bumps for Haskell pkgs.
...
svn path=/nixpkgs/trunk/; revision=27241
2011-05-13 10:14:21 +00:00
Eelco Dolstra
03055c5300
* Updated ffmpeg, faac and xvidcore.
...
* ffmpeg: enable support for faac (disabled by default because faac is
non-free).
* faac: use an external mp4v2 because the internal one doesn't build.
svn path=/nixpkgs/trunk/; revision=27240
2011-05-12 20:43:33 +00:00
Eelco Dolstra
166e5a8fbf
* Enable https support in Net::Amazon::EC2.
...
svn path=/nixpkgs/trunk/; revision=27235
2011-05-12 10:52:11 +00:00
Eelco Dolstra
2ca22bb68d
* Added Net::Amazon::EC2.
...
svn path=/nixpkgs/trunk/; revision=27234
2011-05-12 08:54:41 +00:00
Rob Vermaas
77db753065
update maven3
...
svn path=/nixpkgs/trunk/; revision=27233
2011-05-12 08:39:09 +00:00
Eelco Dolstra
f00590bbff
* Disable the python-nose check, because it fails with ‘This platform
...
lacks a functioning sem_open implementation, therefore, the required
synchronization primitives needed will not function, see issue
3770.’ However, our Python does seem to be built with the necessary
functionality. (The statement "from _multiprocessing import
SemLock" doesn't give an exception.)
svn path=/nixpkgs/trunk/; revision=27230
2011-05-11 15:03:11 +00:00
Eelco Dolstra
d5ee631b92
* libvirt: depend on libgcrypt.
...
svn path=/nixpkgs/trunk/; revision=27229
2011-05-11 15:02:53 +00:00
Eelco Dolstra
fa61d0130e
* Python decorator updated to 3.3.1. Turns out that pypi.python.org
...
doesn't contain old releases. Doh...
svn path=/nixpkgs/trunk/; revision=27228
2011-05-11 14:29:35 +00:00
Eelco Dolstra
81e561ee2e
svn path=/nixpkgs/trunk/; revision=27225
2011-05-11 13:55:50 +00:00
Eelco Dolstra
80d963dee0
* OpenSSH 5.8p2.
...
svn path=/nixpkgs/trunk/; revision=27223
2011-05-11 13:44:18 +00:00
Eelco Dolstra
95b7bc1726
* Linux 2.6.32.40.
...
svn path=/nixpkgs/trunk/; revision=27222
2011-05-11 12:56:18 +00:00
Peter Simons
faf10f25b5
nbd: enable doCheck
...
The test suite runs fine on my Linux machine, but let's wait and see what Hydra
has to say about that.
svn path=/nixpkgs/trunk/; revision=27221
2011-05-11 12:28:23 +00:00
Peter Simons
c2e197e11b
nbd: updated to 2.9.21a
...
svn path=/nixpkgs/trunk/; revision=27220
2011-05-11 12:28:18 +00:00
Eelco Dolstra
2bf7aa7040
* Remove dummy line that got committed accidentally.
...
svn path=/nixpkgs/trunk/; revision=27218
2011-05-11 11:06:57 +00:00
Florian Friesdorf
ea0bf27906
notmuch-0.6-rc4
...
svn path=/nixpkgs/trunk/; revision=27217
2011-05-11 10:33:01 +00:00
Peter Simons
455d173010
nbd: updated to 2.9.21
...
svn path=/nixpkgs/trunk/; revision=27207
2011-05-10 07:15:58 +00:00
Cillian de Roiste
1dfe9e22d4
Adding optional JACK support for mumble, this also disables ALSA and OSS because this combination is reported to be unstable
...
svn path=/nixpkgs/trunk/; revision=27206
2011-05-10 07:07:35 +00:00
Cillian de Roiste
3fb9e2214b
Replacing JACK1 with JACK2 (also jackdbus instead of jackd), this works much better for me
...
svn path=/nixpkgs/trunk/; revision=27205
2011-05-09 20:49:51 +00:00
Cillian de Roiste
e56d84e541
Alpha 2 is quite old, and they haven't tagged Alpha 3 or 4 so updating to a recent revision instead
...
svn path=/nixpkgs/trunk/; revision=27204
2011-05-09 20:27:06 +00:00
Michael Raskin
fdf6512c14
Update LyX
...
svn path=/nixpkgs/trunk/; revision=27202
2011-05-09 16:59:25 +00:00
Rob Vermaas
41fac4a3a6
added hgsvn
...
svn path=/nixpkgs/trunk/; revision=27198
2011-05-09 15:01:34 +00:00
Rob Vermaas
7a7581d220
left over commit
...
svn path=/nixpkgs/trunk/; revision=27197
2011-05-09 14:59:58 +00:00
Eelco Dolstra
36cf6ea476
* libvirt updated to 0.9.1.
...
svn path=/nixpkgs/trunk/; revision=27193
2011-05-09 09:24:18 +00:00
Lluís Batlle i Rossell
4c6c2a0684
Adding a dependency of rtmpdump that was missing for it to build.
...
svn path=/nixpkgs/trunk/; revision=27186
2011-05-08 20:18:20 +00:00
Michael Raskin
683cc5634c
Create needed symlink
...
svn path=/nixpkgs/trunk/; revision=27185
2011-05-08 18:46:55 +00:00
Michael Raskin
23bb7fa94e
Update LXC
...
svn path=/nixpkgs/trunk/; revision=27184
2011-05-08 18:40:10 +00:00
Yury G. Kudryashov
24545fd218
obexd-0.40
...
svn path=/nixpkgs/trunk/; revision=27183
2011-05-08 11:33:59 +00:00
Michael Raskin
70658f688a
Apparently, this is the correct rubberband URL
...
svn path=/nixpkgs/trunk/; revision=27182
2011-05-08 10:02:42 +00:00
Michael Raskin
bf82d3c482
Fix Merkaartor source URL
...
svn path=/nixpkgs/trunk/; revision=27181
2011-05-08 09:55:34 +00:00
Yury G. Kudryashov
7064b9f661
merkaartor: 0.17.2
...
svn path=/nixpkgs/trunk/; revision=27180
2011-05-08 09:35:37 +00:00
Yury G. Kudryashov
bfffc57cc6
rubygems: bump nix-ruby, more nix magic
...
svn path=/nixpkgs/trunk/; revision=27179
2011-05-08 09:35:31 +00:00
Karn Kallio
69822bf6c1
Racket 5.1.1 builds with latest libjpeg.
...
svn path=/nixpkgs/trunk/; revision=27178
2011-05-08 01:21:03 +00:00
Evgeny Egorochkin
f69142b396
Polipo: packaged
...
svn path=/nixpkgs/trunk/; revision=27177
2011-05-07 23:41:34 +00:00
Lluís Batlle i Rossell
34579eb0dd
Adding lingot, a guitar tuner.
...
svn path=/nixpkgs/trunk/; revision=27176
2011-05-07 17:52:57 +00:00
Lluís Batlle i Rossell
2c3bd9a12c
Updating hugin. At least it builds.
...
svn path=/nixpkgs/trunk/; revision=27175
2011-05-06 22:33:50 +00:00
Florian Friesdorf
45859265b0
gmime 2.4.24
...
svn path=/nixpkgs/trunk/; revision=27174
2011-05-06 21:49:12 +00:00
Florian Friesdorf
09dcd78f88
notmuch-0.6-rc1
...
svn path=/nixpkgs/trunk/; revision=27173
2011-05-06 21:07:48 +00:00
Peter Simons
1c6d30e2ad
wxmaxima: updated to version 11.04.0
...
svn path=/nixpkgs/trunk/; revision=27171
2011-05-06 07:35:22 +00:00
Peter Simons
b4e5853028
maxima: updated to version 5.24.0
...
svn path=/nixpkgs/trunk/; revision=27170
2011-05-06 07:35:15 +00:00
Peter Simons
9b4e1f6f53
git: updated to version 1.7.5.1
...
svn path=/nixpkgs/trunk/; revision=27169
2011-05-06 07:35:06 +00:00
Cillian de Roiste
28096838d0
Adding node.js, a javascript web development platform
...
svn path=/nixpkgs/trunk/; revision=27168
2011-05-05 22:38:04 +00:00
Cillian de Roiste
c5f0b7415f
Wrapping sonic-visualiser so that it finds libX11.so
...
svn path=/nixpkgs/trunk/; revision=27167
2011-05-05 22:01:20 +00:00
Michael Raskin
69ddd7b9f1
Remove testsuite data unless requested
...
svn path=/nixpkgs/trunk/; revision=27166
2011-05-05 16:58:21 +00:00
Peter Simons
e4033547a3
python-2.7: fix sqlite3 impurity
...
The build expression for python contains code that patches all occurrences of
impure paths like "/usr" and "/opt" out of "setup.py". The same code must be
run when building a python module, too.
svn path=/nixpkgs/trunk/; revision=27164
2011-05-05 14:41:15 +00:00
Peter Simons
f0f900f41b
pkgs/development/interpreters/python/2.7/default.nix: strip trailing whitespace
...
svn path=/nixpkgs/trunk/; revision=27163
2011-05-05 14:41:08 +00:00
Peter Simons
fa08bf65c4
python-2.7: Don't repeat the version number "2.7" in build instructions. Instead, use the variable ${majorVersion}.
...
svn path=/nixpkgs/trunk/; revision=27162
2011-05-05 14:41:02 +00:00
Peter Simons
db7c4adb80
doxygen: updated to version 1.7.4
...
svn path=/nixpkgs/trunk/; revision=27157
2011-05-05 09:43:21 +00:00
Cillian de Roiste
fb9de42ad1
Updating Sonic Visualiser, it isn't getting wrapped correctly, but otherwise it compiles and works
...
svn path=/nixpkgs/trunk/; revision=27154
2011-05-04 23:54:03 +00:00
Lluís Batlle i Rossell
e169ba953d
Updating openvpn
...
svn path=/nixpkgs/trunk/; revision=27153
2011-05-04 18:58:53 +00:00
Shea Levy
5acb2cbb1e
Fix typo in pkgs/misc/misc.nix
...
svn path=/nixpkgs/trunk/; revision=27152
2011-05-04 18:55:22 +00:00
Shea Levy
cc87dee3d8
Bump grub 1.9x to 1.99~rc2
...
svn path=/nixpkgs/trunk/; revision=27150
2011-05-04 18:27:26 +00:00
Eelco Dolstra
a423840c66
* Use a working version of Tribler.
...
svn path=/nixpkgs/trunk/; revision=27148
2011-05-04 14:59:17 +00:00
Eelco Dolstra
36b8f37e0f
* Blueman: propagate obex-data-server to the user environment so that
...
dbus can find its service file.
svn path=/nixpkgs/trunk/; revision=27146
2011-05-04 14:10:17 +00:00
Eelco Dolstra
ae4ea00df0
* obex-data-server updated to 0.4.6.
...
svn path=/nixpkgs/trunk/; revision=27145
2011-05-04 14:09:44 +00:00
Peter Simons
e88567a0db
git-annex: added missing dataenc dependency
...
svn path=/nixpkgs/trunk/; revision=27144
2011-05-04 13:21:26 +00:00
Eelco Dolstra
d5d5aa6801
* Fix nix-env evaluation errors on non-Linux platforms.
...
svn path=/nixpkgs/trunk/; revision=27143
2011-05-04 12:52:46 +00:00
Eelco Dolstra
b61d3ab317
* Typo in attribute. This broke --meta --xml evaluation.
...
svn path=/nixpkgs/trunk/; revision=27142
2011-05-04 12:45:05 +00:00
Eelco Dolstra
b1e93d013c
* Get rid of those annoying "not an attrSet" trace messages.
...
svn path=/nixpkgs/trunk/; revision=27141
2011-05-04 12:43:31 +00:00
Rob Vermaas
2881931569
forgot to commit
...
svn path=/nixpkgs/trunk/; revision=27139
2011-05-04 12:25:52 +00:00
Eelco Dolstra
92bf0b92d3
* Provide "null" defaults for the optional dependencies, otherwise
...
binutilsCross gives an evaluation error.
svn path=/nixpkgs/trunk/; revision=27138
2011-05-04 12:22:56 +00:00
Rob Vermaas
2ff77d4134
fixed hash
...
svn path=/nixpkgs/trunk/; revision=27137
2011-05-04 10:14:02 +00:00
Rob Vermaas
c34fdd226e
oops, wrote git2svn in stead of svn2git
...
svn path=/nixpkgs/trunk/; revision=27136
2011-05-04 10:11:30 +00:00
Rob Vermaas
02b871de50
add svn2git
...
svn path=/nixpkgs/trunk/; revision=27135
2011-05-04 10:07:56 +00:00
Rob Vermaas
565c215340
add some versions of cppunit/boost/protobuf, added binutils with gold, added nlopt
...
svn path=/nixpkgs/trunk/; revision=27134
2011-05-04 10:04:26 +00:00
Rob Vermaas
1625c212d1
add some versions of cppunit/boost/protobuf, added binutils with gold, added nlopt
...
svn path=/nixpkgs/trunk/; revision=27133
2011-05-04 10:04:03 +00:00
Rob Vermaas
8f7cab5d5c
add some versions of cppunit/boost/protobuf, added binutils with gold, added nlopt
...
svn path=/nixpkgs/trunk/; revision=27132
2011-05-04 10:03:46 +00:00
Peter Simons
59dae8edf4
git-annex: added missing SHA dependency
...
svn path=/nixpkgs/trunk/; revision=27131
2011-05-04 09:45:22 +00:00
Peter Simons
fb10d3399d
git-annex: updated to version 0.20110427
...
The most current one is 0.20110503, but the corresponding tarball isn't
available for download yet.
svn path=/nixpkgs/trunk/; revision=27130
2011-05-04 09:26:45 +00:00
Eelco Dolstra
7a62283c46
svn path=/nixpkgs/trunk/; revision=27128
2011-05-04 08:55:30 +00:00
Eelco Dolstra
345b9a75d5
* Move wxPython into python-packages.nix so that you can get wxPython
...
built for the appropriate Python version
(e.g. python26Packages.wxPython).
svn path=/nixpkgs/trunk/; revision=27127
2011-05-04 08:41:50 +00:00
Eelco Dolstra
9afa230dfc
* Added Tribler. Doesn't quite work yet.
...
svn path=/nixpkgs/trunk/; revision=27124
2011-05-03 17:12:31 +00:00
Eelco Dolstra
89e94123c6
* Move ktorrent to pkgs/applications/networking/p2p/.
...
svn path=/nixpkgs/trunk/; revision=27123
2011-05-03 16:59:24 +00:00
Eelco Dolstra
a7d4f19ab3
* wxPython updated to 2.8.12.0.
...
* wxPython builder: wrap the Python programs (such as pyshell) so that
they actually work.
svn path=/nixpkgs/trunk/; revision=27122
2011-05-03 16:57:18 +00:00
Eelco Dolstra
5c244c345d
* wxGTK updated to 2.8.12.
...
svn path=/nixpkgs/trunk/; revision=27119
2011-05-03 16:01:19 +00:00
Eelco Dolstra
178cac1447
svn path=/nixpkgs/trunk/; revision=27118
2011-05-03 15:44:13 +00:00
Eelco Dolstra
c0e0704163
* Added apsw, Another Python SQLite Wrapper.
...
svn path=/nixpkgs/trunk/; revision=27117
2011-05-03 15:43:51 +00:00
Eelco Dolstra
c2c9b1d011
* SQLite updated to 3.7.6.2. Also enabled the SECURE_DELETE feature
...
(required by Firefox).
svn path=/nixpkgs/trunk/; revision=27116
2011-05-03 15:43:08 +00:00
Lluís Batlle i Rossell
590bf722b4
Adding readline to php, so now 'php -a' works nicely with readline.
...
svn path=/nixpkgs/trunk/; revision=27110
2011-05-03 08:25:45 +00:00
Michael Raskin
26da7d3871
Adding Kona: a K interpreter
...
svn path=/nixpkgs/trunk/; revision=27098
2011-05-03 06:58:01 +00:00
Lluís Batlle i Rossell
db287c1b38
Updating rrdtool.
...
svn path=/nixpkgs/trunk/; revision=27096
2011-05-02 17:03:05 +00:00
Eelco Dolstra
aa5646ff3b
* For some reason Samba insists on setting the g+w bit on newly
...
created directories, which is a security risk. So create $out with
the proper permissions before starting the VM.
svn path=/nixpkgs/trunk/; revision=27095
2011-05-02 14:55:16 +00:00
Eelco Dolstra
077fd0a77c
* Firefox updated to 4.0.1. Dropped the libvpx dependency because it
...
was ignored anyway. With the --with-system-libvpx flag, the build
barfs with:
checking for vpx/vpx_decoder.h... yes
configure: error: vpx/vpx_decoder.h found, but is not in /usr/include
svn path=/nixpkgs/trunk/; revision=27089
2011-05-02 11:53:11 +00:00
Michael Raskin
3827d28f27
Update nixCustom for all the dependencies of latest SVN Nix
...
svn path=/nixpkgs/trunk/; revision=27084
2011-05-02 08:29:01 +00:00
Lluís Batlle i Rossell
f28be20395
Updating samba.
...
svn path=/nixpkgs/trunk/; revision=27082
2011-05-02 07:25:29 +00:00
Alexander Tsamutali
4fc6fa03c5
games/warsow: Updated to 0.62.
...
svn path=/nixpkgs/trunk/; revision=27078
2011-05-01 23:26:51 +00:00
Lluís Batlle i Rossell
f793bd3683
Updating offrss
...
svn path=/nixpkgs/trunk/; revision=27076
2011-05-01 19:57:31 +00:00
Cillian de Roiste
39f80594b1
Adding Ardour3 alpha2, a digital audio workstation
...
svn path=/nixpkgs/trunk/; revision=27075
2011-05-01 14:45:52 +00:00
Cillian de Roiste
8135f030f0
Adding libgnomecanvasmm, a dependency for Ardour3
...
svn path=/nixpkgs/trunk/; revision=27074
2011-05-01 13:45:46 +00:00
Michael Raskin
9926941bf2
Fixing forgotten hash for Wine update
...
svn path=/nixpkgs/trunk/; revision=27065
2011-04-30 19:42:48 +00:00
Michael Raskin
fbe2f38d98
Update WebKit
...
svn path=/nixpkgs/trunk/; revision=27064
2011-04-30 17:02:59 +00:00
Michael Raskin
bb809bb2c3
Update Wine
...
svn path=/nixpkgs/trunk/; revision=27063
2011-04-30 16:32:53 +00:00
Karn Kallio
b3a57308b5
Advance Racket to version 5.1.1 (latest release).
...
svn path=/nixpkgs/trunk/; revision=27062
2011-04-30 16:31:19 +00:00
Eelco Dolstra
173ac4457e
* Doh, forgot to commit.
...
svn path=/nixpkgs/trunk/; revision=27059
2011-04-30 09:21:38 +00:00
Eelco Dolstra
2f34f27f8a
* w3m updated to 0.5.3.
...
svn path=/nixpkgs/trunk/; revision=27058
2011-04-30 09:20:59 +00:00
Lluís Batlle i Rossell
18620ef05b
php xcache wanted m4. Otherwise it built a wrong shared object (missing symbols).
...
svn path=/nixpkgs/trunk/; revision=27057
2011-04-29 21:38:32 +00:00
Lluís Batlle i Rossell
5bd133b65c
Updating php 5.3 and adding php-xcache.
...
svn path=/nixpkgs/trunk/; revision=27056
2011-04-29 21:01:09 +00:00
Lluís Batlle i Rossell
50f03dbf20
Telling hydra to build the recent k3b.
...
svn path=/nixpkgs/trunk/; revision=27055
2011-04-29 18:25:46 +00:00
Lluís Batlle i Rossell
a6518956f9
Attempt to fix the vsftpd build on i686-linux
...
svn path=/nixpkgs/trunk/; revision=27054
2011-04-29 18:18:56 +00:00
Ludovic Courtès
270ea3beec
Elinks: Fix libgc initialization.
...
svn path=/nixpkgs/trunk/; revision=27046
2011-04-28 21:22:24 +00:00
Ludovic Courtès
163c51f299
GNU mtools 4.0.16.
...
svn path=/nixpkgs/trunk/; revision=27045
2011-04-28 20:58:27 +00:00
Ludovic Courtès
159fead4c5
GNU Parallel 20110422.
...
svn path=/nixpkgs/trunk/; revision=27044
2011-04-28 20:58:20 +00:00
Ludovic Courtès
dc4df7b3b4
GNU Xorriso 1.0.8.
...
svn path=/nixpkgs/trunk/; revision=27043
2011-04-28 20:58:15 +00:00
Ludovic Courtès
f5041e03d9
GNU FreeIPMI 1.0.4.
...
svn path=/nixpkgs/trunk/; revision=27042
2011-04-28 20:58:10 +00:00
Ludovic Courtès
67280cf5bb
GNU libidn 1.21.
...
svn path=/nixpkgs/trunk/; revision=27041
2011-04-28 20:58:05 +00:00
Ludovic Courtès
f138600ac9
GNU uCommon C++ 4.3.2.
...
svn path=/nixpkgs/trunk/; revision=27040
2011-04-28 20:58:00 +00:00
Ludovic Courtès
f50b358f37
GnuTLS 2.12.3.
...
svn path=/nixpkgs/trunk/; revision=27039
2011-04-28 20:57:54 +00:00
Ludovic Courtès
457a6eeef6
GNU Guile 2.0.1.
...
svn path=/nixpkgs/trunk/; revision=27038
2011-04-28 20:57:48 +00:00
Lluís Batlle i Rossell
c259379dc9
Getting mars to build. Somehow the fetchsvn in sfml_svn did not work anymore.
...
svn path=/nixpkgs/trunk/; revision=27037
2011-04-28 20:50:12 +00:00
Cillian de Roiste
300456b2c8
Updating the revision to get a working download url
...
svn path=/nixpkgs/trunk/; revision=27031
2011-04-28 13:12:26 +00:00
Lluís Batlle i Rossell
bebcbcde8c
Adding the videogame Naev (beta version, because they label the non-beta 'deprecated')
...
svn path=/nixpkgs/trunk/; revision=27017
2011-04-27 21:57:27 +00:00
Lluís Batlle i Rossell
d3dbf1bea4
Update mars.
...
svn path=/nixpkgs/trunk/; revision=27016
2011-04-27 21:23:14 +00:00
Shea Levy
ab8ccf9fc3
Bump *sphinx* to 0.7
...
svn path=/nixpkgs/trunk/; revision=27015
2011-04-27 21:15:42 +00:00
Nicolas Pierron
02677481ae
modules (moduleClosure): use imap instead of map to produce uniq keys for
...
the genericClosure.
svn path=/nixpkgs/trunk/; revision=27014
2011-04-27 18:41:37 +00:00
Nicolas Pierron
85d3fd3e3c
lists: Add imap function to iterate over a list with the index of each
...
element.
svn path=/nixpkgs/trunk/; revision=27013
2011-04-27 18:41:34 +00:00
Nicolas Pierron
781770eaa9
fix zipListsWith function: use it-self for the recursion.
...
svn path=/nixpkgs/trunk/; revision=27012
2011-04-27 18:41:31 +00:00
Nicolas Pierron
3770ac23aa
Fix type name of attribute sets.
...
svn path=/nixpkgs/trunk/; revision=27011
2011-04-27 18:41:27 +00:00
Florian Friesdorf
6680e9f30b
xapian: fixed version: GPL -> GPLv2+ - thanks Ludo’
...
svn path=/nixpkgs/trunk/; revision=26988
2011-04-27 12:49:55 +00:00
Ludovic Courtès
0387298eaa
hwloc 1.2.
...
svn path=/nixpkgs/trunk/; revision=26986
2011-04-27 09:51:11 +00:00
Eelco Dolstra
a8a7677d54
* NVIDIA driver updated to 270.41.06.
...
svn path=/nixpkgs/trunk/; revision=26985
2011-04-27 08:17:28 +00:00
Florian Friesdorf
a8c3649dd4
fetchgit builder rewrite to handle more cases
...
The old builder failed for:
- remote HEAD != master
- local repositories
svn path=/nixpkgs/trunk/; revision=26984
2011-04-27 03:00:47 +00:00
Florian Friesdorf
ead24cacdf
notmuch: -inheritable-tags-hack +atomic-new
...
svn path=/nixpkgs/trunk/; revision=26983
2011-04-27 02:54:57 +00:00
Florian Friesdorf
805a6f0713
notmuch: rebased and merged feature branches on current master
...
https://github.com/chaoflow/notmuch/commits/cfl8
svn path=/nixpkgs/trunk/; revision=26981
2011-04-26 20:57:21 +00:00
Florian Friesdorf
3fb9e4da74
xapian and xapianBindings 1.2.5
...
svn path=/nixpkgs/trunk/; revision=26980
2011-04-26 20:57:16 +00:00
Florian Friesdorf
1e3d07eeea
renamed current xapian/xapianBindings to xapian10/xapianBindings10
...
svn path=/nixpkgs/trunk/; revision=26979
2011-04-26 20:57:11 +00:00
Florian Friesdorf
db215a1d94
xapian: gplv2 -> gpl (according to homepage), added myself as maintainer
...
svn path=/nixpkgs/trunk/; revision=26978
2011-04-26 20:57:04 +00:00
Michael Raskin
8665736894
Update WebKit
...
svn path=/nixpkgs/trunk/; revision=26977
2011-04-26 07:15:50 +00:00
Lluís Batlle i Rossell
68cb3535e1
Making openssh cross-build. And making linux-pam almost cross-build, I think.
...
This allows me to put sftp-server in the nanonote and use it through dropbear.
svn path=/nixpkgs/trunk/; revision=26971
2011-04-25 15:41:32 +00:00
Lluís Batlle i Rossell
06c5e48804
Now yes allowing the sftp server path in dropbear. I commit too early, clearly.
...
svn path=/nixpkgs/trunk/; revision=26970
2011-04-25 15:04:56 +00:00
Lluís Batlle i Rossell
a5923a2e13
Allow overriding the sftp server path.
...
svn path=/nixpkgs/trunk/; revision=26969
2011-04-25 15:03:13 +00:00
Lluís Batlle i Rossell
43c4e65c66
Now I patch dropbear properly for it to inherit the PATH.
...
svn path=/nixpkgs/trunk/; revision=26968
2011-04-25 14:57:46 +00:00
Lluís Batlle i Rossell
e1a78aa1a0
Making dropbear sessions inherit the PATH
...
svn path=/nixpkgs/trunk/; revision=26967
2011-04-25 14:40:10 +00:00
Lluís Batlle i Rossell
d7325f69dd
Updating linux 2.6.37
...
svn path=/nixpkgs/trunk/; revision=26966
2011-04-25 13:33:28 +00:00
Lluís Batlle i Rossell
89d42f7b57
Now yes, I commit properly the xbursttools update. Not to the master HEAD, as
...
it fails to build. But to the lastest version I manage to build.
svn path=/nixpkgs/trunk/; revision=26965
2011-04-25 13:24:51 +00:00
Lluís Batlle i Rossell
3642e1a505
Updating xburst-tools to a recent version, that should not have the bug about
...
overwriting nand blocks beyond the pages specified.
svn path=/nixpkgs/trunk/; revision=26964
2011-04-25 13:10:35 +00:00
Lluís Batlle i Rossell
6fa4ceded6
Updating vlc
...
svn path=/nixpkgs/trunk/; revision=26963
2011-04-25 10:53:07 +00:00
Cillian de Roiste
5ca8e8041f
fixing the url
...
svn path=/nixpkgs/trunk/; revision=26962
2011-04-25 09:16:12 +00:00
Cillian de Roiste
5b1d2d96e2
Adding support for rubberband, (audio time stretching)
...
svn path=/nixpkgs/trunk/; revision=26961
2011-04-25 08:54:58 +00:00
Lluís Batlle i Rossell
05fae54809
Fixing the minidjvu installation
...
svn path=/nixpkgs/trunk/; revision=26959
2011-04-24 20:13:14 +00:00
Cillian de Roiste
df82318501
Updating Vamp-sdk and rubberband
...
svn path=/nixpkgs/trunk/; revision=26958
2011-04-24 20:10:49 +00:00
Lluís Batlle i Rossell
11c0e3976e
Adding minidjvu
...
svn path=/nixpkgs/trunk/; revision=26957
2011-04-24 20:10:43 +00:00
Lluís Batlle i Rossell
9a0a0c92c7
Adding training results files for some languages to tesseract to be able to do OCR directly.
...
svn path=/nixpkgs/trunk/; revision=26956
2011-04-24 20:01:19 +00:00
Cillian de Roiste
47c44f9315
Adding Rakarrack: guitar effects-pedal emulator
...
svn path=/nixpkgs/trunk/; revision=26955
2011-04-24 19:44:36 +00:00
Lluís Batlle i Rossell
bc88f37fcb
Adding the leptonica library of image processing and analysis.
...
svn path=/nixpkgs/trunk/; revision=26954
2011-04-24 18:16:51 +00:00
Lluís Batlle i Rossell
01cdfd58fc
Removing a vorbis tools patch not used anymore.
...
I can't say if it is required, though. As vorbistools built, I took it out.
svn path=/nixpkgs/trunk/; revision=26953
2011-04-24 18:05:21 +00:00
Lluís Batlle i Rossell
626f654602
Adding tesseract, an OCR engine I just found but never tried.
...
svn path=/nixpkgs/trunk/; revision=26952
2011-04-24 18:04:07 +00:00
Cillian de Roiste
3ae0255bbd
Adding Qtractor, an Audio/MIDI multi-track sequencer
...
svn path=/nixpkgs/trunk/; revision=26949
2011-04-24 14:32:55 +00:00
Michael Raskin
bca9330f6d
Update Audacity
...
svn path=/nixpkgs/trunk/; revision=26948
2011-04-24 13:13:57 +00:00
Lluís Batlle i Rossell
8c115162c4
Updating the nanonote kernel 2.6.36, because I was hitting a bug about stack shrinking:
...
https://bugzilla.redhat.com/show_bug.cgi?id=643426
No problem in 2.6.36.3.
svn path=/nixpkgs/trunk/; revision=26947
2011-04-24 12:33:23 +00:00
Alexander Tsamutali
617b1fc62e
games/warsow: Updated to 0.61.
...
svn path=/nixpkgs/trunk/; revision=26946
2011-04-24 12:09:33 +00:00
Lluís Batlle i Rossell
7bfeee2318
MPlayer does not depend on a *built* ffmpeg.
...
svn path=/nixpkgs/trunk/; revision=26944
2011-04-23 23:04:22 +00:00
Lluís Batlle i Rossell
7cc0eee61d
Updating some xiph.org libraries, and making some cross-compile.
...
svn path=/nixpkgs/trunk/; revision=26943
2011-04-23 21:58:30 +00:00
Ludovic Courtès
6300c72a20
Add GNU Pies.
...
svn path=/nixpkgs/trunk/; revision=26942
2011-04-23 21:15:11 +00:00
Ludovic Courtès
7f0b84c2a9
Guile-Cairo 1.4.1.
...
svn path=/nixpkgs/trunk/; revision=26941
2011-04-23 21:15:06 +00:00
Ludovic Courtès
6ad4724656
Guile-Lib 0.2.1.
...
svn path=/nixpkgs/trunk/; revision=26940
2011-04-23 21:15:01 +00:00
Lluís Batlle i Rossell
b2e493a858
Updating MPlayer to the snapshot of today.
...
I unpack ffmpeg.src where mplayer wants, taking 'ffmpeg' in the function arguments. Maybe it is not
very nice.
I've not checked if the rest of dependencies are needed either.
And someone should store the snapshot somewhere more permanent.
svn path=/nixpkgs/trunk/; revision=26939
2011-04-23 21:06:39 +00:00
Lluís Batlle i Rossell
3b0ea0e5d4
Updating ffmpeg and libvpx.
...
svn path=/nixpkgs/trunk/; revision=26938
2011-04-23 20:58:52 +00:00
Lluís Batlle i Rossell
1a83a07123
Updating pv
...
svn path=/nixpkgs/trunk/; revision=26937
2011-04-23 20:58:15 +00:00
Cillian de Roiste
0d09cc4348
Adding Yoshimi, a fork of ZynAddSubFX (audio synthesizer) with many enhancements including jack support
...
svn path=/nixpkgs/trunk/; revision=26935
2011-04-23 13:54:25 +00:00
Cillian de Roiste
59f16bc779
Fixing the url for jack
...
svn path=/nixpkgs/trunk/; revision=26934
2011-04-23 13:16:33 +00:00
Michael Raskin
18f74fcada
Fix Widelands meta
...
svn path=/nixpkgs/trunk/; revision=26933
2011-04-23 13:00:38 +00:00
Cillian de Roiste
55bbbbaf84
Updating jack to version 0.120.1 (some newer applications e.g. Yoshimi require a more recent version)
...
svn path=/nixpkgs/trunk/; revision=26932
2011-04-23 12:50:03 +00:00
Russell O'Connor
af59636bf5
adding ecm support to msieve.
...
svn path=/nixpkgs/trunk/; revision=26931
2011-04-23 12:36:36 +00:00
Russell O'Connor
699261d8df
Adding ecm-6.2.3.
...
svn path=/nixpkgs/trunk/; revision=26930
2011-04-23 12:25:51 +00:00
Michael Raskin
eaad654e4a
Update Linux kernel version
...
svn path=/nixpkgs/trunk/; revision=26929
2011-04-23 07:10:08 +00:00
Yury G. Kudryashov
0bfc84b0aa
Cross-compile zlib for Windows
...
svn path=/nixpkgs/trunk/; revision=26928
2011-04-23 06:59:04 +00:00
Yury G. Kudryashov
9d87a3059d
vsftpd-2.3.4, make ssl optional, do not hardcode userlist
...
svn path=/nixpkgs/trunk/; revision=26927
2011-04-23 06:58:57 +00:00
Cillian de Roiste
b3e902c1a9
Adding lash, session management system for GNU/Linux audio applications
...
svn path=/nixpkgs/trunk/; revision=26926
2011-04-23 00:22:40 +00:00
Cillian de Roiste
3cfe938b0e
Adding lmms: Linux MultiMedia Studio
...
svn path=/nixpkgs/trunk/; revision=26925
2011-04-22 23:00:55 +00:00
Cillian de Roiste
b150276393
Adding seq24: a minimal loop based midi sequencer
...
svn path=/nixpkgs/trunk/; revision=26924
2011-04-22 22:07:59 +00:00
Cillian de Roiste
eb9ed1c09f
Adding Specimen, an audio sampler and phat gtk+ widgets which Specimen uses
...
svn path=/nixpkgs/trunk/; revision=26923
2011-04-22 21:42:38 +00:00
Shea Levy
30701417c8
Bump libgweather to 2.30.3
...
svn path=/nixpkgs/trunk/; revision=26922
2011-04-22 17:30:39 +00:00
Shea Levy
ad67aa4549
Bump gtkhtml to 3.32.2
...
svn path=/nixpkgs/trunk/; revision=26921
2011-04-22 17:08:02 +00:00
Michael Raskin
c9421ad0b2
Adding Glest Advanced Engine into all-packages
...
svn path=/nixpkgs/trunk/; revision=26920
2011-04-22 10:26:45 +00:00
Cillian de Roiste
3d3efea4f1
Adding vkeybd, a virtual midi keyboard
...
svn path=/nixpkgs/trunk/; revision=26919
2011-04-22 09:39:48 +00:00
Cillian de Roiste
198f3407a3
Including the rest of the lib files too, now it works
...
svn path=/nixpkgs/trunk/; revision=26918
2011-04-22 08:15:10 +00:00
Michael Raskin
eae5098af9
Adding Glest Advanced Engine 3D RTS
...
svn path=/nixpkgs/trunk/; revision=26917
2011-04-22 07:26:59 +00:00
Marco Maggesi
a041cad70a
Update HOL Light to r89
...
svn path=/nixpkgs/trunk/; revision=26916
2011-04-21 14:39:29 +00:00
Russell O'Connor
3db6f63711
Package for msieve.
...
This would be better if gmp-emc were packaged as well.
svn path=/nixpkgs/trunk/; revision=26915
2011-04-21 12:48:07 +00:00
Cillian de Roiste
4841599814
Fixing the mirror url
...
svn path=/nixpkgs/trunk/; revision=26914
2011-04-21 07:59:46 +00:00
Lluís Batlle i Rossell
ee8b05eb70
Adding 'wakelan', to use UDP wake on lan on ethernet.
...
svn path=/nixpkgs/trunk/; revision=26912
2011-04-20 20:55:46 +00:00
Cillian de Roiste
815c121458
Also need to copy over the lib
...
svn path=/nixpkgs/trunk/; revision=26911
2011-04-20 17:27:24 +00:00
Cillian de Roiste
6952d2a0e9
Bugfix: invalid values in meta
...
svn path=/nixpkgs/trunk/; revision=26910
2011-04-20 16:52:04 +00:00
Cillian de Roiste
53a135625a
Adding XSynth-DSSI, a classic analog style software synthesizer
...
svn path=/nixpkgs/trunk/; revision=26909
2011-04-20 16:31:41 +00:00
Lluís Batlle i Rossell
b8f6681dbd
Updating meld
...
svn path=/nixpkgs/trunk/; revision=26905
2011-04-20 14:04:54 +00:00
Russell O'Connor
9a74c2b3b5
Bitcoin now builds on 64-bit linux.
...
svn path=/nixpkgs/trunk/; revision=26904
2011-04-20 13:52:02 +00:00
Michael Raskin
b4faf64bae
Update Isabelle to an existing tarball...
...
svn path=/nixpkgs/trunk/; revision=26903
2011-04-20 12:24:34 +00:00
Eelco Dolstra
73dbdbd1d7
* Linux 2.6.32.38.
...
svn path=/nixpkgs/trunk/; revision=26900
2011-04-20 09:30:46 +00:00
Evgeny Egorochkin
8db68032a6
Tor: version bump
...
svn path=/nixpkgs/trunk/; revision=26899
2011-04-20 09:25:50 +00:00
Michael Raskin
db48255b5e
Using patch from Globulation2 bugtracker to fix crashes in tutorial
...
svn path=/nixpkgs/trunk/; revision=26897
2011-04-20 07:06:17 +00:00