JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,267 Commits 2 Branches 0 Tags 13 GiB
cf250029e0
Commit Graph

18993 Commits

Author SHA1 Message Date
Ludovic Courtès
f62c274011 GNU GLOBAL 6.2.2. 
svn path=/nixpkgs/trunk/; revision=33697
 2012-04-09 20:50:59 +00:00
Ludovic Courtès
369fe599b1 GNU Parallel 20120322. 
svn path=/nixpkgs/trunk/; revision=33696
 2012-04-09 20:50:54 +00:00
Ludovic Courtès
0e84e56083 GNU Zile 2.4.7. 
svn path=/nixpkgs/trunk/; revision=33695
 2012-04-09 20:50:50 +00:00
Ludovic Courtès
e5c7358336 GNU help2man 1.40.8. 
svn path=/nixpkgs/trunk/; revision=33694
 2012-04-09 20:50:45 +00:00
Lluís Batlle i Rossell
0684ca8745 Adding the memtest86 from memtest86.com, and renaming the top-level attribute 
name of memtest86+ to memtest86plus.

I think it makes more sense for the attribute memtest86 to point to the
upstream memtest86.com version.


svn path=/nixpkgs/trunk/; revision=33689
 2012-04-09 19:54:34 +00:00
Rob Vermaas
d4913759da Update darktable to version 1.0. 
svn path=/nixpkgs/trunk/; revision=33688
 2012-04-09 17:56:38 +00:00
Peter Simons
b041d3e49b Updated Haskell packages. 
- blaze-builder-conduit: updated to version 0.4.0.1
 - enumerator: updated to version 0.4.19
 - persistent-sqlite: updated to version 0.9.0.1
 - persistent-template: updated to version 0.9.0.1
 - persistent: updated to version 0.9.0.1
 - pool-conduit: updated to version 0.1.0.1
 - semigroups: updated to version 0.8.2
 - shakespeare-css: updated to version 1.0.1.1
 - shakespeare-i18n: updated to version 1.0.0.1
 - shakespeare-js: updated to version 1.0.0.1
 - shakespeare-text: updated to version 1.0.0.1
 - shakespeare: updated to version 1.0.0.1
 - void: updated to version 0.5.5.1
 - wai-app-static: updated to version 1.2.0.1
 - wai: updated to version 1.2.0.1
 - warp: updated to version 1.2.0.1
 - yesod-core: updated to version 1.0.0.2
 - yesod: updated to version 1.0.0.2
 - zlib-conduit: updated to version 0.4.0.1

svn path=/nixpkgs/trunk/; revision=33683
 2012-04-09 12:37:39 +00:00
Mathijs Kwik
107c8325e5 added extra package for gnupg 2.1 git pre version. 
contains the merge of gnupg-ecc, enabling ecdsa and other algorithms.

I mainly need this because I use ecdsa for my ssh keys, and want
gpg-agent to be able to handle them.

svn path=/nixpkgs/trunk/; revision=33682
 2012-04-09 10:17:40 +00:00
Mathijs Kwik
0765ca769a libassuan: added extra package with current git version 
needed for upcoming gnupg 2.1

svn path=/nixpkgs/trunk/; revision=33681
 2012-04-09 10:17:36 +00:00
Mathijs Kwik
9779ae082a npth: successor of the pth library, used by upcoming versions of gnupg and its libraries 
svn path=/nixpkgs/trunk/; revision=33680
 2012-04-09 10:17:32 +00:00
Mathijs Kwik
81d6e98d34 gpgme: upgraded to 1.3.1 
svn path=/nixpkgs/trunk/; revision=33679
 2012-04-09 10:17:29 +00:00
Mathijs Kwik
5cdd04e950 gnupg: upgraded to 2.0.19 
svn path=/nixpkgs/trunk/; revision=33678
 2012-04-09 10:17:26 +00:00
Mathijs Kwik
94749e4463 libksba: upgraded to 1.2.0 
svn path=/nixpkgs/trunk/; revision=33677
 2012-04-09 10:17:23 +00:00
Mathijs Kwik
6ef610851e kde okular: include pkgconfig, otherwise libspectre isn't found (.ps viewing) 
svn path=/nixpkgs/trunk/; revision=33676
 2012-04-09 10:17:20 +00:00
