Marius Bakke
b50eaa6764
Merge branch 'master' into staging
2022-08-11 22:15:22 +02:00
Tom Fitzhenry
6ba74ab29c
gnu: Remove texlive's dependence on ruby-rspec and ruby-byebug.
...
Motivation: Break the dependency chain from guix to mariadb.
Prior to this patch:
$ guix graph --path guix mariadb
guix@1.3.0-27.598f728
po4a@0.63
texlive-tiny@59745
texlive-latex-base@59745
texlive-hyphen-afrikaans@59745
ruby-hydra@0.0-0.5abfa37
ruby-byebug@11.1.3
ruby-rubocop@1.10.0
ruby-parallel@1.21.0
ruby-mysql2@0.5.2
mariadb@10.5.12
As of this patch:
$ ./pre-inst-env guix graph --path guix mariadb
guix graph: error: no path from 'guix@1.3.0-27.598f728' to 'mariadb@10.5.12'
* gnu/local.mk (dist_patch_DATA): Add texlive-hyph-utf8-no-byebug.patch.
* gnu/packages/patches/texlive-hyph-utf8-no-byebug.patch: New file.
* gnu/packages/tex.scm (hyph-utf8-scripts): Add patch.
(texlive-hyphen-package): Depend on ruby-hydra-minimal.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2022-08-08 17:26:18 +02:00
Tom Fitzhenry
bb907402a6
gnu: Add ruby-hydra-minimal.
...
* gnu/local.mk (dist_patch_DATA): Add ruby-hydra-minimal-no-byebug.patch.
* gnu/packages/patches/ruby-hydra-minimal-no-byebug.patch: New file.
* gnu/packages/ruby.scm (ruby-hydra): Refactor to inherit from ruby-hydra-minimal.
(ruby-hydra-minimal): New variable.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2022-08-08 17:26:18 +02:00
Marius Bakke
88f976d160
gnu: qtwayland: Fix build with GCC 11.
...
* gnu/packages/patches/qtwayland-gcc-11.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/qt.scm (qtwayland)[source](patches): New field.
2022-08-11 00:21:11 +02:00
Marius Bakke
d8d4b81147
gnu: fuse@2: Prepare for newer glibc.
...
* gnu/packages/patches/fuse-glibc-2.34.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/linux.scm (fuse)[source](patches): Add the patch.
[arguments]: Add force-bootstrap phase.
[native-inputs]: Add AUTOCONF, AUTOMAKE, GETTEXT-MINIMAL, and LIBTOOL.
2022-08-11 00:21:10 +02:00
Efraim Flashner
9a53a79fc5
gnu: gnupg: Patch CVE-2022-34903.
...
* gnu/packages/gnupg.scm (gnupg)[replacement]: New field.
(gnupg/replacement): New variable.
* gnu/packages/patches/gnupg-CVE-2022-34903.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
2022-08-09 22:39:26 +03:00
Efraim Flashner
468c95e941
gnu: aspell: Patch CVE-2019-25051.
...
* gnu/packages/aspell.scm (aspell)[source]: Add patch.
* gnu/packages/patches/aspell-CVE-2019-25051.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
2022-08-09 22:13:33 +03:00
Efraim Flashner
5e009a8874
gnu: unzip: Patch for CVE-2022-0529 and CVE-2022-0530.
...
* gnu/packages/compression.scm (unzip)[replacement]: New field.
(unzip/fixed): New variable.
* gnu/packages/patches/unzip-CVE-2022-0529+CVE-2022-0530.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
2022-08-08 19:21:45 +03:00
Efraim Flashner
92769ab282
gnu: libtirpc: Fix CVE-2021-46828.
...
* gnu/packages/onc-rpc.scm (libtirpc)[replacement]: New field.
(libtirpc/fixed): New variable.
(libtirpc-hurd)[source]: Add patch.
* gnu/packages/patches/libtirpc-CVE-2021-46828.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
2022-08-07 17:35:58 +03:00
Efraim Flashner
544ff0b6c2
gnu: shishi: Update to 1.0.3.
...
* gnu/packages/kerberos.scm (shishi): Update to 1.0.3.
[source]: Remove patch.
[arguments]: Remove configure flag overriding libgcrypt detection.
* gnu/packages/patches/shishi-fix-libgcrypt-detection.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Remove it.
2022-08-07 16:16:42 +03:00
FELŠÖCI Marek
b70d6ce627
gnu: mumps: Update to 5.5.1
...
* gnu/packages/maths.scm (mumps): Update to 5.5.1. Stop applying patches as the build configuration has been updated upstream. Allow for further optimized BLR compression by specifying the -DBLR_MT build option.
* gnu/packages/patches/mumps-build-parallelism.patch: File removed.
* gnu/packages/patches/mumps-shared-libseq.patch: File removed.
* gnu/packages/patches/mumps-shared-mumps.patch: File removed.
* gnu/packages/patches/mumps-shared-pord.patch: File removed.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2022-08-05 15:28:04 +02:00
Philip McGrath
14a50b62d4
gnu: ruby-anystyle: Initialize dictionary files.
...
For the GDBM and Marshal dictionary adapters to be useful with their
default settings, we must initialize their data files during the package
build: upstream would initialize them lazily, but that doesn't work with
an immutable installation directory (at least, not without more complex
patches). Otherwise, we would always end up rebuilding the dictionary at
startup, which is “slow” and “not recommended”.
* gnu/packages/patches/ruby-anystyle-fix-dictionary-populate.patch: New
patch.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/ruby.scm (ruby-anystyle)[patches]: Use it.
[arguments]<#:phases>: Add 'populate-dictionaries' phase.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2022-08-04 12:05:52 +02:00
Philip McGrath
bc2de56572
gnu: ruby-anystyle-data: Don't write to installed gem.
...
* gnu/packages/patches/ruby-anystyle-data-immutable-install.patch: New
patch.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/ruby.scm (ruby-anystyle-data)[patches]: Use it.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2022-08-04 12:05:52 +02:00
Philip McGrath
cc5b8cb3c0
gnu: Add ruby-latex-decode.
...
* gnu/packages/patches/ruby-latex-decode-fix-test.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/ruby.scm (ruby-latex-decode): New variable.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2022-08-04 12:05:50 +02:00
Sharlatan Hellseher
cdff1423c0
gnu: Add aoflagger.
...
* gnu/packages/astronomy.scm (aoflagger): New variable.
* gnu/packages/patches/aoflagger-use-system-provided-pybind11.patch:
New file.
* gnu/local.mk (dist_patch_DATA): Add it.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2022-08-04 12:05:47 +02:00
Timotej Lazar
23cc276aaa
gnu: Add barony.
...
* gnu/packages/games.scm (barony): New variable.
* gnu/packages/patches/barony-fix-textures.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2022-08-04 12:05:46 +02:00
John Kehayias
a4c131a749
gnu: Add neko.
...
* gnu/packages/haxe.scm: New module.
(neko): New variable.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add new module.
Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
2022-08-03 14:25:52 +08:00
Vivien Kraus
e2ad0b0f8b
gnu: nsis: Update to 3.08.
...
* gnu/packages/patches/nsis-source-date-epoch.patch: Drop this patch.
* gnu/local.mk (dist_patch_DATA): Remove it.
* gnu/packages/patches/nsis-env-passthru.patch: Adjust the patch.
* gnu/packages/installers.scm (make-nsis): Update to 3.08.
Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
2022-08-03 14:23:00 +08:00
muradm
d7e7494bc4
gnu: Add fail2ban.
...
* gnu/packages/admin.scm (fail2ban): New variable.
* gnu/packages/patches/fail2ban-0.11.2_CVE-2021-32749.patch,
gnu/packages/patches/fail2ban-0.11.2_fix-setuptools-drop-2to3.patch,
gnu/packages/patches/fail2ban-0.11.2_fix-test-suite.patch,
gnu/packages/patches/fail2ban-paths-guix-conf.patch,
gnu/packages/patches/fail2ban-python310-server-action.patch,
gnu/packages/patches/fail2ban-python310-server-actions.patch,
gnu/packages/patches/fail2ban-python310-server-jails.patch: New files.
* gnu/local.mk (dist_patch_DATA): Add them.
Co-authored-by: Ludovic Courtès <ludo@gnu.org>
2022-08-01 17:20:27 +02:00
Maxim Cournoyer
3a656ea836
gnu: jami: Apply upstream patch that fixes a usability issue.
...
* gnu/packages/patches/jami-fix-esc-bug.patch: New patch.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/jami.scm (%jami-sources): Apply it.
2022-07-31 23:08:51 -04:00
Maxim Cournoyer
bdf0fce88e
gnu: libjami: Update to 20220726.1515.da8d1da.
...
* gnu/packages/patches/jami-fix-crash-on-quit.patch: Delete file.
* gnu/packages/patches/jami-images-loading.patch: Likewise.
* gnu/packages/patches/jami-libclient-audio-managers.patch: Likewise.
* gnu/packages/patches/jami-memory-usage.patch: Likewise.
* gnu/local.mk (dist_patch_DATA): De-register removed patches.
* gnu/packages/jami.scm (%jami-version): Update to 20220726.1515.da8d1da.
(libjami)[configure-flags]: Add '--disable-static'.
(jami-apply-custom-patches): Adjust for top directory renaming.
(%ffmpeg-default-configure-flags): Add muxer support
for g726 and g726le. Add demuxer support for g723_1, g726 and g726le. Add
encoder/decoder support for g726, g726le and g723_1. Add decoder support for
g729.
(ffmpeg-jami)[patches]: Add 'libopusenc-reload-packet-loss-at-encode'.
(jami-libclient)[native-inputs]: New field.
[inputs]: Add ffmpeg-jami and libxkbcommon.
[propagated-inputs]: Replace qtbase-5 with qtbase.
2022-07-31 21:55:49 -04:00
Liliana Marie Prikler
9c02f19d6d
gnu: gst-plugins-good: Update to 1.20.3.
...
* gnu/packages/gstreamer.scm (gst-plugins-good): Update to 1.20.3.
[source]<patches>: Remove “gst-plugins-good-fix-test.patch”.
[arguments]<#:phases>: Add ‘absolutize-libsoup-library’ and
‘skip-failing-tests’.
* gnu/packages/patches/gst-plugins-good-fix-test.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
2022-07-28 20:30:43 +02:00
Marius Bakke
6611cabd1c
Merge branch 'master' into staging
2022-07-27 12:33:53 +02:00
Antero Mejr
ecb91c993d
gnu: libphonenumber: Build reproducibly.
...
* gnu/packages/messaging.scm (libphonenumber): Add patch.
* gnu/packages/patches/libphonenumber-reproducible-build.patch: New
file.
* gnu/local.mk (dist_patch_DATA): Register patch.
Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
2022-07-27 16:55:22 +02:00
Marius Bakke
7aab4eddd0
gnu: PHP: Fix test failure with newer cURL.
...
* gnu/packages/patches/php-curl-compat.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/php.scm (php)[source](patches): Add it.
2022-07-23 18:37:57 +02:00
Marius Bakke
8f2be58833
gnu: PHP: Update to 7.4.30.
...
* gnu/packages/php.scm (php): Update to 7.4.30.
[source](patches): Remove obsolete patch.
* gnu/packages/patches/php-openssl_x509_checkpurpose_basic.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
2022-07-23 18:37:57 +02:00
Marius Bakke
abea091dbe
Merge branch 'master' into staging
2022-07-21 23:52:47 +02:00
Felix Gruber
17a8a09795
gnu: libgeotiff: Update to 1.7.1.
...
* gnu/packages/geo.scm (libgeotiff): Update to 1.7.1.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2022-07-18 00:21:31 +02:00
vicvbcun
a0f39b7d79
gnu: eigen: Update to 3.4.0.
...
* gnu/packages/algebra.scm (eigen): Update to 3.4.0.
* gnu/packages/patches/eigen-fix-strict-aliasing-bug.patch: New file.
* gnu/packages/patches/eigen-remove-openmp-error-counting.patch,
gnu/packages/patches/eigen-stabilise-sparseqr-test.patch: Delete files.
* gnu/local.mk (dist_patch_DATA): Update accordingly.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2022-07-23 00:39:56 +02:00
Oleg Pykhalov
b33e1a183f
services: docker: Fix race condition.
...
Fixes <https://issues.guix.gnu.org/38432 >.
* gnu/packages/patches/containerd-create-pid-file.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add this.
* gnu/packages/docker.scm (containerd)[source]: Add this patch.
* gnu/services/docker.scm
(containerd-shepherd-service): Add #:pid-file and #:pid-file-timeout.
* gnu/services/docker.scm (docker-shepherd-service): Add --containerd flag.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
2022-07-13 21:36:41 -04:00
Marius Bakke
4442a5db77
Merge branch 'master' into staging
2022-07-13 23:34:58 +02:00
Nicolas Goaziou
f6b18b5372
gnu: emacs-hyperbole: Update to 8.0.0.
...
* gnu/packages/emacs-xyz.scm (emacs-hyperbole): Update to 8.0.0.
[arguments]<#:include>: Use %default-include.
<#:phases>: Add build fix.
* gnu/packages/patches/emacs-hyperbole-toggle-messaging.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Delete reference to removed file.
2022-07-13 16:02:36 +02:00
Maxim Cournoyer
f0c8abe857
gnu: pokerth: Fix build and modernize package.
...
Fixes <https://issues.guix.gnu.org/51093 >.
* gnu/packages/games.scm (pokerth) [source]: Apply patch
[inputs]: Use new style.
[phases]: Delete trailing #t. Use gexps.
{fix-paths}: Remove the gsasl and libircclient related substitutions.
2022-07-12 11:18:13 -04:00
Reily Siegel
8d922504b2
gnu: home: Add Guix channels service.
...
* gnu/home/services/guix.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add guix.scm.
* doc/guix.texi: Add documentation for home-channels-service.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2022-07-12 01:17:46 +02:00
Greg Hogan
3485984a09
gnu: llvm-3.7, llvm-3.8: Fix build with gcc.
...
* gnu/packages/patches/clang-runtime-3.7-fix-build-with-python3.patch,
gnu/packages/patches/llvm-3.x.1-fix-build-with-gcc.patch: New files.
* gnu/packages/llvm.scm (clang-runtime-3.7, llvm-3.7, llvm-3.8): Use patches.
* gnu/local.mk: Register patches.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2022-07-12 01:17:45 +02:00
Greg Hogan
e5e352ae2a
gnu: llvm-8: Fix build with gcc-10.
...
* gnu/packages/patches/llvm-8-fix-build-with-gcc-10.patch: New file.
* gnu/packages/llvm.scm (clang-8, clang-runtime-8): Update to 8.0.1.
* gnu/packages/llvm.scm (llvm-8): Use patch and update to 8.0.1.
* gnu/local.mk: Register patch.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2022-07-12 01:17:45 +02:00
Efraim Flashner
f3e2d1dddf
gnu: xf86-video-mach64: Update to 6.9.7.
...
* gnu/packages/xorg.scm (xf86-video-mach64): Update to 6.9.7.
[source]: Remove patches.
* gnu/packages/patches/xf86-video-mach64-bool-to-boolean.patch,
gnu/packages/patches/xf86-video-mach64-glibc-2.20.patch: Remove files.
* gnu/local.mk (dist_patch_DATA): Remove them.
2022-07-11 15:13:51 +03:00
Efraim Flashner
ca4bfb0f2d
gnu: rust-bootstrap: Add support for riscv64-linux.
...
* gnu/packages/rust.scm (%mrustc-source): Add patch.
(rust-bootstrap)[native-inputs]: On riscv64-linux add gcc@9:lib.
[supported-systems]: Add riscv64-linux. Adjust comment.
* gnu/packages/patches/mrustc-riscv64-support.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
2022-07-10 20:38:59 +03:00
Felix Gruber
ca291e4f73
gnu: mia: Build against VTK 9.
...
* gnu/packages/image-processing.scm (mia): Build against VTK 9.
[inputs]: Remove vtk-7; add vtk.
[source]: Add mia-vtk9.patch.
* gnu/packages/patches/mia-vtk9.patch: New file.
* gnu/local.mk: Add it.
Signed-off-by: Christopher Baines <mail@cbaines.net>
2022-07-07 22:16:11 +01:00
Maxim Cournoyer
fa4a9016be
gnu: pitivi: Update to 2022.06.0.
...
* gnu/packages/patches/pitivi-fix-build-with-meson-0.60.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): De-register it.
* gnu/packages/video.scm (pitivi): Update to 2022.06.0.
[version]: Do not prefix with previous semver version.
[inputs]{gst-plugins/selection}: Add comment about cvtracker.
{python-librosa}: New input.
2022-07-07 12:19:13 -04:00
Efraim Flashner
5cf9a03b7a
gnu: rust: Bootstrap with rust-1.54.0.
...
* gnu/packages/rust.scm (rust-1.39): Rename to rust-bootstrap. Update to
1.54.0.
[source]: Update snippet to new version. Replace mrustc patch for 1.39.0
with patch for 1.54.0.
[inputs]: Remove libssh2. Replace llvm-9 with llvm. Add gcc-9.
[arguments]: Adjust custom 'setup-mrustc-sources to also create file
with rust version. Adjust custom 'patch-makefiles phase to changes in
mrustc's build steps. Adjust custom 'build phase to follow mrustc's
build steps for rust-1.54.
(rust-1.40): Replace post-bootstrapped rust-1.40 with 1.55.
[arguments]: Add custom 'set-linker-locale-to-utf8 phase. Adjust custom
'build phase. Remove custom 'neuter-tidy phase.
[inputs]: Replace llvm-9 with llvm.
(rust-1.41, rust-1.42, rust-1.43, rust-1.44, rust-1.45, rust-1.46,
rust-1.47, rust-1.48, rust-1.49, rust-1.50, rust-1.51, rust-1.52,
rust-1.53): Remove variables.
* gnu/packages/patches/rust-1.39.0-src.patch: Remove file.
* gnu/packages/patches/rust-1.54.0-src.patch: Add file.
* gnu/local.mk (dist_patch_DATA): Register changes.
2022-07-05 12:52:48 +03:00
Efraim Flashner
b56dad9b2c
gnu: tbb: Fix building on riscv64-linux.
...
* gnu/packages/tbb.scm (tbb)[source]: Add patch.
* gnu/packages/patches/tbb-other-arches.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
2022-07-04 11:14:41 +03:00
Efraim Flashner
89fe091bb4
gnu: curl: Fix build on some systems.
...
* gnu/packages/curl.scm (curl-7.84.0)[source]: Add patch to work around
implicit function declaration.
* gnu/packages/patches/curl-easy-lock.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
2022-07-03 10:07:38 +03:00
Jan (janneke) Nieuwenhuizen
36a0ec9e78
gnu: mcrl2: Update to 202206.0.
...
* gnu/packages/patches/mcrl2-fix-1687.patch,
gnu/packages/patches/mcrl2-fix-counterexample.patch: New files.
* gnu/local.mk (dist_patch_DATA): Add them.
* gnu/packages/maths.scm (mcrl2): Update to 202206.0 and use them.
2022-07-01 15:45:37 +02:00
Marius Bakke
66e3adcad8
gnu: Remove unused patch.
...
This is a follow-up to commit fce910af55
.
* gnu/packages/patches/postgresql-riscv-spinlocks.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
2022-06-24 00:07:32 +02:00
Marius Bakke
a6bc7baa54
gnu: freeglut: Update to 3.2.2.
...
* gnu/packages/gl.scm (freeglut): Update to 3.2.2.
[source](uri): Switch to new primary download location.
[source](patches): Remove.
* gnu/packages/patches/freeglut-gcc-compat.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
2022-06-23 19:55:43 +02:00
Maxim Cournoyer
92121b8e9d
gnu: Add phoronix-test-suite.
...
* gnu/packages/patches/phoronix-test-suite-fsdg.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/benchmark.scm (phoronix-test-suite): New variable.
(gcc-toolchain*): Likewise.
2022-06-22 10:48:37 -04:00
Andreas Enge
d13ffd1580
gnu: cmh: Add patch to work with current fplll.
...
* gnu/packages/patches/cmh-support-fplll.patch: New file.
* gnu/packages/algebra.scm (cmh)[source]: Add patch.
* gnu/local.mk (dist_patch_DATA): Register patch.
2022-06-21 16:12:47 +02:00
Philip McGrath
d5a9f2a404
gnu: Add cctools.
...
* gnu/packages/darwin.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
* gnu/packages/darwin.scm (cctools): New variable.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2022-06-19 23:14:56 +02:00
Pierre Langlois
185ae9b410
gnu: docker: Update to 20.10.17.
...
* gnu/packages/docker.scm (%docker-version): Update to 20.10.17.
(docker-libnetwork)[source]: Update commit according to vendor.conf. Reset
revision to 1. Simplify snippet.
(docker)[origin]: Remove docker-fix-tests.patch.
[arguments]: Adapt 'patch-paths phase, substitute "ip6tables" and
buildkit-qemu. Remove trailing #t.
[native-inputs]: Replace go-1.14 by go.
(docker-cli)[source]: Update hash.
[arguments]: Set GO_LINKMODE to "dynamic". Remove trailing #t.
[phases]{check}: Replace 'if' with 'when'.
* gnu/packages/networking.scm (go-sctp): Update commit according to
docker-libnetwork's vendor.conf.
* gnu/packages/patches/docker-fix-tests.patch: Delete.
* gnu/local.mk (dist_patch_DATA): Remove patch.
Co-authored-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
2022-06-23 23:54:19 -04:00