Commit Graph

960 Commits

Author SHA1 Message Date
aszlig
d4c56cef43
mysql55: Update to version 5.5.28.
The current build fails because the URL at inria.fr is no longer accessible. And
5.5.23 is quite old, so let's update it.

With this update we also provide three URLs to fetchurl, just to make sure that
we have enough sources, should one URL become inaccessible again.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-04 08:35:02 +02:00
Eelco Dolstra
31f89ba349 Merge remote-tracking branch 'origin/master' into x-updates 2012-10-03 14:43:10 -04:00
Eelco Dolstra
9bc8e1250b xinetd: Update to 2.3.15
Fixes CVE-2012-0862.
2012-10-02 11:52:37 -04:00
Eelco Dolstra
3cf0b00b5a bind: Update to 9.7.6-P3
Fixes CVE-2012-4244.
2012-10-02 11:48:54 -04:00
Eelco Dolstra
f75dddde80 apache-httpd: Update to 2.2.23
Fixes CVE-2012-0883, CVE-2012-2687.
2012-10-02 11:45:54 -04:00
Eelco Dolstra
b78256fbd7 Merge remote-tracking branch 'origin/master' into x-updates 2012-10-01 11:43:43 -04:00
Eelco Dolstra
281fa6f85a Revert "xorg-server: Boldly update to 1.13.0"
This reverts commit 2f2426a02f89458451de0570ee6f0bf1442a3619.

xf86-video-intel requires a newer version of libdrm, which in turn
breaks mesa.  So stick to 1.12.4 until this gets sorted out.
2012-09-28 17:44:38 -04:00
Eelco Dolstra
1b807c2acd xorg-server: Boldly update to 1.13.0 2012-09-28 17:44:38 -04:00
Eelco Dolstra
4a6a87eedc Fix builds depending on libXft 2012-09-27 12:38:48 -04:00
Peter Simons
dfaab992c2 spamassassin: enable more plugins and provide gpg for sa-update 2012-09-27 15:29:01 +02:00
Peter Simons
74c0850efd spamassassin: site-wide rules are in $out/share/spamassassin; user-rules in /etc/spamassassin 2012-09-27 15:28:14 +02:00
Peter Simons
a596022d80 apache-httpd: update to version 2.4.3 2012-09-27 13:46:50 +02:00
Lluís Batlle i Rossell
27bd526654 freeswitch: updating to stable 1.2.3
I'll avoid using the git version; I'm less sure if it's better than the
released stable.
2012-09-26 22:55:56 +02:00
Eelco Dolstra
2fed9dfbc5 Some X.org updates (include xorg-server to 1.12.4) 2012-09-26 16:11:26 -04:00
Eelco Dolstra
d5758c99a3 Merge remote-tracking branch 'origin/master' into x-updates
Conflicts:
	pkgs/misc/maven/maven-1.0.nix
	pkgs/os-specific/linux/xf86-input-wacom/default.nix
2012-09-26 14:51:51 -04:00
Peter Simons
f2b6eee34e dovecot: cosmetic 2012-09-25 12:51:41 +02:00
Michael Raskin
def0189ccd Add support for authentication via user list in MySQL to restund 2012-09-25 10:47:00 +04:00
Michael Raskin
1527b10016 Adding restund 2012-09-25 10:34:45 +04:00
Peter Simons
f1bfc3055d dovecot: drop obsolete versions 1.0.3 and 1.1.1 2012-09-24 10:03:10 -04:00
Peter Simons
4f099c9880 popa3d: enable standalone mode 2012-09-19 01:38:07 +02:00
Peter Simons
d23aef5432 popa3d: customize for use on NixOS 2012-09-19 01:27:00 +02:00
Peter Simons
7ba33d813e popa3d: add version 1.0.2 2012-09-19 01:16:01 +02:00
Eelco Dolstra
f590586775 xorg-server: Enable the SECURITY extension
This allows "ssh -X" to do the right thing.
2012-09-18 17:10:36 -04:00
Peter Simons
aa2d8d1e02 dovecot: rename file for version 1.0.3 to improve consistency 2012-09-18 15:08:28 +02:00
Mathijs Kwik
ad628ab557 mongodb: fix build on i686, restrict platforms to linux
mongodb is supposed to work on most unixes but its build system is
quite picky and fragile.
As it hasn't worked for non-linux platforms on NixOS yet, this change
won't affect anyone and will remove the illusion that other platforms
are currently supported.
2012-09-09 17:25:59 +02:00
Mathijs Kwik
071d685dda mongodb: upgrade to 2.2.0 2012-09-09 13:04:14 +02:00
Lluís Batlle i Rossell
449230335d sipwitch: update to 1.2.4 2012-09-04 09:59:26 +02:00
Peter Simons
d7470b6c68 postfix: update to version 2.8.12 2012-08-28 15:18:17 +02:00
Peter Simons
85350ca2d4 postfix: clean-up install phase
Passing install_root=$out isn't a good idea because the install script is going
to pre-pend that prefix to all other paths even though these have the $out
prefix already. The resulting installation is a mess. Instead, we use the
"fake" install prefix "out" and then move all files and directories into the
right place afterward.
2012-08-28 15:17:06 +02:00
Peter Simons
40fe2d03b5 postfix: re-use $name in src URL 2012-08-28 15:14:59 +02:00
Peter Simons
919b357255 postfix: add meta section 2012-08-28 15:14:59 +02:00
Peter Simons
b920bd538a postfix: strip trailing whitespace 2012-08-28 15:14:59 +02:00
Eelco Dolstra
bc8b1376da postgresql-jdbc: Update to 9.1-902 2012-08-27 14:02:39 -04:00
Eelco Dolstra
606e6acd6f postgresql: Update to latest versions
Fixes CVE-2012-3488, CVE-2012-3489.
2012-08-21 08:42:44 -04:00
Eelco Dolstra
b8be9b54f3 samba: Update to 3.6.7 2012-08-17 16:09:13 -04:00
Peter Simons
a143bb79e2 spamassassin: disable taint mode, without it we cannot configure the PERL5LIB search path 2012-08-03 13:21:29 +02:00
Rob Vermaas
eb29e0449b Add mod_evasive 2012-07-31 15:51:31 +02:00
Rickard Nilsson
bb2cff55ae dovecot_2: Enable LDAP support. 2012-07-30 18:58:54 +02:00
Shea Levy
912440dae8 dovecot2: Bump to 2.1.8 2012-07-24 18:34:19 -04:00
Shea Levy
5315a0bb6d xf86-input-keyboard: Needs pixman 2012-07-15 22:56:49 -04:00
Shea Levy
27339f2ad8 xf86-input-mouse: Needs pixman 2012-07-15 22:55:12 -04:00
Shea Levy
4f01e68ff8 xf86-input-synaptics: Needs mtdev and pixman 2012-07-15 22:53:43 -04:00
Shea Levy
d382822803 xf86-video-ati: Needs pixman 2012-07-15 22:48:28 -04:00
Shea Levy
ccceaba50a xf86-video-cirrus: Needs pixman 2012-07-15 22:47:27 -04:00
Shea Levy
08e7a18a2c xf86-video-nv: Needs pixman 2012-07-15 22:45:57 -04:00
Shea Levy
c95e6d5dc4 xf86-video-vesa: Need pixman 2012-07-15 22:44:11 -04:00
Shea Levy
a55bcacbe2 xorg-video-unichrome: Update git url, fix build with new xorg 2012-07-15 22:40:52 -04:00
Shea Levy
f0b7c9813b xorg.ev: Needs libXrender 2012-07-15 03:36:48 -04:00
Shea Levy
65ac9694c7 xorg: evdev and fbdev need pixman 2012-07-14 16:26:22 -04:00
Shea Levy
fdf6f17a1b x11: Some fonts need mkfontscale
There may be others, these are just the ones that needed it for my configuration to build
2012-07-14 16:16:31 -04:00
Shea Levy
d6d6b623c9 xorgserver: Update xkbcomp-path patch
_XkbDupString was migrated to Xstrdup
2012-07-14 15:13:08 -04:00
Shea Levy
13c5b75b80 xorgserver: Add needed deps 2012-07-14 15:07:36 -04:00
Shea Levy
bb469d5e25 xorgserver: Update dir path patch 2012-07-14 15:03:36 -04:00
Shea Levy
71e0a3fb93 x.org: Update to 7.7 2012-07-14 14:33:58 -04:00
Shea Levy
c514ee974a Merge remote-tracking branch 'upstream/master' into x-updates
mountall conflict was trivial