Mathijs Kwik
4d34820fba UHC: upgraded and changed to the new official github repository 
svn path=/nixpkgs/trunk/; revision=33675
 2012-04-09 10:17:17 +00:00
Arie Middelkoop
2b18ccf305 * Added "easytag", a GUI for organizing id3tags in mp3s. 
* Updated some ocaml packages.
* Updated coccinelle.

svn path=/nixpkgs/trunk/; revision=33674
 2012-04-09 09:42:20 +00:00
Shea Levy
68f739cc45 nodejs/v8: Bump 
svn path=/nixpkgs/trunk/; revision=33673
 2012-04-08 14:32:00 +00:00
Cillian de Roiste
11040732bd It seems to get stuck on the line break so I'm putting it all on one line now 
svn path=/nixpkgs/trunk/; revision=33672
 2012-04-08 12:03:15 +00:00
Peter Simons
fc1bc797bd Updated Haskell packages. 
- file-embed: updated to version 0.0.4.2
 - mtl: added version 2.1
 - texmath: updated to version 0.6.0.5
 - text: added version 0.11.2.0
 - removed obsolete overrides

svn path=/nixpkgs/trunk/; revision=33671
 2012-04-08 11:14:28 +00:00
Cillian de Roiste
e1155499ad Reverting to revision 1995, this is what AVLinux uses, and works well with jackdbus too 
svn path=/nixpkgs/trunk/; revision=33670
 2012-04-08 11:10:11 +00:00
Peter Simons
4292793d40 git-annex: updated to version 3.20120406 
svn path=/nixpkgs/trunk/; revision=33669
 2012-04-08 10:48:14 +00:00
Cillian de Roiste
3ec76c0a25 Adding a2jmidid, a daemon for exposing legacy ALSA sequencer applications in JACK MIDI system 
svn path=/nixpkgs/trunk/; revision=33668
 2012-04-08 00:28:37 +00:00
Cillian de Roiste
78ffc6b30d Adding a2jmidid 
svn path=/nixpkgs/trunk/; revision=33667
 2012-04-08 00:25:09 +00:00
Cillian de Roiste
d989f361ac Updating to 0.121.3, adding optional FireWire support and replacing composableDerivation with mkDerivation 
svn path=/nixpkgs/trunk/; revision=33666
 2012-04-08 00:16:59 +00:00
Cillian de Roiste
bce9de06bd Adding firewire support 
svn path=/nixpkgs/trunk/; revision=33665
 2012-04-08 00:00:03 +00:00
Cillian de Roiste
285af645e6 Adding extra requirements, fixing some of the ffado utilities 
svn path=/nixpkgs/trunk/; revision=33664
 2012-04-07 23:57:30 +00:00
Peter Simons
7b00953c70 haskell-hoogle: fixed build 
svn path=/nixpkgs/trunk/; revision=33660
 2012-04-07 13:16:33 +00:00
Peter Simons
9b0323859f Updated Haskell packages. 
- cabal2nix: updated to version 1.31
 - gloss: updated to version 1.7.2.1
 - repa-algorithms: updated to version 3.1.0.1
 - repa-bytestring: deleted obsolete package
 - repa-examples: updated to version 3.1.0.1
 - repa-io: updated to version 3.1.0.1
 - repa: updated to version 3.1.0.1
 - semigroups: updated to version 0.8.0.1

svn path=/nixpkgs/trunk/; revision=33659
 2012-04-07 11:59:28 +00:00
Peter Simons
bf47f4bbe3 Updated Haskell packages. 
- HsOpenSSL: updated to version 0.10.2
 - zip-archive: updated to version 0.1.1.8

svn path=/nixpkgs/trunk/; revision=33657
 2012-04-06 19:48:24 +00:00
Peter Simons
b73fb52648 Oops, fixed typo from previous commit. 
svn path=/nixpkgs/trunk/; revision=33656
 2012-04-06 19:39:43 +00:00
Peter Simons
8beb891d52 xscreensaver: updated to version 5.15 (and moved to pkgs/misc/screensavers hierarchy) 
svn path=/nixpkgs/trunk/; revision=33655
 2012-04-06 19:30:30 +00:00
