Eelco Dolstra
5cbf69564b
pulseaudio: Combat dependency bloat
...
In particular, don't depend on GTK+ 3.
2015-05-11 18:17:59 +02:00
Eelco Dolstra
c206c9cd95
libmicrohttpd: Don't enable some expensive features by default
...
Commit c5d13d4fe9
caused libmicrohttpd
to be not so micro anymore, increasing its closure size from 40 MiB to
283 MiB, which is annoying for packages like systemd that use it. So
don't enable httpd/spdy support by default.
2015-05-11 14:46:27 +02:00
codyopel
46d30ae22f
mkvtoolnix: 7.8.0 -> 7.9.0
2015-05-11 06:20:12 -04:00
Arseniy Seroka
c0727fb751
Merge pull request #7788 from Lassulus/charybdis
...
add charybdis nixos module
2015-05-11 12:57:58 +03:00
lassulus
caf62e8bfb
add charybdis to nixpkgs
2015-05-11 11:38:43 +02:00
Domen Kožar
bb4d658f64
Merge branch 'master' into staging
...
Conflicts:
nixos/doc/manual/release-notes/rl-unstable.xml
nixos/modules/services/printing/cupsd.nix
pkgs/applications/misc/calibre/default.nix
pkgs/development/haskell-modules/hackage-packages.nix
pkgs/development/libraries/libsodium/default.nix
pkgs/misc/emulators/wine/unstable.nix
pkgs/top-level/all-packages.nix
2015-05-11 10:05:23 +02:00
Kranium Gikos Mendoza
6f634e3c3a
Add kbdlight package and setuid wrapper
...
update nixos/modules/programs/kbdlight.nix to use mkEnableOption
2015-05-11 13:23:01 +08:00
William A. Kennington III
142b48688c
edac-utils: Add derivation
2015-05-10 18:18:31 -07:00
Charles Strahan
9d9e21c7fd
mesos: 0.21.0 -> 0.22.0
...
This also enables the network isolation feature that was introduced in
Mesos 0.20.0.
2015-05-10 17:23:20 -04:00
Tobias Geerinckx-Rice
029db1fdf4
Merge pull request #7401 from bendlas/geoip-database
...
geoip: Install geolite database by default
2015-05-10 22:20:44 +02:00
Herwig Hochleitner
ae6d2796bc
wine: add 64 bit build and nixpkgs configuration
...
The default release channel (stable/unstable) and the default
build (wine32/wine64/wineWow) can be customized via the "wine" key in config
2015-05-10 15:45:01 +02:00
William A. Kennington III
862510079a
cups: 1.7.5 -> 2.0.2
2015-05-10 13:46:32 +02:00
Domen Kožar
5c6f159cd5
subunit: split package into everything and python lib
2015-05-10 13:46:30 +02:00
Domen Kožar
4827deaf00
pythonPackages: a bunch of build fixes
2015-05-10 13:46:30 +02:00
codyopel
c250cf6f53
libsodium: refactor & remove duplicate
2015-05-10 13:46:29 +02:00
Erik Timan
d57a93f04b
python-packages: icalendar 3.8.4 -> 3.9.0
...
dateutil is a new depencency for icalendar 3.9.0.
2015-05-10 13:46:02 +02:00
Erik Timan
7dbe0ff77b
python-packages: disable older than 2.7 for azure
2015-05-10 13:46:02 +02:00
Erik Timan
34b50b6765
python-packages: azure 0.10.0 -> 0.10.2
2015-05-10 13:46:02 +02:00
Brian McKenna
a6f1db46e7
Add EventStore package
...
This turns the V8 expression into a generic build, so that we can
build with the required version.
2015-05-10 13:46:02 +02:00
Tobias Geerinckx-Rice
8bba7c5cf1
Add cfr 0_100: another Java decompiler
2015-05-10 13:46:01 +02:00
rushmorem
a7a0fcfbd2
Add s3ql package
...
S3QL is a file system that stores all its data online using storage
services like Google Storage, Amazon S3, or OpenStack. S3QL effectively
provides a hard disk of dynamic, infinite capacity that can be accessed
from any computer with internet access running Linux, FreeBSD or OS-X.
2015-05-10 13:46:01 +02:00
koral
81549b0136
Added jellyfish python package.
2015-05-10 13:46:00 +02:00
Aistis Raulinaitis
4672fa43d9
z3 opt
2015-05-10 13:46:00 +02:00
Tobias Geerinckx-Rice
f904376904
Add alloy 4.2_2015-02-22: relational modeller
2015-05-10 13:46:00 +02:00
Tobias Geerinckx-Rice
b9b8fec6ae
Add phc-intel: undervolt Intel CPUs under Linux
2015-05-10 13:45:59 +02:00
Eric Seidel
927faba5c7
emacs-packages: add swiper
2015-05-10 13:45:59 +02:00
John Wiegley
ec1e3050fe
coqPackages.QuickChick: New expression
2015-05-10 13:45:59 +02:00
Stewart Mackenzie
d1d5f587b2
hackrf: new package
2015-05-10 13:45:59 +02:00
William A. Kennington III
861e5e7573
gnutls: Remove potentially insecure 3.2
2015-05-10 13:45:59 +02:00
Bart Brouns
6a51742e4b
add x42-plugins: a collection of LV2 plugins by Robin Gareus
2015-05-10 13:45:26 +02:00
Lluís Batlle i Rossell
caeaddcf18
Enabling NEON for armv7l. Also use a common platform for armv7.
...
I added some comments about our decision for fpu flags. It's about the boards
we have in mind to support. NVidia Tegra2 is out, because it lacks neon.
2015-05-10 10:59:29 +00:00
William A. Kennington III
d6edaea4f7
cups: 1.7.5 -> 2.0.2
2015-05-10 12:41:20 +02:00
Domen Kožar
90ee280913
subunit: split package into everything and python lib
2015-05-10 11:39:42 +02:00
Domen Kožar
7142d47991
pythonPackages: a bunch of build fixes
2015-05-10 10:11:29 +02:00
Domen Kožar
7bda733f8b
Merge pull request #7782 from olcai/python-azure
...
python-packages: azure 0.10.0 -> 0.10.2
2015-05-10 09:18:34 +02:00
Domen Kožar
646ae5458c
Merge pull request #7783 from olcai/icalendar
...
python-packages: icalendar 3.8.4 -> 3.9.0
2015-05-10 09:17:28 +02:00
Arseniy Seroka
442a271bc9
Merge pull request #7752 from puffnfresh/package/eventstore
...
Add EventStore package
2015-05-10 01:28:38 +03:00
codyopel
7a794e1797
libsodium: refactor & remove duplicate
2015-05-09 18:20:06 -04:00
Erik Timan
f541c61e22
python-packages: icalendar 3.8.4 -> 3.9.0
...
dateutil is a new depencency for icalendar 3.9.0.
2015-05-09 23:33:12 +02:00
Erik Timan
8d8c7c3600
python-packages: disable older than 2.7 for azure
2015-05-09 20:02:40 +00:00
Erik Timan
b884826d15
python-packages: azure 0.10.0 -> 0.10.2
2015-05-09 19:32:32 +00:00
Brian McKenna
1ad2fa452a
Add EventStore package
...
This turns the V8 expression into a generic build, so that we can
build with the required version.
2015-05-09 11:46:01 -06:00
Benjamin Saunders
f392d36b17
libuv: version 1.5.0
2015-05-09 17:13:51 +00:00
Tobias Geerinckx-Rice
41ad1f947b
Add cfr 0_100: another Java decompiler
2015-05-09 17:38:35 +02:00
Arseniy Seroka
a360ce48ec
Merge pull request #7774 from rushmorem/s3ql
...
Add s3ql package
2015-05-09 17:41:06 +03:00
rushmorem
cd11803aa1
Add s3ql package
...
S3QL is a file system that stores all its data online using storage
services like Google Storage, Amazon S3, or OpenStack. S3QL effectively
provides a hard disk of dynamic, infinite capacity that can be accessed
from any computer with internet access running Linux, FreeBSD or OS-X.
2015-05-09 16:28:11 +02:00
Arseniy Seroka
23a95ffe6b
Merge pull request #7773 from k0ral/jellyfish
...
Added jellyfish python package
2015-05-09 15:44:56 +03:00
Arseniy Seroka
4fd4112593
Merge pull request #7765 from sheganinans/master
...
Z3 solver, optimization edition.
2015-05-09 15:42:10 +03:00
koral
ea9969b0e4
Added jellyfish python package.
2015-05-09 09:10:47 +00:00
Aistis Raulinaitis
a5a740a17a
z3 opt
2015-05-08 23:45:07 -07:00
Tobias Geerinckx-Rice
4c5d3f5a71
Add alloy 4.2_2015-02-22: relational modeller
2015-05-09 01:25:59 +02:00
Tobias Geerinckx-Rice
1f6c2a97ef
Add phc-intel: undervolt Intel CPUs under Linux
2015-05-09 01:25:58 +02:00
Eric Seidel
daa5938c6a
emacs-packages: add swiper
2015-05-08 14:16:21 -07:00
Arseniy Seroka
c9919a64e4
Merge pull request #7758 from magnetophon/x42-plugins-master
...
add x42-plugins: a collection of LV2 plugins by Robin Gareus
2015-05-09 00:02:09 +03:00
Pascal Wittmann
52c1fab46d
Merge pull request #7762 from sjmackenzie/hackrf
...
hackrf: new package
2015-05-08 22:12:13 +02:00
John Wiegley
1da4d8b5c9
coqPackages.QuickChick: New expression
2015-05-08 11:35:23 -05:00
Stewart Mackenzie
816cca89b6
hackrf: new package
2015-05-08 23:34:31 +08:00
William A. Kennington III
f5ea3fe589
gnutls: Remove potentially insecure 3.2
2015-05-08 06:08:46 -07:00
William A. Kennington III
c9395e1e92
Merge branch 'master' into staging
2015-05-08 05:59:50 -07:00
Luca Bruno
eb98989cf0
Add libcrafter and tracebox
2015-05-08 13:20:27 +02:00
Bart Brouns
d3ceff38d4
add x42-plugins: a collection of LV2 plugins by Robin Gareus
2015-05-08 13:07:31 +02:00
cillianderoiste
8849e8daa3
Merge pull request #7750 from magnetophon/artFX-master
...
add artyFX: A LV2 plugin bundle of effects
2015-05-08 10:00:08 +02:00
Daniel Peebles
b1a217ec55
Merge pull request #7637 from spwhitt/sdl
...
SDL*: Fix on Darwin
2015-05-08 01:16:39 -04:00
Thomas Tuegel
55a2edb893
mlt-qt5: fix build with Qt 5.4
2015-05-07 21:49:53 -05:00
viric
1b982918f5
Merge pull request #7740 from dezgeg/arm
...
ARM changes for the Jetson TK1 (and other multiplatform boards)
2015-05-07 20:53:07 +02:00
Michael Phillips
2bfff5a8ef
Update powerline to 2.1
2015-05-07 12:14:53 -05:00
Bart Brouns
27d57966f5
add artyFX: A LV2 plugin bundle of effects
2015-05-07 17:51:05 +02:00
Tobias Geerinckx-Rice
72d925f7ef
Add libpsl 0.7.1: Publix Suffix List C library
2015-05-07 16:08:48 +02:00
Peter Simons
8ea440b59b
Merge pull request #7600 from jraygauthier/jrg/add_diagrambuilder_stdalone_pkg
...
Added standalone diagram-builder haskell package.
2015-05-07 11:16:01 +02:00
William A. Kennington III
074c4a7f78
Merge remote-tracking branch 'upstream/master' into staging
2015-05-07 01:44:49 -07:00
aszlig
c7e7f12ef6
uqm: Bring back package and fix 3do extractor.
...
It was dropped in 324719a5a6
.
The UQM package itself doesn't require Haskell, but in order to extract
contents from the 3do version of the game, we need to have a small
helper utility which I wrote in Haskell a while ago. In order to switch
it to Haskell NG, only very minor modifications were necessary, which
are now done with this commit instead of dropping the whole game.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-05-07 08:03:06 +02:00
Dan Peebles
35ddd2543a
Revert "Fix bundler HEAD"
...
This reverts commit 00c4c52277
.
2015-05-07 01:10:46 -04:00
Dan Peebles
00c4c52277
Fix bundler HEAD
2015-05-07 00:11:00 -04:00
Tuomas Tynkkynen
a6aa673849
ARMv7 platforms: switch header config to multi_v7_defconfig
...
Otherwise they wouldn't be able to share a binary cache since glibc et
al would get a different hash due to different linux-headers package.
2015-05-07 06:04:10 +03:00
Tuomas Tynkkynen
a7c4aba896
ARM: Assume armv7l-hf-multiplatform instead of beaglebone
...
Several places in the tree associate the ARMv7 system
with the beaglebone platform. Change them to point to
armv7l-hf-multiplatform as it supports several boards (including the
beaglebone as well)
2015-05-07 06:04:10 +03:00
Tuomas Tynkkynen
0d5e144210
platforms: Add ARMv7 (hard float) multiplatform
...
Based on the 'multi_v7_defconfig' that supports numerous boards.
2015-05-07 06:04:10 +03:00
cillianderoiste
9cb6ebe15e
Merge pull request #7678 from magnetophon/ingen-master
...
update ingen
2015-05-06 19:26:35 +02:00
cillianderoiste
cb9a681131
Merge pull request #7715 from magnetophon/ir.lv2-master
...
add ir.lv2, a convolution plugin.
2015-05-06 19:01:29 +02:00
William A. Kennington III
4559bc015d
hiredis: 0.13.0 -> 0.13.1
2015-05-06 09:42:50 -07:00
Thomas Tuegel
68350c5b9f
add signon
2015-05-06 10:53:01 -05:00
Thomas Tuegel
10d1a9cf8e
add accounts-qt
2015-05-06 10:32:40 -05:00
Rob Vermaas
290132bf89
Disable hiredis in rsyslog as it is currently broken.
2015-05-06 15:32:07 +00:00
Charles Strahan
ae8c6092e7
pwmt: update packages (zathura, jumanji, girara)
...
This updates (and fixes) the mupdf backend for zathura, and bumps the
versions for other related packages.
2015-05-06 10:36:30 -04:00
Bart Brouns
c99af2710d
add ir.lv2, a convolution plugin.
2015-05-06 15:16:08 +02:00
Thomas Tuegel
abb76bcdad
add libaccounts-glib-1.16
2015-05-06 07:34:18 -05:00
Shea Levy
3aff74a7a2
Resurrect old cloog and isl for gcc-4.9
...
Fixes #7723
Refs 8af39c1cf7
Refs 5cd11989c5
2015-05-06 08:32:12 -04:00
Thomas Tuegel
09af6d4572
add telepathy-qt5
2015-05-06 07:08:20 -05:00
Bart Brouns
3ca38da728
add Sorcer, an LV2 synth.
2015-05-06 13:14:14 +02:00
Domen Kožar
bc453c868e
Merge pull request #7720 from Ralith/libuv
...
libuv: version 1.4.2
2015-05-06 11:29:52 +02:00
Damien Cassou
46952b1b4e
Merge pull request #7705 from DamienCassou/new-package-open-pdf-presenter
...
Add package for open-pdf-presenter
2015-05-06 10:47:41 +02:00
Damien Cassou
a043b3ba9f
Add package for open-pdf-presenter
2015-05-06 10:02:32 +02:00
Lluís Batlle i Rossell
0c5be7164c
sheevaplug: fix kernel build.
...
I added platform.kernelMakeFlags. This allows setting the required
parameter to make the required kernel uImage for the sheevaplug,
since it became a platform with devicetree (3.10).
I have tried it with linux 3.18 and it built fine.
2015-05-06 09:50:51 +02:00
Benjamin Saunders
7f00ab7f67
libuv: version 1.4.2
2015-05-06 01:44:24 +00:00
Peter Simons
324719a5a6
Drop obsolete pre-NG Haskell builds.
2015-05-05 21:44:47 +02:00
Tobias Geerinckx-Rice
897897cc30
Add flexc++ 2.02.00: C++ lexical scanner generator
2015-05-05 19:44:48 +02:00
Tobias Geerinckx-Rice
32ff988030
Add bobcat 3.25.01: C++ helper library
2015-05-05 19:44:47 +02:00
Tobias Geerinckx-Rice
c37ca32be2
Add picoc 2015-05-04: a very small C interpreter
2015-05-05 19:43:20 +02:00
Tobias Geerinckx-Rice
d80f6f8d6f
python-packages: add repocheck 2015-05-04
...
This script gives status information for code repositories found
recursively under a root directory. In particular, it tells whether
there are uncommitted changes, untracked files, unpushed or unpulled
commits. Thanks to the -u option, it is also useful to fetch updates
for all the remotes in the encountered repositories.
2015-05-05 19:43:19 +02:00
Tobias Geerinckx-Rice
2c62a0a930
Add egypt 1.10: create simple C call graphs
2015-05-05 19:43:18 +02:00
Rob Vermaas
b114eab794
le: add psutil to dependencies
2015-05-05 13:26:55 +00:00
Arseniy Seroka
232222536e
Merge pull request #7685 from magnetophon/zam-plugins-master
...
add zam-plugins: a set of audio plugins
2015-05-05 15:03:04 +03:00
Bart Brouns
0d8af2ce9a
add zam-plugins: a set of audio plugins
2015-05-05 13:57:06 +02:00
Arseniy Seroka
eaa5e2309f
spacefm: update and add dep
2015-05-05 02:59:25 +03:00
Edward Tjörnhammar
b7aeeee043
pythonPackages.httpretty: disable testing
2015-05-04 23:41:54 +02:00
Edward Tjörnhammar
210452aacd
Merge pull request #7683 from codyopel/fix-tornado
...
tornado: fix breakage from a5b17ec
2015-05-04 23:34:44 +02:00
Edward Tjörnhammar
649d6a6b71
Merge pull request #7687 from joachifm/freemind-1_0_1
...
freemind: 0.9.0 -> 1.0.1
2015-05-04 17:02:50 +02:00
Joachim Fasting
ca27e79025
freemind: 0.9.0 -> 1.0.1
...
See http://freemind.sourceforge.net/wiki/index.php/FreeMind_1.0.0:_The_New_Features
for an overview of changes in version 1.
Tested briefly by creating, saving & loading a simple mind map. The
problems referred to in the previous version of the build recipe
do not occur for me.
This patch simplifies the build somewhat, but it could still be improved
by not copying the freemind dist wholesale into nix-support and replacing
freemind.sh with a more specialized wrapper.
2015-05-04 13:57:14 +02:00
Peter Simons
f8743f3dcd
hedgewars: convert the build to Haskell NG
2015-05-04 12:43:24 +02:00
Peter Simons
c34b6df8d8
all-packages.nix: drop the NG bit from Haskell
...
Renamed haskell-ng --> haskell and haskellngPackages --> haskellPackages.
2015-05-04 12:27:03 +02:00
Peter Simons
436fbf8564
uhc: convert build to Haskell NG
2015-05-04 12:27:03 +02:00
Peter Simons
a186500417
jhc: convert build to Haskell NG
2015-05-04 12:27:03 +02:00
Peter Simons
7299118724
Remove obsolete Haskell attribute name compatibility layer.
2015-05-04 12:27:03 +02:00
Peter Simons
c0f0a20961
pkgs/top-level/release.nix: haskell-ng --> haskell
2015-05-04 12:27:03 +02:00
Peter Simons
c0c82ea2eb
Replace old "haskellPackages" code with Haskell NG.
2015-05-04 12:27:02 +02:00
Bart Brouns
9bf7b293e6
make lilv and sord svn versions separate.
2015-05-04 11:58:12 +02:00
Domen Kožar
21a7e39b0b
Merge pull request #7658 from benley/jenkins-job-builder
...
New package: jenkins-job-builder
2015-05-04 10:34:52 +02:00
codyopel
63ea868735
tornado: fix breakage from a5b17ec
...
tornado 4.x now depends on certifi
add tornado 3.2.2 back for packages not compatible with 4.x
2015-05-04 03:33:31 -04:00
William A. Kennington III
9740b0d12d
kerberos: Modernize build
2015-05-03 20:30:09 -07:00
William A. Kennington III
f73682c526
ncurses: Cleanup abi version
2015-05-03 20:30:09 -07:00
Pascal Wittmann
21141d05f5
Merge pull request #7657 from teh/master
...
Add shairport sync binary.
2015-05-03 21:57:52 +02:00
Arseniy Seroka
6cecc2baf5
Merge pull request #7677 from philandstuff/add-pam-u2f-support
...
Add PAM support for U2F devices
2015-05-03 21:47:11 +03:00
Philip Potter
2216728979
add support for pam_u2f to nixos pam module
...
This adds support for authenticating using a U2F device such as a
yubikey neo.
2015-05-03 19:22:00 +01:00
Benjamin Staffin
3a371528bb
New package: jenkins-job-builder
2015-05-03 10:58:17 -07:00
cillianderoiste
d53fa28109
Merge pull request #7670 from magnetophon/Ardour4-master
...
add Ardour4
2015-05-03 19:43:47 +02:00
Lluís Batlle i Rossell
3bac56f1ab
nodePackages_0_12: use nodejs 0.12. Bad copypaste.
2015-05-03 18:19:42 +02:00
Lluís Batlle i Rossell
919de285eb
Fix nodePackages naming (evaluation error)
2015-05-03 18:18:43 +02:00
Lluís Batlle i Rossell
9be8b790f8
Choosing a different nodejs for armv5tel.
...
nodejs 0.12 doesn't build in armv5 or without fpu, it seems.
I tested this change on armv5tel, branch staging.
2015-05-03 18:02:55 +02:00
Tom Hunger
6d219ff222
Add shairport sync binary.
...
This binary allows to run a local airtunes server.
2015-05-03 14:47:58 +01:00
Andreas Baldeau
c7bb01cfa2
Added Font Awesome TTF font.
2015-05-03 14:55:04 +02:00
Aristid Breitkreuz
365fd9efeb
use gnutls rtmpdump for ffmpeg, as it doesnot build otherwise
2015-05-03 11:47:25 +00:00
Bart Brouns
797c6d3fab
cleanup Ardour 3 and Ardour 4
2015-05-03 13:03:41 +02:00
Bart Brouns
de0aa2d099
add Ardour4
2015-05-03 12:24:52 +02:00
Shea Levy
123ca02fe3
gcc51: rename gcc5 in light of new versioning scheme
2015-05-03 06:10:26 -04:00
Domen Kožar
36e2a9d3bd
Merge pull request #7656 from joachifm/redundant-docutils
...
Delete redundant docutils expression
2015-05-03 04:36:05 +02:00
William A. Kennington III
36f6601e12
gnuk: Add derivation for fst-01
2015-05-02 15:54:42 -07:00
Pascal Wittmann
9dcac56f34
bzrTools: update from 2.5 to 2.6 and refactor
2015-05-03 00:02:04 +02:00
Pascal Wittmann
2514f80bdf
removed phpPackages.apc
...
We no longer build packages for php-5.4 and apc is
obsolete and will not build for later versions of php.
See #7615 and #7518 .
2015-05-02 23:16:21 +02:00
Pascal Wittmann
ca03cf5c70
xmoto: refactor, remove patches and add myself to maintainers
2015-05-02 23:14:19 +02:00
Pascal Wittmann
2fee606d86
Merge pull request #7662 from joachifm/chipmunk-7
...
chipmunk: 6.1.5 -> 7.0.0
2015-05-02 22:42:41 +02:00
Utku Demir
a5b17ecc94
pythonPackages.tornado: 3.2 -> 4.1
2015-05-02 22:05:00 +02:00
Utku Demir
c9f7c574ec
pythonPackages.pyzmq: 13.0.0 -> 14.5.0
2015-05-02 22:04:53 +02:00
Edward Tjörnhammar
1a6cddff0e
pythonPackages.httpretty: add certifi dependency
2015-05-02 22:03:30 +02:00
Thomas Tuegel
d1bf222c14
ghc: GHC 7.x.y binary builds need libncursesw.so.5
2015-05-02 14:43:34 -05:00
Thomas Tuegel
5535793302
ncurses5: add old ABI version for binary packages
2015-05-02 14:43:16 -05:00
Luca Bruno
bb9ee2ab55
Add vala 0.28
2015-05-02 14:45:21 +02:00
Joachim Fasting
d1df0cd873
chipmunk: 6.1.5 -> 7.0.0
2015-05-02 13:34:22 +02:00
William A. Kennington III
e9ee5f9961
libssh2: Modernize Build
2015-05-01 19:13:14 -07:00
William A. Kennington III
60eda8f64d
libassuan1: Remove
2015-05-01 17:48:25 -07:00
William A. Kennington III
a71f78acf7
libgcrypt: Massive cleanup and make 1.6 the default
2015-05-01 17:41:42 -07:00
William A. Kennington III
5e3fe3916a
curl: Modernize build
2015-05-01 15:57:14 -07:00