Conflicts:
	pkgs/os-specific/linux/mountall/default.nix
2012-07-14 14:24:27 -04:00
Eelco Dolstra
b00c839f4b Add ElasticMQ, a message queue service 2012-07-09 15:26:07 -04:00
Peter Simons
9c5f897465 SpamAssassin: add version 3.3.2 2012-07-08 00:32:37 +02:00
Peter Simons
b98782f339 apache-httpd-2.4: build MPMs as DSOs so that the desired one can be selected at run-time 2012-07-07 09:09:05 +02:00
Peter Simons
32449b5ae6 apache-httpd-2.4: replace use of tabs with blanks 2012-07-07 08:57:53 +02:00
Peter Simons
ea1d479afb apache-httpd-2.4: ensure that libgcc_s can be found at run-time 2012-07-07 08:57:28 +02:00
Peter Simons
c870b80512 apache: add version 2.4 2012-07-07 08:47:19 +02:00
Eelco Dolstra
714f100970 httpd: Support building with another multi-processing module 2012-07-06 14:25:40 -04:00
Lluís Batlle i Rossell
808e50c7cf freeswitch: Updating to the latest master. This fixes the build.
They say that 'master' is the best stable code to use.
2012-07-02 22:17:38 +02:00
Eelco Dolstra
7925441bab net-snmp: Moved to pkgs/servers/monitoring 2012-06-21 15:22:17 -04:00
Yury G. Kudryashov
4638c52fb6 dovecot-2.1.7
svn path=/nixpkgs/trunk/; revision=34490
2012-06-13 07:09:03 +00:00
Mathijs Kwik
51ec873c8d mongodb: upgraded to 2.0.6
svn path=/nixpkgs/trunk/; revision=34470
2012-06-11 17:41:14 +00:00
Eelco Dolstra
36667965f9 * Updated bind to 9.7.6-P1, which includes a fix for CVE-2012-1667.
svn path=/nixpkgs/trunk/; revision=34370
2012-06-06 15:51:48 +00:00
Eelco Dolstra
73a1d5e27f * PostgreSQL updates.
svn path=/nixpkgs/trunk/; revision=34361
2012-06-05 15:24:16 +00:00
Mathijs Kwik
71c3057406 mongodb: upgraded to 2.0.5
svn path=/nixpkgs/trunk/; revision=34267
2012-05-29 07:43:58 +00:00
Eelco Dolstra
932d5bee54 * X.org 7.7 RC1. Note that xorg-server doesn't build yet.
svn path=/nixpkgs/branches/x-updates/; revision=34147
2012-05-16 22:06:27 +00:00
Marco Maggesi
b734682fb4 Fix openafs hash
svn path=/nixpkgs/trunk/; revision=34118
2012-05-15 19:36:39 +00:00
Marco Maggesi
68d2c3d70f Blind attempt to update OpenAFS to version 1.6.1
svn path=/nixpkgs/trunk/; revision=34115
2012-05-15 17:31:53 +00:00
Eelco Dolstra
a3fe6bd059 * Samba 3.6.5 (fixes CVE-2012-2111).
svn path=/nixpkgs/trunk/; revision=34111
2012-05-15 15:40:20 +00:00
Rickard Nilsson
ea74e1ea6d lighttpd 1.4.30.
svn path=/nixpkgs/trunk/; revision=34107
2012-05-15 14:14:33 +00:00
Rob Vermaas
49d0db04a3 update tomcat-connectors url
svn path=/nixpkgs/trunk/; revision=33982
2012-05-03 13:50:11 +00:00
Peter Simons
0eac8bb084 mysql51: update location of mysql-5.1.54.tar.gz
Committed on behalf of Ilja Honkonen <ilja.honkonen@helsinki.fi>.