Peter Simons
44b6ab6d32 slock: updated to version 1.0 
svn path=/nixpkgs/trunk/; revision=33653
 2012-04-06 18:56:05 +00:00
Peter Simons
f04ca020f3 xlockmore: updated to version 5.38 
svn path=/nixpkgs/trunk/; revision=33652
 2012-04-06 18:56:00 +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
Ludovic Courtès
e24eab9b87 GNU: Use `callPackage'. 
svn path=/nixpkgs/trunk/; revision=33649
 2012-04-06 13:18:58 +00:00
Eelco Dolstra
9f2068ac9b * Don't build Boost on Cygwin. It takes way too long. 
svn path=/nixpkgs/trunk/; revision=33648
 2012-04-06 13:10:19 +00:00
Lluís Batlle i Rossell
3e923680d2 Making gnash build with the default firefox xulrunner. 
I have not checked if gnash needs it; I only changed it from the
xulrunner of iceweasel (which does not build) to that more maintained xulrunner
that builds.


svn path=/nixpkgs/trunk/; revision=33647
 2012-04-06 13:01:55 +00:00
Michael Raskin
45fbf22761 Solve missing symbol problem 
svn path=/nixpkgs/trunk/; revision=33642
 2012-04-06 10:20:37 +00:00
Ludovic Courtès
292e9d1029 Ogre: Rewrite using `stdenv'; enable various plug-ins. 
svn path=/nixpkgs/trunk/; revision=33641
 2012-04-06 09:07:23 +00:00
Ludovic Courtès
725745c5b4 Add VRPN. 
svn path=/nixpkgs/trunk/; revision=33640
 2012-04-06 08:32:50 +00:00
Cillian de Roiste
cbded3238d Adding dbus-cplusplus, c++ bindings for dbus 
svn path=/nixpkgs/trunk/; revision=33639
 2012-04-05 23:53:20 +00:00
Peter Simons
799722afde git-annex: updated to version 3.20120405 
svn path=/nixpkgs/trunk/; revision=33638
 2012-04-05 23:11:00 +00:00
Peter Simons
3e5e535bb4 dropped obsolete file 
svn path=/nixpkgs/trunk/; revision=33637
 2012-04-05 23:05:05 +00:00
Peter Simons
4e9175965c Updated Haskell packages. 
- clientsession: updated to version 0.7.4.3
 - data-default: updated to version 0.4.0
 - hoogle: updated to version 4.2.11
 - pandoc: updated to version 1.9.2
 - yesod-core: updated to version 1.0.0.1
 - yesod-form: updated to version 1.0.0.1
 - yesod-static: updated to version 1.0.0.1

svn path=/nixpkgs/trunk/; revision=33636
 2012-04-05 23:03:52 +00:00
Lluís Batlle i Rossell
e7b964ba33 Updating gnash. I'm not sure it builds... it takes a lot of time to build; at 
least it does not fail very early.


svn path=/nixpkgs/trunk/; revision=33635
 2012-04-05 22:34:11 +00:00
Cillian de Roiste
bbd76bc29a Adding ffado, Linux Firewire audio drivers 
svn path=/nixpkgs/trunk/; revision=33634
 2012-04-05 21:53:42 +00:00
Cillian de Roiste
3bf7f18d4d Adding libconfig, a simple library for processing config files 
svn path=/nixpkgs/trunk/; revision=33633
 2012-04-05 21:12:12 +00:00
Yury G. Kudryashov
ef0b72dd6c kde-runtime: drop patch (applied upstream) 
svn path=/nixpkgs/trunk/; revision=33632
 2012-04-05 20:04:51 +00:00
Michael Raskin
0ef5f0961f Trying to remove tarball error 
svn path=/nixpkgs/trunk/; revision=33631
 2012-04-05 19:07:14 +00:00
Ludovic Courtès
c0172418ab hurdPartedCross: Make overridable. 
svn path=/nixpkgs/trunk/; revision=33630
 2012-04-05 17:32:02 +00:00
