Eric Bailey
a91afef89e
erlangR19: update maintainers
...
Use the list of direct committers:
https://github.com/NixOS/nixpkgs/commits/master/pkgs/development/interpreters/erlang/R19.nix
Originally, I just copied and pasted from R18.nix, I think.
2017-03-18 00:36:57 -05:00
Eric Bailey
05b1f8276b
erlangR19: 19.2.3 -> 19.3
2017-03-18 00:24:18 -05:00
Joachim F
aa5777df77
Merge pull request #23952 from joachifm/libsodium-bump
...
libsodium: 1.0.11 -> 1.0.12
2017-03-18 02:46:41 +01:00
Renaud
98edb24368
libseccomp: 2.3.1 -> 2.3.2 + fixed scmp_sys_resolver
...
`libseccomp` is updated to 2.3.2
`scmp_sys_resolver` is fixed (it could not find libseccomp.so.2 shared library before)
2017-03-17 22:10:50 +01:00
Rodney Lorrimar
0a2ea18e85
pythonPackages.zeep: init at 1.1.0
...
Works with both Python 2.7 and 3.5.
Tests won't work under Python 3.5 due to the testtools dependency.
2017-03-17 18:40:00 +00:00
Emery Hemingway
7196d16e3f
shapelib: init at 1.4.0
2017-03-17 12:09:37 -05:00
Kamil Chmielewski
017fddb4be
ponyc: 0.11.0 -> 0.11.3
2017-03-17 15:36:10 +01:00
Jörg Thalheim
273e480379
rustNightlyBin: 2017-01-26 -> 2017-03-16 ( #23988 )
...
thanks!
2017-03-17 14:51:28 +01:00
Michael Raskin
8388cb8bff
renpy: 6.17.6 -> 6.99.12.4; still a strange mistake on launch
2017-03-17 14:14:38 +01:00
Peter Simons
8c00f3432a
Merge pull request #23982 from ElvishJerricco/callCabal2nix-dont-rebuild-cabalfile
...
callCabal2nix: Fixed indentation
2017-03-17 13:23:11 +01:00
Linus Heckemann
9b62e41c1e
renpy: mark as broken
2017-03-17 10:07:12 +00:00
Will Fancher
934c8c7a93
callCabal2nix: Fixed indentation
2017-03-17 04:32:34 -04:00
Linus Heckemann
088a1bc311
pygame: 1.9.1 -> 1.9.3
2017-03-17 07:35:35 +00:00
Vincent Laporte
cc012b227f
ocamlPackages.functoria: init at 2.0.2
...
Functoria is a DSL to describe a set of modules and functors, their
types and how to apply them in order to produce a complete application.
Homepage: https://github.com/mirage/functoria
2017-03-17 02:39:15 +00:00
Daniel Peebles
2eb48daa94
Merge pull request #23974 from cleverca22/qtmultimedia
...
qtmultimedia-5.7: disable alsa on darwin
2017-03-16 22:28:19 -04:00
michael bishop
db05f414bd
qtmultimedia-5.7: disable alsa on darwin
2017-03-16 23:15:44 -03:00
Florent Becker
bc26feb1d6
ocamlPackages.ocsigen_toolkit: init at 1.0
2017-03-17 02:09:53 +00:00
Florent Becker
9fd4966429
ocamlPackages.ocsigenserver: add pgocaml support
2017-03-17 01:55:05 +00:00
Florent Becker
e3a77dd49a
ocamlPackages.eliom: 6.0.0 -> 6.2.0
2017-03-17 01:41:48 +00:00
ndowens
c7826f4c9d
libibmad: 1.3.12 -> 1.3.13
2017-03-16 19:42:45 -05:00
ndowens
ed7fb7a265
bobcat: 4.02.00 -> 4.07.00 ( #23742 )
2017-03-17 00:41:33 +01:00
ndowens
7e902f5399
umockdev: init at 0.8.13
...
umockdev: all-packages cosmetic change
2017-03-16 18:05:13 -05:00
ndowens
ca8a0e3c80
libbson:1.1.10 -> 1.6.1
...
libbson: Removed un-needed deps
2017-03-16 23:37:17 +01:00
ndowens
14315cf4f5
babl: 0.1.12 -> 0.1.24
2017-03-16 22:18:08 +01:00
Vincent Laporte
b13f408d8b
pythonPackages.pycassa: fix evaluation
2017-03-16 19:43:28 +00:00
Jörg Thalheim
7967c4aacf
Merge pull request #23877 from ndowens/isocodes
...
iso-codes: 3.56 -> 3.74
2017-03-16 20:20:57 +01:00
Antoine Eiche
f28fe4cfae
pythonPackages.pycassa: init at 1.11.2
...
fixes #23920
2017-03-16 19:23:39 +01:00
Daniel Brockman
5d6ea2d64e
jshon: fix null termination in read_stream.
...
This fixes a somewhat critical (security?) bug.
We are trying to get it merged upstream but have had no response from
the ordinary maintainer in over a week.
(See <https://github.com/keenerd/jshon/issues/53 >.)
fixes #23727
2017-03-16 18:32:04 +01:00
ndowens
00b6d82001
libcouchbase: 2.5.2 -> 2.7.2
...
fixes #23932
2017-03-16 17:33:42 +01:00
ndowens
3cecb95a9d
libdap: 3.15.1 -> 3.18.3
2017-03-16 17:23:03 +01:00
Frederik Rietdijk
2e72372c05
pythonPackages.django_guardian: fix eval
2017-03-16 17:20:08 +01:00
Jörg Thalheim
e82ca0fa01
Merge pull request #23938 from ndowens/libdiscid
...
libdiscid: 0.6.1 -> 0.6.2
2017-03-16 17:15:41 +01:00
Joachim Fasting
c317e5c85d
ldns: split man pages
...
Saves ~1.8MB
2017-03-16 16:15:31 +01:00
Joachim Fasting
3fac05b951
libsodium: 1.0.11 -> 1.0.12
2017-03-16 15:54:20 +01:00
Domen Kožar
a17e8e7e72
servant-auth-server, servant-swagger: enable hydra build
2017-03-16 15:13:04 +01:00
Jörg Thalheim
1d36642fdf
Merge pull request #23941 from ndowens/libextractor
...
libextractor: 1.2 -> 1.3
2017-03-16 14:23:04 +01:00
Jörg Thalheim
6a6470386f
Merge pull request #23923 from kamilchm/go2nix
...
go2nix: 1.1.1 -> 1.2.0
2017-03-16 12:54:05 +01:00
Frederik Rietdijk
645c2189d1
pythonPackages.pytest-django: unpin setuptools_scm
...
- unpin setuptools_scm
- move to file in folder following guidelines
- use PyPI/upstream name
2017-03-16 12:40:43 +01:00
Kranium Gikos Mendoza
9bd988eb0f
sipp: 3.4-beta2 -> 3.5.1
...
fixes #23945
2017-03-16 11:29:38 +01:00
Pascal Wittmann
1ae9a7911c
cligh: fix evaluation
2017-03-16 11:06:30 +01:00
Vincent Laporte
49c18cc75d
ocamlPackages.bos: init at 0.1.4
...
Bos provides support for basic and robust interaction
with the operating system in OCaml.
Homepage: http://erratique.ch/software/bos
2017-03-16 07:11:33 +00:00
Cray Elliott
f60fec99d1
SDL2_mixer: add optional fluidsynth support
...
also add flac support and mp3 support, and add myself as the maintainer,
since there is no current maintainer for this package
2017-03-15 20:44:54 -07:00
Jörg Thalheim
26045faaaf
cligh: init at 0.3
...
fixes #23914
2017-03-16 01:00:21 +01:00
Jörg Thalheim
09cfbc8cc3
PyGithub: init at 1.32
2017-03-16 00:59:56 +01:00
Jörg Thalheim
00addcb95e
pythonPackages.python-jose: init at 1.3.2
2017-03-16 00:59:56 +01:00
ndowens
a89e9e999b
libextractor: 1.2 -> 1.3
2017-03-15 18:19:11 -05:00
Christopher League
cfc7a1877a
clips: init at 6.30
...
CLIPS is a language for building expert systems.
2017-03-16 00:05:02 +02:00
ndowens
a1ea2879f8
libdiscid: 0.6.1 -> 0.6.2
2017-03-15 16:35:49 -05:00
Vincent Laporte
eba3900781
ocamlPackages.rresult: init at 0.5.0
...
Rresult is an OCaml module for handling computation results and errors in an
explicit and declarative manner without resorting to exceptions.
Homepage: http://erratique.ch/software/rresult
2017-03-15 21:21:27 +00:00
Sergii Paryzhskyi
18a272ef75
sbt-0.12.4: add an older stable version ( #23933 )
2017-03-15 21:17:23 +00:00
ndowens
1b67435626
libdc1394: 2.2.3 -> 2.2.5
2017-03-15 16:15:42 -05:00
Daiderd Jordan
373d83516a
Merge pull request #23918 from ashgillman/patch-2
...
ITK builds on darwin
2017-03-15 21:41:52 +01:00
Dan Peebles
0cfa1b0dde
openjdk-darwin: use a sensible crypto policy
...
We should really move to a source build of openjdk on Darwin, but that's
tricky so for now we continue to hack around it and do stuff like this,
even though crypto export polices are stupid and make no sense. No, I'm
not bitter at all that I need to do this 😩
2017-03-15 16:37:57 -04:00
Andrzej Trzaska
376d960034
bundler: 1.14.4 -> 1.14.6 ( #23930 )
2017-03-15 20:34:35 +00:00
Dan Peebles
2ffda66f11
go1.8: patch test to work with recent tzdata
2017-03-15 15:17:11 -04:00
Dan Peebles
e6a5ab85b4
go1.7: patch test to work with recent tzdata
2017-03-15 15:17:11 -04:00
Dan Peebles
08314598bb
go1.6: patch test to work with recent tzdata
2017-03-15 15:17:11 -04:00
Dan Peebles
331f5a886d
go1.4: patch test to work with recent tzdata
2017-03-15 15:17:11 -04:00
Vladimír Čunát
e99bc64552
Merge branch 'master' into staging
...
More larger rebuilds from master, unfortunately.
2017-03-15 19:09:56 +01:00
Vladimír Čunát
9adcebb1a9
Merge #23917 : fix firefox crashes
2017-03-15 17:01:32 +01:00
Kamil Chmielewski
d16b08ac85
go2nix: 1.1.1 -> 1.2.0
2017-03-15 16:09:55 +01:00
Shea Levy
d6c3e74425
buildGoModule: share the buildFlagsArray with the parallel subprocesses
2017-03-15 11:00:55 -04:00
Andrzej Trzaska
162845d5b1
Use gem 2.6.10 ( #23902 )
2017-03-15 14:55:45 +00:00
Ashley Gillman
e7dca2c230
ITK build on darwin
2017-03-15 22:41:20 +10:00
Will Dietz
15ca6e149e
souper: bump to latest--using LLVM 4 and custom KLEE.
...
Add patch to fix the build when LLVM reports no system libs,
llvm-config's behavior changed in LLVM r291285.
Fixes #22920 .
2017-03-15 07:39:25 -05:00
David McFarland
1ea6860cc7
icu: fix crash in firefox
...
Fixes #23857
2017-03-15 08:49:56 -03:00
Will Dietz
c766960150
lit: init at 0.5
2017-03-15 09:02:45 +01:00
Marius Bergmann
ee69ee419b
liquid-dsp: init at 20170307
...
liquid-dsp is a dependency for the latest git version of inspectrum, therefore I
added it in order to be able to upgrade inspectrum.
2017-03-14 23:42:18 +01:00
Bjørn Forsman
db937b9d60
qt57.full: add missing modules
...
qtquickcontrols2, qtwebchannel, qtwebengine, qtwebkit.
Added in the same order as the modules are listed in default.nix (and
then reformatted the block).
2017-03-14 22:27:20 +01:00
Bjørn Forsman
961c73a78c
qt56.full: add missing modules
...
qtquickcontrols2, qtwebkit.
Added in the same order as the modules are listed in default.nix (and
then reformatted the block).
(The qt55 expression already has all modules in *full.)
2017-03-14 22:27:20 +01:00
Markus Schneider
cbf87bc2b2
granite: 0.3.0 -> 0.4.0.1
2017-03-14 22:26:19 +01:00
ndowens
e721905d0f
google-gflags: 2.1.2 -> 2.2.0
...
google-gflags: Changed homepage
2017-03-14 16:04:27 -05:00
Jörg Thalheim
496120c19f
travis: 1.8.2 -> 1.8.8
2017-03-14 21:03:58 +01:00
Lancelot SIX
4f644cd004
gdal: 2.1.1 -> 2.1.3
2017-03-14 17:59:07 +01:00
Frederik Rietdijk
a79c653d5d
Merge pull request #23885 from FRidh/jupyter
...
Jupyter
2017-03-14 17:32:27 +01:00
Frederik Rietdijk
47f7817037
pythonPackages.typed-ast: 1.0.1 -> 1.0.2
2017-03-14 16:52:25 +01:00
Frederik Rietdijk
d7378da028
pythonPackages.configparser: fix with namespace packages
2017-03-14 16:43:46 +01:00
Peter Simons
e916236130
Merge pull request #23615 from ljli/ghcjs-dom-jsffi-fix
...
haskell: ghcjs packages: fix ghcjs-dom-jsffi with newer Cabal
2017-03-14 16:09:37 +01:00
Peter Simons
83df89aa63
Merge pull request #23611 from ljli/ghcjs-shims-update
...
haskell: ghcjs shims: dc034a0 -> b970152
2017-03-14 16:06:08 +01:00
Robin Gloster
770794cbfe
urt: remove
2017-03-14 14:41:28 +01:00
Frederik Rietdijk
33fa4ce2be
Merge pull request #23701 from lsix/update_django-raster
...
pythonPackages.django-raster: 0.3 -> 0.3.1
2017-03-14 13:42:14 +01:00
Frederik Rietdijk
bf86b48b0f
Merge pull request #23813 from ndowens/geis
...
geis: 2.2.16 -> 2.2.17
2017-03-14 13:39:36 +01:00
Frederik Rietdijk
5f837b1b94
Merge pull request #23867 from ndowens/htmlcxx
...
htmlcxx: 0.85 -> 0.86
2017-03-14 13:38:30 +01:00
Frederik Rietdijk
8c99040a7a
Merge pull request #23826 from ndowens/gtkspell
...
gtkspell:3.0.8 -> 3.0.9
2017-03-14 13:36:42 +01:00
Frederik Rietdijk
683dc8cb4f
Merge pull request #23810 from ndowens/ffms2
...
ffms: 2.21 -> 2.22
2017-03-14 13:32:46 +01:00
Daiderd Jordan
dcfff701dc
Merge pull request #23835 from periklis/topic_qt57_submodules_darwin
...
qt57.{qtdeclarative,qtscript,qttranslations}: fix darwin compat
2017-03-14 12:36:22 +01:00
Frederik Rietdijk
a312abedeb
hypothesis: disabled for Python 3.3
2017-03-14 10:49:39 +01:00
ndowens
d46fe334ca
ffmpegthumbnailer: 2.0.10 -> 2.2.0
2017-03-14 09:41:24 +01:00
Periklis Tsirakidis
a6be98c9c1
qt57.{qtdeclarative,qtscript,qttranslations}: fix darwin compat
...
Fixes duplicate linkings issue for Qt-Frameworks provided by qtbase
during configurePhase.
2017-03-14 09:37:37 +01:00
Vincent Laporte
8498f979a1
ocaml-top: 1.1.2 -> 1.1.3
2017-03-14 07:57:59 +00:00
Peter Simons
1d5878166e
Merge pull request #23880 from ElvishJerricco/callCabal2nix-dont-rebuild-cabalfile
...
callCabal2nix: Don't rebuild unchanged cabal file
2017-03-14 08:57:45 +01:00
Volth
d4294265fd
virt-viewer: 2.0 -> 5.0
2017-03-14 04:54:11 +00:00
Will Fancher
24b47526ce
callCabal2nix: Don't rebuild unchanged cabal file
...
It can be quite annoying that callCabal2nix will build a new derivation
if anything in the source has changed, even if the cabal file hasn't.
2017-03-13 22:20:56 -04:00
Dan Peebles
25e75cd580
kube-aws: 0.8.1 -> 0.9.4
...
Also, enable on Darwin
2017-03-13 22:20:52 -04:00
ndowens
706bd194c7
iso-codes: 3.56 -> 3.74
2017-03-13 20:29:03 -05:00
Tim Steinbach
bb26805051
Merge pull request #23874 from NeQuissimus/kotlin_1_1
...
kotlin: 1.0.6 -> 1.1
2017-03-13 20:04:28 -04:00
Tim Steinbach
89c91c6e32
Merge pull request #23873 from NeQuissimus/gradle_3_4_1
...
gradle: 3.4.0 -> 3.4.1
2017-03-13 20:04:05 -04:00
Tim Steinbach
dd015a829f
kotlin: 1.0.6 -> 1.1
2017-03-13 20:03:39 -04:00
Tim Steinbach
56fea1a8c0
gradle: 3.4.0 -> 3.4.1
2017-03-13 20:00:58 -04:00
ndowens
64218d61fc
hwloc: 1.11.2 -> 1.11.6 ( #23870 )
2017-03-14 00:44:28 +01:00
Vladimír Čunát
bfed19cfaa
Merge #23860 : llvmPackages_4: rc4 -> release
2017-03-14 00:02:53 +01:00
Tuomas Tynkkynen
aba0b45b86
Merge remote-tracking branch 'upstream/master' into staging
...
Conflicts:
pkgs/development/libraries/qt-5/5.7/qtbase/default.nix
2017-03-14 00:49:22 +02:00
Lluís Batlle i Rossell
46c9eac980
guile: enable parallel building
...
civodul today on irc said that 2.0.13 likely has the parallel building
issue fixed (case equal-or-over 8 cores). Let's try.
2017-03-13 23:38:52 +01:00
Tim Steinbach
17978fe64c
Merge pull request #23740 from ben-z/nodejs-7.7.2
...
nodejs: 7.7.1 -> 7.7.2
2017-03-13 18:14:32 -04:00
Tim Steinbach
2c1876ec6c
Merge pull request #23844 from frontsideair/flow-41
...
flow: 0.39.0 -> 0.41.0
2017-03-13 18:12:16 -04:00
ndowens
4aee4cc8a5
htmlcxx: 0.85 -> 0.86
2017-03-13 17:11:03 -05:00
Tim Steinbach
bc1f692e49
Merge pull request #23846 from mayflower/jenkins_2.49
...
jenkins: 2.44 -> 2.49
2017-03-13 18:09:19 -04:00
Tim Steinbach
6e0c3e1a6d
Merge pull request #23862 from mimadrid/update/filezilla-3.25.0
...
filezilla: 3.24.0 -> 3.25.0
2017-03-13 17:58:34 -04:00
ndowens
f3dab1a1e9
armadillo: 7.700.0 -> 7.800.0
...
armadillo: Added forgotton version update
2017-03-13 16:38:47 -05:00
Jörg Thalheim
065c05e849
Merge pull request #23801 from zimbatm/pip-tools
...
Pip tools
2017-03-13 22:32:07 +01:00
zimbatm
a3c03eb11f
pip-tools: init at 1.8.1rc3
2017-03-13 22:21:57 +01:00
mimadrid
7e9c815c23
libfilezilla: 0.9.0 -> 0.9.1
2017-03-13 22:17:08 +01:00
zimbatm
5e701625de
pythonPackages.first: init at 2.0.1
2017-03-13 22:08:45 +01:00
Vincent Laporte
369230cc76
ocamlPackages.cpuid: init at 0.1.0
...
cpuid allows detection of CPU features from OCaml.
Homepage: https://github.com/pqwy/cpuid
2017-03-13 20:58:51 +00:00
Will Dietz
f54813d767
llvm4: rc4 -> release!
2017-03-13 14:54:39 -05:00
Michael Raskin
90f2b24fd7
Merge pull request #23850 from makefu/update/radare2
...
radare2: 0.10.6 -> 1.3.0
2017-03-13 19:32:41 +01:00
Vincent Laporte
b2b8a412fb
ocaml-llvm: 3.7.1 -> 3.9.1
2017-03-13 19:14:11 +01:00
makefu
bc1011b330
radare2: 0.10.6 -> 1.3.0
2017-03-13 17:53:12 +01:00
Frederik Rietdijk
57e768f58e
hypothesis: 3.6.0 -> 3.6.1
2017-03-13 16:37:25 +01:00
Frederik Rietdijk
6f90badeac
pythonPackages.hypothesis: fix for python 3.3
2017-03-13 16:37:24 +01:00
Tristan Helmich
4efed1d0d4
jenkins: 2.44 -> 2.49
2017-03-13 15:43:06 +01:00
Fatih Altinok
d23effdedf
flow: 0.39.0 -> 0.41.0
2017-03-13 17:04:36 +03:00
Domen Kožar
609f2fefce
Merge pull request #23836 from expipiplus1/jailbreak-strict-io
...
Haskell Packages: jailbreak strict-io
2017-03-13 13:27:37 +01:00
Joe Hermaszewski
0867ac9963
Haskell Packages: jailbreak strict-io
2017-03-13 11:27:08 +00:00
Robin Gloster
dbbdccdd65
ispc: fix build
2017-03-13 12:07:48 +01:00
Robin Gloster
80bd50a6e4
ponyc: 0.10.0 -> 0.11.0
2017-03-13 11:43:24 +01:00
Robin Gloster
c836651084
purePackages.octave: 0.7 -> 0.9
2017-03-13 11:03:52 +01:00
Michael Raskin
a77380b34c
Merge pull request #23780 from asppsa/pure-0.66
...
pure: 0.64 -> 0.66
2017-03-13 10:56:08 +01:00
Vladimír Čunát
b264486cf1
gnutls: bugfix+security 3.5.9 -> 3.5.10
...
http://gnutls.org/security.html#GNUTLS-SA-2017-3
2017-03-13 10:28:53 +01:00
Robin Gloster
89747d357b
msilbc: fix build
2017-03-13 09:33:15 +01:00
Michael Raskin
7dc3edaa6a
slimerjs: 0.10.2 -> 0.10.3
2017-03-13 08:23:52 +01:00
ndowens
afeb989c5c
gtkspell:3.0.8 -> 3.0.9
2017-03-12 20:38:46 -05:00
ndowens
b64c6b46b1
gssdp: 0.14.11 -> 1.0.1
2017-03-12 19:41:00 -05:00
ndowens
86a23bcfff
gmm: 4.3 -> 5.1
...
gmm: Remove whitespace
2017-03-12 18:51:15 -05:00
Michael Raskin
54b7c3b63f
clisp-git: update to the upstream fix of 32-bit builds
...
The current exact tip fails to build on x86_64, there probably is a
fresher safe commit, but I haven't try bisecting.
2017-03-13 00:00:13 +01:00
ndowens
a2d50e744a
gloox: 1.0.14 -> 1.0.20
2017-03-12 17:56:33 -05:00
Jörg Thalheim
ceeb0de60c
Merge pull request #23773 from ndowens/cdk
...
cdk:5.0-20160131 -> 5.0-20161210
2017-03-12 23:16:19 +01:00
Vladimír Čunát
848423f223
clisp-tip: make the build more reliable
...
Hydra shows it sometimes fails without autoconf:
http://hydra.nixos.org/job/nixos/trunk-combined/nixpkgs.clisp-tip.x86_64-linux
I can't say I understand why this happened.
2017-03-12 23:07:55 +01:00
Benno Fünfstück
6c99f88eec
fix typo in comment
2017-03-12 22:47:28 +01:00
Benno Fünfstück
039c6a6dfa
haskell: comment about configuration-nix.nix's intersectAttrs
2017-03-12 22:45:19 +01:00
obadz
1dd16a9374
coreclr: mark broken
2017-03-12 21:32:27 +00:00
ndowens
f0bb10fea3
geis: 2.2.16 -> 2.2.17
2017-03-12 16:25:18 -05:00
ndowens
d80cb1b080
gecode: 4.4.0 -> 5.0.0
2017-03-12 16:21:13 -05:00
ndowens
3d9d879bc0
ace: 6.3.3 -> 6.4.2
2017-03-12 21:03:42 +00:00
Bo Bakker
1d948ddc01
caf: init at 0.15.3
...
fixes #23772
2017-03-12 21:53:49 +01:00
ndowens
6723703f46
filter-audio: 20150624 -> 0.0.1
2017-03-12 15:43:03 -05:00
ndowens
a7b6f2eee4
ffms: 2.21 -> 2.22
2017-03-12 15:24:05 -05:00
ndowens
fb35166629
fcppt: 1.3.0 -> 2.5.0
2017-03-12 14:53:50 -05:00
ndowens
e86bb4da9d
exosip: 4.0.0 -> 4.1.0
2017-03-12 14:44:58 -05:00
ndowens
7b89e8b2b6
exempi: 2.2.2 -> 2.4.2
2017-03-12 14:33:54 -05:00