svn path=/nixpkgs/trunk/; revision=33945
2012-04-29 18:17:46 +00:00
Ludovic Courtès
04600bbec1 Darwin: Add mig', lipo', etc. to `stdenvNative'.
Consequently, remove `darwinLipoUtility', `darwinArchUtility', etc.

svn path=/nixpkgs/trunk/; revision=33893
2012-04-23 15:47:31 +00:00
Karn Kallio
819a05bfae Update mysql 5.5 to 5.5.23 and fix no longer responding URL.
svn path=/nixpkgs/trunk/; revision=33872
2012-04-21 22:36:15 +00:00
Michael Raskin
de5fdd541a Fix line endings
svn path=/nixpkgs/trunk/; revision=33809
2012-04-17 13:05:57 +00:00
Michael Raskin
49b28405d8 Samba security update
svn path=/nixpkgs/trunk/; revision=33756
2012-04-12 09:31:31 +00:00
Ludovic Courtès
1e13bf5b12 GNU Shishi 1.0.1.
svn path=/nixpkgs/trunk/; revision=33709
2012-04-09 20:51:54 +00:00
Ludovic Courtès
03e6e14986 GNU SIP Witch 1.2.3.
svn path=/nixpkgs/trunk/; revision=33706
2012-04-09 20:51:40 +00:00
Lluís Batlle i Rossell
6a838a4ba1 Making x11perf build.
svn path=/nixpkgs/trunk/; revision=33651
2012-04-06 18:33:51 +00:00
Mathijs Kwik
21fd15f455 mongodb: minor upgrade
svn path=/nixpkgs/trunk/; revision=33506
2012-04-01 10:49:42 +00:00
Yury G. Kudryashov
5299c1f6fb svn merge ^/nixpkgs/trunk
- 1 conflict (gnome-doc-utils)
- final merge before --reintegrate

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33500
2012-03-31 20:01:40 +00:00
Michael Raskin
ba2343ba12 Update Squid-3.2; builds now
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33483
2012-03-30 05:21:56 +00:00
Yury G. Kudryashov
ec15b98631 Add memcached
Patch by Corey O'Connor, see http://reviewboard.loegria.net/r/15/

svn path=/nixpkgs/trunk/; revision=33461
2012-03-28 22:30:13 +00:00
Yury G. Kudryashov
d465b0798c virtuoso-6.1.5
svn path=/nixpkgs/trunk/; revision=33426
2012-03-26 15:07:37 +00:00
Lluís Batlle i Rossell
b24bab3873 Getting a much newer version of the openchrome X driver
svn path=/nixpkgs/trunk/; revision=33405
2012-03-25 13:53:07 +00:00
Eelco Dolstra
d905637b44 * Fix rpcbind. It wasn't listening on port 111, causing nfsd to fail
(http://hydra.nixos.org/build/2315333).

svn path=/nixpkgs/trunk/; revision=33353
2012-03-22 11:16:28 +00:00
Lluís Batlle i Rossell
07c583c3d4 Adding rpcbind.
Patch by Rickard Nilsson.


svn path=/nixpkgs/trunk/; revision=33341
2012-03-21 20:35:15 +00:00
Lluís Batlle i Rossell
969b9478a2 Updating samba to 3.6.3. I take out the overcome readlink.patch.
svn path=/nixpkgs/trunk/; revision=33231
2012-03-18 10:29:14 +00:00
Eelco Dolstra
0ac7828c6b * portmap: Set SO_REUSEADDR to ensure that portmap can restart
properly.

svn path=/nixpkgs/trunk/; revision=33166
2012-03-16 17:42:14 +00:00
Eelco Dolstra
1148fc2f76 * Minor cleanup.
svn path=/nixpkgs/trunk/; revision=33165
2012-03-16 17:20:04 +00:00
Yury G. Kudryashov
57fd764a39 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32792
2012-03-05 10:00:23 +00:00
Ludovic Courtès
90d1e1bb83 Add UNFS3, a user-space NFSv3 server.
svn path=/nixpkgs/trunk/; revision=32753
2012-03-03 16:06:27 +00:00
Yury G. Kudryashov
0210e20b5a svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32713
2012-03-01 07:04:39 +00:00
Eelco Dolstra
6c13f317e9 * Latest PostgreSQL releases.
svn path=/nixpkgs/trunk/; revision=32684
2012-02-28 18:40:27 +00:00
Yury G. Kudryashov
38e3d7bc86 svn merge ^/nixpkgs/trunk
Not merged r32497 (tree conflict, glibc GNU Hurd update). Ludovic, could you
please look at this?

svn path=/nixpkgs/branches/stdenv-updates/; revision=32520
2012-02-23 20:06:21 +00:00
Ludovic Courtès
c6210ec36d Samba: Fix compilation for GNU/Hurd; add to Hydra.
svn path=/nixpkgs/trunk/; revision=32498
2012-02-23 00:01:24 +00:00
Eelco Dolstra
2ceb07c28f * PostgreSQL 9.1: install the manpages.
svn path=/nixpkgs/trunk/; revision=32476
2012-02-22 17:27:06 +00:00
Eelco Dolstra
476ece2de0 * Added PostgreSQL 9.1.2. Updated PostgreSQL to 8.3.17 and 8.4.10.
svn path=/nixpkgs/trunk/; revision=32475
2012-02-22 16:40:10 +00:00
Eelco Dolstra
e64443baf1 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32468
2012-02-21 23:29:21 +00:00
Eelco Dolstra
ccea8d08e9 * Zabbix updated to 1.8.10.
svn path=/nixpkgs/trunk/; revision=32425
2012-02-20 13:37:33 +00:00
Yury G. Kudryashov
d8454e538c svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32417
2012-02-20 05:30:06 +00:00
Peter Simons
6492a0383d nginx: moved from sbin to bin, because it's useful for normal users too
Committed on behalf of Mathijs Kwik.

svn path=/nixpkgs/trunk/; revision=32407
2012-02-19 21:36:34 +00:00
Yury G. Kudryashov
e5027e5b36 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32330
2012-02-16 15:02:26 +00:00
Eelco Dolstra
4b9ef75972 * Updated Apache httpd to 2.2.22.
svn path=/nixpkgs/trunk/; revision=32304
2012-02-15 16:21:44 +00:00
Yury G. Kudryashov
5144a19987 svn merge ^/nixpkgs/trunk
There were a few merge conflicts due to ensureDir->mkdir -p migration

svn path=/nixpkgs/branches/stdenv-updates/; revision=32174
2012-02-10 10:24:30 +00:00
Eelco Dolstra
34c8b2fa31 * Updated Postgres to 9.0.6 (contributed by Bryce L Nordgren).
svn path=/nixpkgs/trunk/; revision=32134
2012-02-07 23:31:40 +00:00
Yury G. Kudryashov
215a07c1a9 svn merge ^/nixpkgs/trunk
Merge conflicts:
* unzip (almost trivial)
* dvswitch (trivial)
* gmp (copied result of `git merge`)

The last item introduced gmp-5.0.3, thus full rebuild.
+ensureDir->mkdir -p in TeX packages was catched by git but not svn.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
2012-02-06 23:03:12 +00:00
Arie Middelkoop
b4d5957ac4 Version bumb of 'xf86-synaptics' module, which fixes a cpu-stealing bug when using syndaemon.
svn path=/nixpkgs/trunk/; revision=32035
2012-02-05 00:43:54 +00:00
Sander van der Burg
37346e00a3 Enable IPv6 by default
svn path=/nixpkgs/trunk/; revision=32011
2012-02-03 20:50:33 +00:00
Peter Simons
4aac439f00 redis: added version 2.4.7
Patch submitted by Phil Hagelberg <technomancy@gmail.com>.

svn path=/nixpkgs/trunk/; revision=31992
2012-02-03 13:12:07 +00:00
Yury G. Kudryashov
5b132f6e96 svn merge ^/nixpkgs/trunk
Conflicts: cups, all-packages.nix (gcc45_debug)

svn path=/nixpkgs/branches/stdenv-updates/; revision=31863
2012-01-26 15:27:03 +00:00
Sander van der Burg
b54d8fc58d Updated ejabberd to version 2.1.10
svn path=/nixpkgs/trunk/; revision=31854
2012-01-26 13:57:57 +00:00
Shea Levy
7cc21234f6 mysql55: Get building on darwin
svn path=/nixpkgs/trunk/; revision=31842
2012-01-26 02:08:48 +00:00
Peter Simons
8045c6ebe2 dri-proto: upgraded to version 2.6 so that we can use intel 2.17 driver
svn path=/nixpkgs/trunk/; revision=31773
2012-01-21 18:47:40 +00:00
Eelco Dolstra
bafc4ff59d * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31739
2012-01-20 15:29:04 +00:00
Sander van der Burg
2c3e921a4c Bumped MySQL 5.5.15 to 5.5.20
svn path=/nixpkgs/trunk/; revision=31735
2012-01-20 12:29:13 +00:00
Yury G. Kudryashov
84c0185038 svn merge ^/nixpkgs/trunk, one simple conflict in jruby
svn path=/nixpkgs/branches/stdenv-updates/; revision=31721
2012-01-19 21:31:51 +00:00
Eelco Dolstra
d4d7931a62 * Cleanup: remove obsolete references to ‘xz’, which is in stdenv now.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31678
2012-01-18 20:53:01 +00:00
Ludovic Courtès
c295b6638e GNU SIP Witch 1.2.1.
svn path=/nixpkgs/trunk/; revision=31670
2012-01-18 20:52:26 +00:00
Peter Simons
5ebdf058cc intel X driver: upgraded to fix display glitches on newer chips
at least 2 nixos users were affected by a graphics bug that got fixed
in 2.15.
Officially 2.15 was meant for a newer xorg server, libdrm, mesa and all, but
I've been running with this for over a month with no issues (used
compositing desktop, opengl and hd video).