Peter Simons
5474f1e523 Updated Haskell packages. 
- aeson: updated to version 0.6.0.2
 - attoparsec-conduit: updated to version 0.4.0
 - authenticate: updated to version 1.2.0.1
 - blaze-builder-conduit: updated to version 0.4.0
 - certificate: updated to version 1.1.1
 - conduit: updated to version 0.4.0.1
 - crypto-conduit: updated to version 0.3.0.1
 - hakyll: patched to support the latest version of hamlet
 - hamlet: updated to version 1.0.1
 - happstack-happstack-hamlet: patched to support the latest version of hamlet
 - happstack-server: updated to version 7.0.0
 - hoogle: patched to accept the latest versions of wai, warp, and conduit
 - http-conduit: updated to version 1.4.0.2
 - monadcryptorandom: added version 0.4
 - persistent-sqlite: updated to version 0.9.0
 - persistent-template: updated to version 0.9.0
 - persistent: updated to version 0.9.0
 - pool-conduit: updated to version 0.1.0
 - reactive-banana: updated to version 0.5.0.0
 - shakespeare-css: updated to version 1.0.1
 - shakespeare-i18n: updated to version 1.0.0
 - shakespeare-js: updated to version 1.0.0
 - shakespeare-text: updated to version 1.0.0
 - shakespeare: updated to version 1.0.0
 - simple-sendfile: updated to version 0.2.2
 - texmath: updated to version 0.6.0.4
 - tls-extra: updated to version 0.4.4
 - tls: updated to version 0.9.2
 - wai-app-static: updated to version 1.2.0
 - wai-extra: updated to version 1.2.0.2
 - wai: updated to version 1.2.0
 - warp: updated to version 1.2.0
 - xml-conduit: updated to version 0.7.0.1
 - yaml: updated to version 0.7.0
 - yesod-auth: updated to version 1.0.0
 - yesod-core: updated to version 1.0.0
 - yesod-default: updated to version 1.0.0
 - yesod-form: updated to version 1.0.0
 - yesod-json: updated to version 1.0.0
 - yesod-persistent: updated to version 1.0.0
 - yesod-routes: updated to version 1.0.0
 - yesod-static: updated to version 1.0.0
 - yesod: updated to version 1.0.0
 - zlib-conduit: updated to version 0.4.0
 - zlib-enum: updated to version 0.2.2

svn path=/nixpkgs/trunk/; revision=33629
 2012-04-05 16:51:59 +00:00
Eelco Dolstra
b3980b78f8 * Bump nixUnstable. 
svn path=/nixpkgs/trunk/; revision=33628
 2012-04-05 16:38:03 +00:00
Ludovic Courtès
6caf0820f9 lsh: Assume UNIX98 PTYs are available. 
svn path=/nixpkgs/trunk/; revision=33627
 2012-04-05 16:26:44 +00:00
Eelco Dolstra
e78a048265 * Add a function "filterAttrs" and clean up some comments. 
svn path=/nixpkgs/trunk/; revision=33626
 2012-04-05 15:37:52 +00:00
Yury G. Kudryashov
68b6d23a35 Fix altermime build 
svn path=/nixpkgs/trunk/; revision=33625
 2012-04-05 15:31:10 +00:00
Yury G. Kudryashov
b4e5ce8de5 avahi: use libiconv if needed 
svn path=/nixpkgs/trunk/; revision=33624
 2012-04-05 15:11:19 +00:00
Yury G. Kudryashov
7aeb6ef2bb Remove ksecrets, fix outputHash 
svn path=/nixpkgs/trunk/; revision=33622
 2012-04-05 13:50:47 +00:00
Yury G. Kudryashov
e1743e57be qt-4.8.1, kde-4.8.2 
svn path=/nixpkgs/trunk/; revision=33621
 2012-04-05 13:50:34 +00:00
Eelco Dolstra
8e160830c1 * Doh. 
svn path=/nixpkgs/trunk/; revision=33620
 2012-04-05 13:09:30 +00:00
Eelco Dolstra
9a1080d7ea * Enable NUMA. On our 48-core machines this cut the duration of a 
kernel build from 12m27s to 4m42s.

svn path=/nixpkgs/trunk/; revision=33616
 2012-04-05 12:26:13 +00:00
Eelco Dolstra
7d2b8fe48f * Upstart 1.5. 
svn path=/nixpkgs/trunk/; revision=33615
 2012-04-05 12:24:08 +00:00
Michael Raskin
12e1751e93 Adding Julia programming language 
svn path=/nixpkgs/trunk/; revision=33614
 2012-04-05 12:22:55 +00:00