I know 2.17 is in the repo, but it doesn't builde (missing deps I
think).

svn path=/nixpkgs/trunk/; revision=31661
2012-01-18 20:38:30 +00:00
Peter Simons
8985708131 mongodb: new package (nosql database) - nixos integration available
svn path=/nixpkgs/trunk/; revision=31655
2012-01-18 20:32:41 +00:00
Eelco Dolstra
c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00
Shea Levy
a11fda4b4b mysql51: enable building on darwin
svn path=/nixpkgs/trunk/; revision=31531
2012-01-14 11:58:29 +00:00
Peter Simons
fedda96bee xf86-video-ati: updated to version 6.14.3
svn path=/nixpkgs/trunk/; revision=31471
2012-01-10 20:12:25 +00:00
Florian Friesdorf
2e31e7293a moved parts of extra.list back to tarballs-7.6.list
also added an short description about them to generate-expr-from-tarballs.pl

svn path=/nixpkgs/trunk/; revision=31189
2011-12-31 15:37:51 +00:00
Florian Friesdorf
d2e8c37e41 default.nix now fully generated again
with additional xf86-video-intel-2.17.0 and what looks like a fixed
xf86-video-intel-2.14.901.

svn path=/nixpkgs/trunk/; revision=31185
2011-12-31 06:07:37 +00:00
Florian Friesdorf
1745900396 add xf86-video-intel-2.14.901 (and while at it 2.17.0) to extra.list
svn path=/nixpkgs/trunk/; revision=31184
2011-12-31 06:07:34 +00:00
Florian Friesdorf
2a2ceace7f generate-expr-from-tarballs.pl support multiple versions
svn path=/nixpkgs/trunk/; revision=31183
2011-12-31 06:07:32 +00:00
Florian Friesdorf
f6090f6bba reproduced my previous manual changes through generation of default.nix
svn path=/nixpkgs/trunk/; revision=31182
2011-12-31 06:07:28 +00:00
Florian Friesdorf
cebb40f533 adjusted oder of *.list in generate-expr-from-tarballs.pl example
svn path=/nixpkgs/trunk/; revision=31181
2011-12-31 06:07:26 +00:00
Florian Friesdorf
e45921800c adjusted example generate-expr-from-tarballs.pl call to 7.6
svn path=/nixpkgs/trunk/; revision=31180
2011-12-31 06:07:23 +00:00
Florian Friesdorf
0bb20084b5 xorg: alphabetical extra.list
svn path=/nixpkgs/trunk/; revision=31179
2011-12-31 06:07:21 +00:00
Florian Friesdorf
c9b2b8a182 xcb-util(-*)-0.3.8 and xlsclients-1.1.2 in extra.list
svn path=/nixpkgs/trunk/; revision=31178
2011-12-31 06:07:18 +00:00
Florian Friesdorf
e1556e64d7 xorg: moved individuals from tarballs-7.6 to extra.list and regen tarballs-7.6
svn path=/nixpkgs/trunk/; revision=31177
2011-12-31 06:07:15 +00:00
Florian Friesdorf
44ef26c896 xlsclients-1.1.2
svn path=/nixpkgs/trunk/; revision=31176
2011-12-31 04:30:46 +00:00
Florian Friesdorf
251d42d03f xcb-util-0.3.8 (+image|keysyms|renderutil|wm)
this might break things but makes awesome-3.4.11 happy

svn path=/nixpkgs/trunk/; revision=31171
2011-12-31 04:05:50 +00:00
Cillian de Roiste
02eb690bad Upgrading CouchDB to 1.1.1 with SpiderMonkey 185
svn path=/nixpkgs/trunk/; revision=30905
2011-12-15 12:24:25 +00:00
Yury G. Kudryashov
63a5da5ef2 virtuoso-6.1.4
svn path=/nixpkgs/trunk/; revision=30890
2011-12-14 14:09:53 +00:00
Eelco Dolstra
9cc0637247 * Add xinetd to the channel.
svn path=/nixpkgs/trunk/; revision=30865
2011-12-13 12:43:11 +00:00
Shea Levy
69e12ad16e Add ncmpcpp
Patch by mornfall

svn path=/nixpkgs/trunk/; revision=30730
2011-12-05 01:32:25 +00:00
Ludovic Courtès
cd22d77614 GNU SIP Witch 1.1.3.
svn path=/nixpkgs/trunk/; revision=30676
2011-12-01 22:44:59 +00:00
Ludovic Courtès
46d3cd449f Samba: Add a cross-compilable variant.
svn path=/nixpkgs/trunk/; revision=30627
2011-11-29 22:54:00 +00:00
Eelco Dolstra
1abb8f9a26 * Fix PulseAudio's config files installation paths.
svn path=/nixpkgs/trunk/; revision=30383
2011-11-10 23:27:05 +00:00
Eelco Dolstra
6e5c0d70db * Add platforms attribute.
svn path=/nixpkgs/trunk/; revision=30380
2011-11-10 22:50:45 +00:00
Eelco Dolstra
75b7d02633 * Added oidentd, an implementation of the IDENT protocol.
svn path=/nixpkgs/trunk/; revision=30379
2011-11-10 22:29:58 +00:00
Lluís Batlle i Rossell
d72fe9fee2 Adding prayer. It builds on linux x86_64, but I've not tried to run it.
svn path=/nixpkgs/trunk/; revision=30347
2011-11-08 21:07:57 +00:00
Eelco Dolstra
7fdb29f0f3 * Make the X11 dependency in PulseAudio optional, just like the JACK
dependency.  This is important to prevent these dependencies from
  propagating to all PulseAudio clients.  The PulseAudio server in
  NixOS can enable X11 support (if desired) by setting

    hardware.pulseaudio.package = pkgs.pulseaudio.override {
      x11Support = true;
    };