Michael Raskin
3c69bcf348 Support shared library build; tests do not currently work for shared build. 
svn path=/nixpkgs/trunk/; revision=33613
 2012-04-05 12:18:56 +00:00
Michael Raskin
2f97078c96 Support shared library build 
svn path=/nixpkgs/trunk/; revision=33612
 2012-04-05 12:18:08 +00:00
Sander van der Burg
78d9ee096a Bumped revision of disnix 
svn path=/nixpkgs/trunk/; revision=33610
 2012-04-05 10:45:53 +00:00
Eelco Dolstra
8fb94bace5 * Remove some obsolete kernel.org mirrors. 
svn path=/nixpkgs/trunk/; revision=33609
 2012-04-05 09:12:38 +00:00
Michael Raskin
8c23da31e6 Fix typo 
svn path=/nixpkgs/trunk/; revision=33608
 2012-04-05 08:58:47 +00:00
Mathijs Kwik
c742116695 haskell reactive banana 
svn path=/nixpkgs/trunk/; revision=33606
 2012-04-05 08:22:42 +00:00
Mathijs Kwik
a6c996735c audacity: upgraded to 2.0.0 
I took out some dependencies and compile flags that didn't seem
needed. If this breaks something please give a shout.

svn path=/nixpkgs/trunk/; revision=33605
 2012-04-05 08:22:38 +00:00
Mathijs Kwik
f5fbd16058 portaudio: upgraded to current stable version (svn as well) 
svn path=/nixpkgs/trunk/; revision=33604
 2012-04-05 08:22:35 +00:00
Michael Raskin
407d3173ad Fixing SuiteSparce build 
svn path=/nixpkgs/trunk/; revision=33602
 2012-04-05 08:05:09 +00:00
Michael Raskin
6bc87a1ac8 Add packages to GAP 
svn path=/nixpkgs/trunk/; revision=33601
 2012-04-05 04:46:11 +00:00
Eelco Dolstra
a78b508f8e * Latest nixUnstable. 
svn path=/nixpkgs/trunk/; revision=33599
 2012-04-04 22:59:16 +00:00
Sander van der Burg
4df1d122c4 Bumped revision of DisnixOS 
svn path=/nixpkgs/trunk/; revision=33598
 2012-04-04 22:07:31 +00:00
Lluís Batlle i Rossell
5d15ef0e7c Updating vimprobable2 to 1.0.0 
I took mainly the patch from Alexandr Foremny, but I had to solve conflicts.

Moreover it required the old webkit.


svn path=/nixpkgs/trunk/; revision=33596
 2012-04-04 21:30:49 +00:00
Ludovic Courtès
dd822c7ece GNU: Fix stale references. 
svn path=/nixpkgs/trunk/; revision=33595
 2012-04-04 21:24:09 +00:00
Ludovic Courtès
36200a3ef3 hurdPartedCross: Use `.override' instead of reimporting. 
svn path=/nixpkgs/trunk/; revision=33592
 2012-04-04 21:09:04 +00:00
Ludovic Courtès
3226d8b91d GNU: Avoid `__overrides' altogether, by using a non-recursive attrset. 
Thanks to Eelco for the suggestion.

svn path=/nixpkgs/trunk/; revision=33587
 2012-04-04 20:25:51 +00:00
Ludovic Courtès
1663ca3344 GNU: Use overrides' instead of __overrides' for the argument itself. 
svn path=/nixpkgs/trunk/; revision=33585
 2012-04-04 20:05:48 +00:00