svn path=/nixpkgs/trunk/; revision=30300
2011-11-07 17:51:04 +00:00
David Guibert
18fcb0f5f8 update pulseaudio 0.9.23 -> 1.1
svn path=/nixpkgs/trunk/; revision=30279
2011-11-06 20:03:07 +00:00
Lluís Batlle i Rossell
36c0150c1e I think these changes make postfix start again.
svn path=/nixpkgs/trunk/; revision=30246
2011-11-05 21:14:30 +00:00
Lluís Batlle i Rossell
70035096a5 Updating our super-old postfix. 2.8.6 builds. I don't know if it serves well.
svn path=/nixpkgs/trunk/; revision=30244
2011-11-05 18:50:43 +00:00
Eelco Dolstra
a5a5dcde90 * Updated PostgreSQL.
svn path=/nixpkgs/trunk/; revision=30162
2011-11-01 14:37:27 +00:00
Rob Vermaas
edbae5f6c3 update nginx to 1.1.7
svn path=/nixpkgs/trunk/; revision=30144
2011-10-31 18:26:20 +00:00
Ludovic Courtès
74201c0fcb GNU SIP Witch 1.1.2.
svn path=/nixpkgs/trunk/; revision=30116
2011-10-30 00:00:56 +00:00
Lluís Batlle i Rossell
9b9ca264d1 dovecot 2 feels hapier with zlib and bzip2
svn path=/nixpkgs/trunk/; revision=30077
2011-10-27 22:07:39 +00:00
Lluís Batlle i Rossell
cf23b0c4e5 Making dovecot2 not use $out/var for runtime files.
svn path=/nixpkgs/trunk/; revision=30075
2011-10-27 22:03:41 +00:00
Lluís Batlle i Rossell
621e87f821 Adding a newer dovecot
svn path=/nixpkgs/trunk/; revision=30025
2011-10-25 20:34:19 +00:00
Eelco Dolstra
f31cd519b6 * Updated version of the readlink() patch.
svn path=/nixpkgs/trunk/; revision=30013
2011-10-25 12:52:41 +00:00
Eelco Dolstra
215e6d0c7d * attachments.samba.org is down, and we should not depend on it anyway.
svn path=/nixpkgs/trunk/; revision=29996
2011-10-24 17:22:10 +00:00
Eelco Dolstra
9667d5ec5a * Samba: Apply a patch that fixes readlink() on symlinks that point
outside of the share.  This is necessary for EC2 image generation
  (and similar actions).  Many thanks to Jeremy Allison to fixing this
  very quickly.  (https://bugzilla.samba.org/show_bug.cgi?id=8541)

svn path=/nixpkgs/trunk/; revision=29969
2011-10-21 23:36:48 +00:00
Eelco Dolstra
87a251aea5 * Samba 3.6.1.
svn path=/nixpkgs/trunk/; revision=29967
2011-10-21 19:30:32 +00:00
Sander van der Burg
1fc00185f4 Updated Axis2 to version 1.6.1
svn path=/nixpkgs/trunk/; revision=29836
2011-10-14 13:24:55 +00:00
Marco Maggesi
843ed0c339 Update OpenAFS client to version 1.6.0. Also enable Hydra build.
svn path=/nixpkgs/trunk/; revision=29819
2011-10-13 12:37:15 +00:00
Eelco Dolstra
ef27bfc02a * Apache 2.2.21.
svn path=/nixpkgs/trunk/; revision=29707
2011-10-07 11:37:42 +00:00
Yury G. Kudryashov
791cf785b8 virtuoso: apply patch as proposed by Nepomuk developers
svn path=/nixpkgs/trunk/; revision=29514
2011-09-27 15:40:45 +00:00
Alexander Tsamutali
0ed57e3f64 servers/x11/xorg/overrides.nix:
Added xproto to propagatedBuildInputs of libXext, because for ex.
  shape.h includes Xfuncproto.h.

svn path=/nixpkgs/trunk/; revision=29505
2011-09-26 22:24:22 +00:00
Eelco Dolstra
c94dc8d0ca * Zabbix updated to 1.8.7.
svn path=/nixpkgs/trunk/; revision=29122
2011-09-09 09:39:43 +00:00
Eelco Dolstra
ad51692715 * Style fixes.
svn path=/nixpkgs/trunk/; revision=29048
2011-09-05 21:02:21 +00:00
Eelco Dolstra
573e554e2c * Apache httpd updated to 2.2.20, with a fix for CVE-2011-3192.
svn path=/nixpkgs/trunk/; revision=28976
2011-09-02 15:59:12 +00:00
Michael Raskin
6a01304317 Adding TFTP-HPA
svn path=/nixpkgs/trunk/; revision=28915
2011-08-30 07:02:01 +00:00
Shea Levy
8a3f40a088 Get libpciaccess to compile on darwin
The added patch uses the correct byte-conversion functions on Apple systems. The library compiles on darwin but is not yet tested.

svn path=/nixpkgs/trunk/; revision=28881
2011-08-29 18:58:59 +00:00
Sander van der Burg
875cb2965f Bumped Tomcat connectors to version 1.2.32
svn path=/nixpkgs/trunk/; revision=28823
2011-08-26 09:54:46 +00:00
Ludovic Courtès
d0f60bf3a1 GNU MyServer 0.11.
svn path=/nixpkgs/trunk/; revision=28750
2011-08-22 17:38:33 +00:00
Ludovic Courtès
fc006a3564 GNU SIP Witch 1.1.1.
svn path=/nixpkgs/trunk/; revision=28748
2011-08-22 17:38:24 +00:00
Michael Raskin
4dc86642ef Update Redstore
svn path=/nixpkgs/trunk/; revision=28649
2011-08-17 22:22:06 +00:00
Peter Simons
9bf210f25a pkgs/servers/http/mini-httpd: added version 1.1
svn path=/nixpkgs/trunk/; revision=28613
2011-08-16 14:01:38 +00:00
Yury G. Kudryashov
fc312485cf samba-3.6.0
svn path=/nixpkgs/trunk/; revision=28467
2011-08-10 20:19:36 +00:00
Yury G. Kudryashov
59b7072038 virtuoso-6.1.3
svn path=/nixpkgs/trunk/; revision=28455
2011-08-10 09:43:20 +00:00
Michael Raskin
9671e806af Fixing Redstore build
svn path=/nixpkgs/trunk/; revision=28158
2011-08-04 17:42:45 +00:00
Sander van der Burg
d8051477b5 Upgraded MySQL JDBC driver to 5.1.17
svn path=/nixpkgs/trunk/; revision=28151
2011-08-04 14:02:52 +00:00
Sander van der Burg
a0c03edcd9 Removed test stuff from MySQL + add to releases
svn path=/nixpkgs/trunk/; revision=28149
2011-08-04 11:58:49 +00:00
Eelco Dolstra
237b2b8a30 * Merged the KDE 4.7 branch.
This adds KDE 4.7 (and updates many dependencies), but KDE 4.5 is
  still the default.  To use 4.7, set the following in
  configuration.nix:

    nixpkgs.config.packageOverrides = pkgs: {
      kde4 = pkgs.kde47;
    };
  

svn path=/nixpkgs/trunk/; revision=28147
2011-08-04 00:08:22 +00:00
Sander van der Burg
d9572cfb6b Added MySQL 5.5. It's still a bit experimental though
svn path=/nixpkgs/trunk/; revision=28145
2011-08-03 22:10:06 +00:00
Eelco Dolstra
1b427fe052 * Sync with the trunc.
* Fixed the hash in PulseAudio: I updated the name/version, but forgot
  to update the hash.  So secretly it was still building the old
  version.  Also, now that we've realised that the PulseAudio server
  and library don't need to be the same build, disable some
  dependencies by default (avahi and bluez).

svn path=/nixpkgs/branches/kde-4.7/; revision=28023
2011-07-31 19:44:58 +00:00
Cillian de Roiste
415be547b3 Enabling optional jackaudio support for pulseaudio
svn path=/nixpkgs/trunk/; revision=28010
2011-07-30 18:51:42 +00:00
Eelco Dolstra
af40854825 * PulseAudio: use configuration files in /etc/pulse to allow NixOS to
override them.

svn path=/nixpkgs/branches/kde-4.7/; revision=27965
2011-07-26 15:25:21 +00:00
Eelco Dolstra
626b7cd9f4 * Fix the xvinfo build.
svn path=/nixpkgs/branches/kde-4.7/; revision=27955
2011-07-26 00:04:46 +00:00
Eelco Dolstra
f4ac1126ff * Sync with the trunk.
svn path=/nixpkgs/branches/kde-4.7/; revision=27796
2011-07-15 10:02:22 +00:00
Peter Simons
48b86237e5 mod_fastcgi, mod_wsgi: these modules don't build on Darwin, and I don't know how to fix that
According to Hydra:

  at `mod_fastcgi' [system = "i686-darwin"]:
  assertion failed at `/nix/store/jjbzdiilypsb8z38647hav2fxlp0bwfd-nixpkgs-r27790/pkgs/servers/http/apache-httpd/default.nix:8:1'

  at `mod_fastcgi' [system = "x86_64-darwin"]:
  assertion failed at `/nix/store/jjbzdiilypsb8z38647hav2fxlp0bwfd-nixpkgs-r27790/pkgs/servers/http/apache-httpd/default.nix:8:1'

  at `mod_wsgi' [system = "i686-darwin"]:
  assertion failed at `/nix/store/jjbzdiilypsb8z38647hav2fxlp0bwfd-nixpkgs-r27790/pkgs/servers/http/apache-httpd/default.nix:8:1'

  at `mod_wsgi' [system = "x86_64-darwin"]:
  assertion failed at `/nix/store/jjbzdiilypsb8z38647hav2fxlp0bwfd-nixpkgs-r27790/pkgs/servers/http/apache-httpd/default.nix:8:1'

svn path=/nixpkgs/trunk/; revision=27793
2011-07-14 21:54:58 +00:00
Peter Simons
1b53d1f22d xorg: updated xf86-video-ati to version 6.14.2
svn path=/nixpkgs/trunk/; revision=27776
2011-07-14 12:22:49 +00:00
Evgeny Egorochkin
5c4590fa50 MediaTomb: packaged
svn path=/nixpkgs/trunk/; revision=27700
2011-07-11 00:42:02 +00:00
Eelco Dolstra
4b19a1980f * Pulseaudio: disable the dependencies on GTK+, GConf and X11. It's
not clear what they're good for, and we don't want other packages
  depending on GTK+ or Gnome if it's not necessary.  Also, updated to
  0.9.23.

svn path=/nixpkgs/branches/kde-4.7/; revision=27629
2011-07-07 17:24:31 +00:00
Ludovic Courtès
b3ef7901c4 GNU SIP Witch 1.0.3.
svn path=/nixpkgs/trunk/; revision=27585
2011-07-04 11:52:22 +00:00
Eelco Dolstra
c81069e9d5 * apr updated to 1.4.5.
* apr-util updated to 1.3.12.
* httpd updated to 2.2.19.

svn path=/nixpkgs/trunk/; revision=27487
2011-06-16 15:19:53 +00:00
Eelco Dolstra
12c9ba62ac * Fix some evaluation problems.
svn path=/nixpkgs/trunk/; revision=27457
2011-06-14 15:55:11 +00:00
Karn Kallio
b8950a9504 Fix some semicolons.
svn path=/nixpkgs/trunk/; revision=27456
2011-06-14 15:29:40 +00:00
Nicolas Pierron
ae548e8bcb Add freepops.
svn path=/nixpkgs/trunk/; revision=27450
2011-06-14 02:41:28 +00:00
Alexander Tsamutali
5c08bd40db servers/mpd: Updated to 0.16.3.
svn path=/nixpkgs/trunk/; revision=27434
2011-06-13 16:05:03 +00:00
Yury G. Kudryashov
f0688ef3bc gpsd-2.95
svn path=/nixpkgs/trunk/; revision=27390
2011-06-07 21:51:13 +00:00
Ludovic Courtès
bd1459a557 GNU SIP Witch 1.0.2.
svn path=/nixpkgs/trunk/; revision=27329
2011-05-30 21:49:50 +00:00
Michael Raskin
e0a4f988a4 Make Ekiga build
svn path=/nixpkgs/trunk/; revision=27305
2011-05-27 05:39:44 +00:00
Evgeny Egorochkin
f69142b396 Polipo: packaged
svn path=/nixpkgs/trunk/; revision=27177
2011-05-07 23:41:34 +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
Lluís Batlle i Rossell
f28be20395 Updating samba.
svn path=/nixpkgs/trunk/; revision=27082
2011-05-02 07:25:29 +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
6300c72a20 Add GNU Pies.
svn path=/nixpkgs/trunk/; revision=26942
2011-04-23 21:15:11 +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
Sander van der Burg
57fee7d679 Bumped tomcat to 6.0.32
svn path=/nixpkgs/trunk/; revision=26845
2011-04-14 15:37:04 +00:00
Lluís Batlle i Rossell
918f68b99a Making samba build with cups support.
svn path=/nixpkgs/trunk/; revision=26839
2011-04-14 07:25:06 +00:00
Lluís Batlle i Rossell
7ed30ce04b Making samba have the ldap schema in $out. And I enable parallel building.
svn path=/nixpkgs/trunk/; revision=26821
2011-04-13 15:31:22 +00:00
Michael Raskin
13a1c3a69b Update Nginx
svn path=/nixpkgs/trunk/; revision=26813
2011-04-13 04:51:35 +00:00
Ludovic Courtès
2c9f084d24 GNU SIP Witch 0.10.5.
svn path=/nixpkgs/trunk/; revision=26795
2011-04-12 08:05:38 +00:00
Lluís Batlle i Rossell
ccd2316471 Fixing the builds of apr, apache, subversion and friends when having enabled the ldap support.
svn path=/nixpkgs/trunk/; revision=26764
2011-04-09 14:59:06 +00:00
Lluís Batlle i Rossell
450ef3730c Adding ldap support to apache (true by default).
I imagine noone would mind this 'addon' in their nixos apache installations.


svn path=/nixpkgs/trunk/; revision=26763
2011-04-09 14:24:25 +00:00
Eelco Dolstra
7359ed1671 * Added rabbitmq-server.
svn path=/nixpkgs/branches/modular-python/; revision=26623
2011-03-31 11:09:20 +00:00
Eelco Dolstra
353d450867 * wrapPythonPrograms: don't hard-code the Python library prefix.
svn path=/nixpkgs/branches/modular-python/; revision=26594
2011-03-29 15:19:59 +00:00
Eelco Dolstra
1439ae44be * Sync with the trunk.
svn path=/nixpkgs/branches/modular-python/; revision=26586
2011-03-28 20:22:30 +00:00
Eelco Dolstra
968496e69b * wrapPythonPrograms: rewrite the common "#! .../env python" idiom to
"#! .../python".

svn path=/nixpkgs/branches/modular-python/; revision=26583
2011-03-28 17:19:27 +00:00
Ludovic Courtès
4626c7eca3 GNU SIP Witch 0.10.4.
svn path=/nixpkgs/trunk/; revision=26479
2011-03-23 21:55:48 +00:00
Sander van der Burg
981c8e94d4 Bumped Apache Tomcat connectors to 1.2.31
svn path=/nixpkgs/trunk/; revision=26437
2011-03-21 12:07:42 +00:00
Michael Raskin
04d5aed6d0 Add intel driver prerelease
svn path=/nixpkgs/trunk/; revision=26418
2011-03-18 09:10:53 +00:00
Eelco Dolstra
5382f8e934 * xorg-server updated to 1.9.5.
svn path=/nixpkgs/trunk/; revision=26417
2011-03-18 09:07:46 +00:00
Michael Raskin
ee75c32a3b More needed propagations noted for future big update
svn path=/nixpkgs/trunk/; revision=26409
2011-03-18 05:32:14 +00:00
Michael Raskin
92a26c823c Comment about incomplete set of propagatedBuildInputs
svn path=/nixpkgs/trunk/; revision=26406
2011-03-17 22:00:22 +00:00
Michael Raskin
1d99933141 Fix xbacklight
svn path=/nixpkgs/trunk/; revision=26402
2011-03-17 18:46:25 +00:00
Michael Raskin
3fa36ea4a1 Fix TWM build
svn path=/nixpkgs/trunk/; revision=26399
2011-03-17 15:51:13 +00:00
Eelco Dolstra
3e3eac2e30 * Sync with the trunk.
svn path=/nixpkgs/branches/x-updates/; revision=26303
2011-03-14 18:26:46 +00:00
Ludovic Courtès
8254ae7c3e GNU SIP Witch 0.10.1.
svn path=/nixpkgs/trunk/; revision=26264
2011-03-10 16:27:58 +00:00
Eelco Dolstra
f16a2dc2f6 * Sync with the trunk. Remove glib_2_28 because the branch already
has it.

svn path=/nixpkgs/branches/x-updates/; revision=26189
2011-03-07 12:17:12 +00:00
Michael Raskin
b3acca85fd Remove wrong fix for a problem of disappearing tools...
svn path=/nixpkgs/trunk/; revision=26171
2011-03-05 22:32:18 +00:00
Michael Raskin
6b10954921 Adding Joseki: HTTP/SparQL server based on Jena framework. Just a unpack/mix/fix paths expression relying on compiled JAR releases.
svn path=/nixpkgs/trunk/; revision=26168
2011-03-05 22:05:00 +00:00
Ludovic Courtès
e7fc725ddb GNU MyServer: Make the binary installable.
svn path=/nixpkgs/trunk/; revision=26162
2011-03-04 13:19:04 +00:00
Ludovic Courtès
69e259eaf2 GNU MyServer: Kill the test suite.
svn path=/nixpkgs/trunk/; revision=26161
2011-03-04 13:19:00 +00:00
Eelco Dolstra
d6c6f9f0e0 * Sync with the trunk.
svn path=/nixpkgs/branches/x-updates/; revision=26018
2011-02-17 16:33:39 +00:00
Eelco Dolstra
9bc4c552a6 * Zabbix 1.8.4.
svn path=/nixpkgs/trunk/; revision=26013
2011-02-17 13:57:15 +00:00
Eelco Dolstra
6ba53ec09a * Fix xf86-input-synaptics and xf86-input-keyboard.
* Enable parallel building for all X.org packages.

svn path=/nixpkgs/branches/x-updates/; revision=25982
2011-02-15 15:54:57 +00:00
Eelco Dolstra
a5aa96c3a3 * xorgserver: propagate dri2proto.
svn path=/nixpkgs/branches/x-updates/; revision=25980
2011-02-15 14:34:26 +00:00
Eelco Dolstra
1566609a1a * libXft: propagate libXrender.
svn path=/nixpkgs/branches/x-updates/; revision=25950
2011-02-14 10:14:34 +00:00
Eelco Dolstra
47aa6890d2 * libXaw: propagates libXmu.
svn path=/nixpkgs/branches/x-updates/; revision=25948
2011-02-14 10:04:37 +00:00
Eelco Dolstra
0f0d3f9543 * Fix xorg-server.
svn path=/nixpkgs/branches/x-updates/; revision=25907
2011-02-11 15:54:01 +00:00
Eelco Dolstra
337e26fea0 * xkbcomp 1.2.1.
svn path=/nixpkgs/branches/x-updates/; revision=25906
2011-02-11 15:32:08 +00:00
Eelco Dolstra
8ca86a8114 * Remove libX11 docs.
svn path=/nixpkgs/branches/x-updates/; revision=25855
2011-02-09 15:17:15 +00:00
Eelco Dolstra
6a59d1a98f * Latest Glib, ATK, Pango and GTK+.
* Added gdk-pixbuf, which has been revived and is required by GTK+.
* Don't install the documentation of aforementioned packages.  This
  cuts 56 MiB off the closure of GTK+-based packages.  It wasn't
  really useful anyway because it's not installed in a way that allows
  users to find it easily on NixOS.  And if you want it, it's faster
  to Google it.

svn path=/nixpkgs/branches/x-updates/; revision=25853
2011-02-09 15:09:29 +00:00
Eelco Dolstra
0b8efb0cbb * X.org 7.6.
svn path=/nixpkgs/branches/x-updates/; revision=25818
2011-02-08 17:39:28 +00:00
Lluís Batlle i Rossell
9df13d6bba I remove a commented line for freeswitch parallel build. It failed once
building, for me, with that option, so I take that off.

svn path=/nixpkgs/trunk/; revision=25665
2011-01-21 22:12:39 +00:00
Lluís Batlle i Rossell
8cb0db3589 Adding freeswitch
svn path=/nixpkgs/trunk/; revision=25664
2011-01-21 22:12:34 +00:00
Lluís Batlle i Rossell
39506a095d Telling those GNU SIP Witch related packages to use gnutls.
svn path=/nixpkgs/trunk/; revision=25635
2011-01-19 21:48:05 +00:00