Ludovic Courtès
e0ca8e74ff GNU: Add an `__overrides' parameter. 
svn path=/nixpkgs/trunk/; revision=33584
 2012-04-04 19:50:15 +00:00
Shea Levy
f3f8040aaf kmod: Create compat program symlinks 
svn path=/nixpkgs/trunk/; revision=33579
 2012-04-04 19:28:33 +00:00
Shea Levy
4d0fdc5e6b kmod: respect MODULE_DIR 
svn path=/nixpkgs/trunk/; revision=33578
 2012-04-04 19:24:07 +00:00
Eelco Dolstra
1c62133e9f * Fix email address. 
svn path=/nixpkgs/trunk/; revision=33575
 2012-04-04 16:36:17 +00:00
Rob Vermaas
9a22323099 add svneverever and updated pysvn 
svn path=/nixpkgs/trunk/; revision=33572
 2012-04-04 16:16:07 +00:00
Yury G. Kudryashov
9105d0546d Drop old kdevplatform/kdevelop 
svn path=/nixpkgs/trunk/; revision=33571
 2012-04-04 16:14:57 +00:00
Yury G. Kudryashov
e0b69cfc26 Let hydra build qt-4.8.1 
svn path=/nixpkgs/trunk/; revision=33570
 2012-04-04 16:07:47 +00:00
Eelco Dolstra
8ecdd3a0aa * Don't do a mkdir in the postHook. 
svn path=/nixpkgs/trunk/; revision=33569
 2012-04-04 16:05:08 +00:00
Eelco Dolstra
bf791214c9 * Thunderbird updated to 11.0.1. 
svn path=/nixpkgs/trunk/; revision=33568
 2012-04-04 15:33:33 +00:00
Rob Vermaas
a1d87e58c1 re-add overwritten svn2git (used/developed by kde people) 
svn path=/nixpkgs/trunk/; revision=33567
 2012-04-04 15:30:29 +00:00
Eelco Dolstra
23957ac824 * Updated htop to 1.0.1. 
svn path=/nixpkgs/trunk/; revision=33566
 2012-04-04 14:46:17 +00:00
Eelco Dolstra
b9bdfccec9 * dhcpcd updated to 5.5.5. 
svn path=/nixpkgs/trunk/; revision=33564
 2012-04-04 14:07:57 +00:00
Eelco Dolstra
4ae899f4bf * Mercurial updated to 2.1.2. 
svn path=/nixpkgs/trunk/; revision=33563
 2012-04-04 14:06:04 +00:00
Sander van der Burg
f8af12bfef Bumped the disnixos revision 
svn path=/nixpkgs/trunk/; revision=33562
 2012-04-04 13:24:11 +00:00
Peter Simons
7295830f7e Updated Haskell packages. 
- aeson: updated to version 0.6.0.1
 - alex-meta: updated to version 0.3.0.3
 - BNFC-meta: updated to version 0.3.0.1
 - hakyll: updated to version 3.2.7.1
 - happy-meta: updated to version 0.2.0.4
 - http-enumerator: updated to version 0.7.3.2
 - multiarg: updated to version 0.2.0.0

Disabled Haddock documentation for the following packages, because the
input crashes Haddock:

 - BNFC-meta
 - alex-meta

Re-enabled Haddock documentation for the following packages, because
previously occurring errors have been fixed:

 - ConfigFile
 - HDBC-odbc
 - Hipmunk
 - instant-generics
 - RepLib
 - type-equality
 - xmonad
 - xmonad-extras
 - yesod-core

svn path=/nixpkgs/trunk/; revision=33559
 2012-04-03 18:37:58 +00:00
Sander van der Burg
31a37d918c Bumped libmatthew-java to version 0.8 
svn path=/nixpkgs/trunk/; revision=33555
 2012-04-03 11:56:45 +00:00
Eelco Dolstra
ebae9a9fd7 * Git 1.7.9.5. 
svn path=/nixpkgs/trunk/; revision=33553
 2012-04-03 11:07:50 +00:00
Peter Simons
f35cf87600 removed executable bits from Nix files 
svn path=/nixpkgs/trunk/; revision=33552
 2012-04-03 06:31:19 +00:00
Peter Simons
1726c930cd Updated Haskell packages. 
- fgl-visualize: added meta.maintainers
 - gtk2hs-buildtools: added version 0.12.3
 - network-conduit: added version 0.4.0
 - path-pieces: updated to version 0.1.1
 - void: added version 0.5.5

svn path=/nixpkgs/trunk/; revision=33551
 2012-04-03 06:31:11 +00:00
Russell O'Connor
2c99cdce3e Adding examples to share directory 
The easy-rsa example contains scripts for generating certificates.

svn path=/nixpkgs/trunk/; revision=33550
 2012-04-02 22:05:02 +00:00
Peter Simons
e623ca0e28 graphviz: fixed typos 
Thanks, Eelco.

svn path=/nixpkgs/trunk/; revision=33549
 2012-04-02 21:54:14 +00:00