TakeV/guix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
111367 commits 103 branches 35 tags 492 MiB
Commit graph

3959 commits

Author SHA1 Message Date
Ludovic Courtès
140c0f11b3
home: Add gpg-agent service. 
* gnu/home/services/gnupg.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
* doc/guix.texi (GNU Privacy Guard): New node.
(Secure Shell): Link to it.
 2023-04-12 08:29:26 -04:00
Andy Tai
4239b6ac85
gnu: a2ps: Update to 4.15.3. 
* gnu/packages/pretty-print.scm (a2ps): Update to 4.15.3.
[inputs]: Add FILE, LIBGC, LIBPAPER. Re-order alphabetically.
[native-inputs]: Add PKG-CONFIG. Re-order alphabetically.
* gnu/packages/patches/a2ps-CVE-2001-1593.patch,
  gnu/packages/patches/a2ps-CVE-2014-0466.patch,
  gnu/packages/patches/a2ps-CVE-2015-8107.patch: Remove.
* gnu/local.mk (dist_patch_DATA): Remove entries above.

Signed-off-by: Nicolas Goaziou <mail@nicolasgoaziou.fr>
 2023-04-12 08:26:29 -04:00
Liliana Marie Prikler
3a1a70b447
gnu: Separate potassco packages into their own module. 
* gnu/packages/potassco.scm: New file.
* gnu/packages/maths.scm (libpotassco, clasp, clingo, python-clingo)
(python-telingo): Move to potassco module.  Adjust imports accordingly.
* gnu/packages/emacs-xyz.scm (emacs-pasp-mode): Move to potassco module.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add %D%/packages/potassco.scm.
 2023-04-12 08:26:24 -04:00
Julien Lepiller
55f9bfeda9
gnu: Add mecab. 
* gnu/packages/language.scm (mecab): New variable.
* gnu/packages/patches/mecab-variable-param.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
 2023-04-12 08:26:22 -04:00
Maxim Cournoyer
367fce7a2f
gnu: python-pyopenssl: Update to 23.1.1. 
* gnu/packages/python-crypto.scm (python-pyopenssl): Update to 23.1.1.
[source]: Remove patches.
[arguments]: Update faketime date in check phase.
Normalize pytest invocation in check phase override.
[propagated-inputs]: Remove python-six.
 2023-04-11 20:35:21 -04:00
Maxim Cournoyer
cfbddc3d54
gnu: openboardview: Update to 9.95.0. 
* gnu/packages/electronics.scm (openboardview): Update to 9.95.0.
[source]: Apply patch.
[arguments]: Update fix-utf8-include-directive phase.
[inputs]: Add orangeduck-mpc.
* gnu/packages/patches/openboardview-use-system-mpc.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
 2023-04-01 17:28:59 -04:00
Maxim Cournoyer
9800aaca91
gnu: Add orangeduck-mpc. 
* gnu/packages/c.scm (orangeduck-mpc): New variable.
* gnu/packages/patches/orangeduck-mpc-fix-pkg-config.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
 2023-04-01 17:28:59 -04:00
Maxim Cournoyer
99b25b1313
Merge branch 'master' into staging 2023-03-31 10:48:54 -04:00
Bruno Victal
6d0ad93020
services: pam-limits-service-type: Deprecate file-like object support in favour for lists as service value. 
* doc/guix.texi (Base Services): Document it.
* gnu/local.mk: Register test.
* gnu/services/base.scm (pam-limits-service-type): Accept both lists and
file-like objects. Deprecate file-like object support.
* gnu/tests/pam.scm: New file.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
 2023-03-30 23:18:16 +02:00
Maxim Cournoyer
438a0de332
Merge remote-tracking branch 'origin/master' into staging 2023-03-28 22:40:32 -04:00
Maxim Cournoyer
e05de22479
gnu: geeqie: Update to 2.0.1. 
* gnu/packages/image-viewers.scm (geeqie): Update to 2.0.1.
[build-system]: Switch to meson.
[arguments]: Delete field.
[inputs]: Remove clutter.
[native-inputs]: Add xxd.  Remove autoconf and automake.
* gnu/packages/patches/geeqie-clutter.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): De-register it.
 2023-03-28 22:23:04 -04:00
Maxim Cournoyer
7e5c0dc874
gnu: Add fpm. 
* gnu/packages/package-management.scm (fpm): New variable.
* gnu/packages/patches/fpm-newer-clamp-fix.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
 2023-03-28 22:22:41 -04:00
Maxim Cournoyer
6a5fb9bf19
gnu: Add ruby-hiredis. 
* gnu/packages/databases.scm (ruby-hiredis): New variable.
* gnu/packages/patches/ruby-hiredis-use-system-hiredis.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
 2023-03-28 22:22:13 -04:00
Maxim Cournoyer
30f0fd2176
gnu: webkitgtk: Update to 2.40.0. 
The version is re-integrated with the package to allow 'guix refresh -l' to
work.

* gnu/packages/patches/webkitgtk-libelogind.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/webkit.scm (%webkit-version): Delete variable.
(webkitgtk): Update to 2.40.0.  Apply new patch.
[arguments]: Add a CMAKE_CXX_FLAGS configure flag.  Delete
help-cmake-find-elogind phase.
[native-inputs]: Add unifdef.
[inputs]: Remove gtk+-2.  Add libavif.
(wpewebkit): Update to 2.40.0.
(webkitgtk-next) [inputs]: Remove now extraneous gtk+-2 deletion.
 2023-03-28 20:15:14 -04:00
Christopher Baines
e970e9149d
gnu: guile-3.0-latest: Add patch for invalid unicode handling. 
This patch fixes handling of invalid unicode when using suspendable ports.

Reported upstream at https://debbugs.gnu.org/cgi/bugreport.cgi?bug=62290 and
patch merged as cba2e7e3fec3c781230570f5d1ef070625eeeda8.

As the build coordinator agents use suspendable ports, this will fix issues
with building things where the log output contains invalid unicode.

* gnu/packages/patches/guile-fix-invalid-unicode-handling.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/guile.scm (guile-3.0-latest)[source]: Use it.

Signed-off-by: Christopher Baines <mail@cbaines.net>
 2023-03-24 13:39:05 +00:00
Maxim Cournoyer
839bb4616f
Merge remote-tracking branch 'origin/master' into staging. 
With resolved conflicts in:
	gnu/packages/ibus.scm
	gnu/packages/image.scm
	gnu/packages/lisp.scm
	gnu/packages/virtualization.scm
 2023-03-23 21:45:21 -04:00
Danny O'Brien
03ab1a2762
gnu: dbacl: Fix failing check phase. 
* gnu/packages/patches/dbacl-icheck-multiple-definitions.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/textutils.scm (dbacl) [source]: Apply patch.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
 2023-03-21 22:13:29 -04:00
Maxim Cournoyer
20fa738123
gnu: python-hiredis: Update to 2.2.2 and enable tests. 
* gnu/packages/databases.scm (python-hiredis): Update to 2.2.2.
[source]: Fetch via git and apply patches.
[build-system]: Use pyproject-build-system.
[arguments]: Enable tests.  Add #:phases.
[native-inputs]: New field.
[inputs]: Likewise.
* gnu/packages/patches/python-hiredis-fix-header.patch: New file.
* gnu/packages/patches/python-hiredis-use-system-hiredis.patch: Likewise.
* gnu/local.mk (dist_patch_DATA): Register them.
 2023-03-20 08:32:32 -04:00
Lars-Dominik Braun
c16add7fd9
gnu: python-pillow: Fix CVE-2022-45199. 
Fixes: <https://issues.guix.gnu.org/issue/61172>

* gnu/packages/python-xyz.scm (python-pillow/security-fixes): New variable.
(python-pillow): Add replacement.
* gnu/packages/patches/python-pillow-CVE-2022-45199.patch: New file.
* gnu/local.mk: Register it.
 2023-03-19 10:57:00 +01:00
Maxim Cournoyer
2dc2722dc0
gnu: ccextractor: Update to 0.94 and fix build. 
* gnu/packages/gstreamer.scm (ccextractor): Update to 0.94.
[source]: Apply patches.  Add FIXME comment.
[build-system]: Switch to gnu-build-system.
[arguments]: Delete #tests? argument.  Delete trailing #t and use gexps.
Adjust configure flags accordingly, removing WITH_SHARING (doesn't exist for
Autoconf) and adding '--without-rust'.  Override check phase.
[native-inputs]: Remove labels.  Remove python-wrapper and perl.
[propagated-inputs]: Remove labels.  Remove nanomsg and zlib.  Replace
leptonica with leptonica-1.80.  replace tesseract-ocr with tesseract-ocr-4.
* gnu/packages/patches/ccextractor-add-missing-header.patch: New file.
* gnu/packages/patches/ccextractor-autoconf-tesseract.patch: Likewise.
* gnu/packages/patches/ccextractor-fix-ocr.patch: Likewise.
* gnu/local.mk (dist_patch_DATA): Register them.
 2023-03-17 10:40:02 -04:00
Z572
84a70d7c15
gnu: m17n-lib: Fix cross-compile. 
* gnu/packages/emacs.scm (m17n-lib)
[source]: Add m17n-lib-1.8.0-use-pkg-config-for-freetype.patch.
[native-inputs]: When cross-compile add pkg-config, libtool, gettext-minimal,
autoconf, automake.
[arguments]: When cross-compile, add phase to fix rpl_malloc undefined references.
* gnu/packages/patches/m17n-lib-1.8.0-use-pkg-config-for-freetype.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.

Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
 2023-03-17 18:33:38 +08:00
宋文武
5dd0a6214f
gnu: retroarch: Update to 1.15.0. 
* gnu/packages/emulators.scm (retroarch): Update to 1.15.0.
[source]: Remove upstreamed patch.
[arguments]<#:phases>: Remove not needed changes for 'true' and 'zlib'.
Remove "--disable-builtinminiupnpc" from configure flags.
Add "--disable-builtinzlib" to configure flags.
[inputs]: Remove miniupnpc, which is not used any more.
* gnu/packages/patches/retroarch-LIBRETRO_DIRECTORY: Remove file.
* gnu/local.mk (dist_patch_DATA): Remove it.
 2023-03-17 18:19:31 +08:00
conses
156aac1b36
gnu: emacs-helpful: Update to 0.19-1.1c98f6f. 
* gnu/packages/emacs-xyz.scm (emacs-helpful): Update to 0.19-1.1c98f6f.
[source]: Remove fix-docstring-test.patch.
[propagated-inputs]: Remove EMACS-SHUT-UP.
* gnu/packages/patches/emacs-helpful-fix-docstring-test.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Apply removal.

Signed-off-by: Nicolas Goaziou <mail@nicolasgoaziou.fr>
 2023-03-17 09:22:49 +01:00
Jan (janneke) Nieuwenhuizen
70056b1b2b
gnu: home: services: Add home-kodi-service-type. 
* gnu/home/services/media.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
* po/guix/POTFILES.in: Likewise.
* doc/guix.texi (Media Home Services): Document it in new subsection.
 2023-03-16 14:33:16 +01:00
Jan (janneke) Nieuwenhuizen
193f547ca3
gnu: home: services: Add home-znc-service-type. 
* gnu/home/services/messaging.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
* po/guix/POTFILES.in: Likewise.
* doc/guix.texi (Messaging Home Services): Document it in new subsection.
 2023-03-16 14:32:50 +01:00
Maxim Cournoyer
923d23a23c
gnu: efibootmgr: Update to 18. 
* gnu/packages/linux.scm (efibootmgr): Update to 18.
[source]: Delete snippet, modules and patches fields.
* gnu/packages/patches/efibootmgr-remove-extra-decl.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): De-register it.
 2023-03-15 22:56:10 -04:00
Bruno Victal
cf111a37f3
gnu: rng-tools: Do not build randstat binary. 
This trivial binary is rarely useful.

* gnu/local.mk (dist_patch_DATA): Register patch.
* gnu/packages/patches/rng-tools-revert-build-randstat.patch: New file.
* gnu/packages/linux.scm (rng-tools)[origin]: Add patch.

Signed-off-by: Christopher Baines <mail@cbaines.net>
 2023-03-14 10:36:31 +00:00
Jack Hill
bc65415fb1
gnu: rnp: Update to 0.16.2. 
* gnu/packages/openpgp.scm (rnp): Update to 0.16.2.
[file-name]: Use git-file-name.
[patches]: Remove.
[arguments]: Disable downloading testing inputs in #:configure-flags.
[phases]{fixes}: Remove functionality that is no longer needed.
[native-inputs]: Replace googletest-source with googletest, remove
python2.
* gnu/packages/patches/rnp-add-version.cmake.patch,
* gnu/packages/patches/rnp-disable-ruby-rnp-tests.patch,
* gnu/packages/patches/rnp-unbundle-googletest.patch: Remove files.
* gnu/local.mk (dist_patch_DATA): Remove them.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
 2023-03-13 15:08:33 +01:00
Leo Famulari
9ba649a926
gnu: evdi: Fix build with linux-libre 6.2. 
* gnu/packages/patches/evdi-fix-build-with-linux-6.2.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/linux.scm (evdi)[source]: Use it.
 2023-03-11 11:36:19 -05:00
Efraim Flashner
4f4e4abd3a
gnu: ipxe: Update to 1.21.1-1.9e1f7a3. 
* gnu/packages/bootloaders.scm (ipxe): Update to 1.21.1-1.9e1f7a3.
[source]: Remove patch.
[arguments]: Add phase to skip 1 i386 firmware file. Move setting
syslinux path from make-flags to phases.
* gnu/packages/patches/ipxe-reproducible-geniso.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Remove it.
 2023-03-09 15:10:16 +02:00
Efraim Flashner
e22a6ed8f8
gnu: make-openbios-package: Enable building from aarch64, riscv64. 
* gnu/packages/firmware.scm (make-openbios-package)[source]: Add patch
to correctly detect aarch64 and riscv64 build hosts.
(openbios-qemu-ppc)[arguments]: Remove aarch64 workaround for #:system.
* gnu/packages/patches/openbios-aarch64-riscv64-support.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
 2023-03-09 15:10:16 +02:00
Danny Milosavljevic
741b534d16
gnu: fluxbox: Make big cursors work. 
* gnu/packages/patches/fluxbox-1.3.7-no-dynamic-cursor.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/wm.scm (fluxbox)[source]: Add patch.
[arguments]<#:phases>[force-bootstrap]: New phase.
[native-inputs]: Add autoconf, automake, gnu-gettext.
[inputs]: Add libxcursor.
 2023-03-09 11:26:01 +01:00
Paul A. Patience
26e9725c54
gnu: Add cl-eazy-gnuplot. 
* gnu/packages/lisp-xyz.scm (sbcl-eazy-gnuplot, cl-eazy-gnuplot,
  ecl-eazy-gnuplot): New variables.
* gnu/packages/patches/sbcl-eazy-gnuplot-skip-path-check.patch:
  New file.
* gnu/local.mk (dist_patch_DATA): Register it.

Signed-off-by: Guillaume Le Vaillant <glv@posteo.net>
 2023-03-07 11:18:50 +01:00
Ludovic Courtès
674d893316
home: services: Add 'pulseaudio-rtp-sink' and 'pulseaudio-rtp-source'. 
* gnu/home/services/sound.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
* doc/guix.texi (Sound Home Services): New section.
 2023-03-05 23:06:55 +01:00
Liliana Marie Prikler
a10cc08a0f
gnu: Add boolector. 
* gnu/packages/patches/boolector-find-googletest: New file.
* gnu/local.mk (dist_patch_DATA): Register it here.
* gnu/packages/maths.scm (boolector): New variable.
 2023-03-05 08:17:58 +01:00
Vivien Kraus
1b07f397dc
gnu: widelands: Update to 1.1. 
* gnu/packages/games.scm (widelands): Update to 1.1.
[source]: Remove obsolete patches.
[native-inputs]: Add pkg-config.
[inputs]: Add asio.
* gnu/packages/patches/widelands-add-missing-map-include.patch,
gnu/packages/patches/widelands-system-wide_minizip.patch: Delete
files.
* gnu/local.mk (dist_patch_DATA): Remove them.

Signed-off-by: Leo Famulari <leo@famulari.name>
 2023-03-03 20:48:59 -05:00
宋文武
c53e8404e8
gnu: Remove broken xf86 video drivers. 
Those packages build failed with current xorg-server:
  openchrome: multiple definition of some functions.
  other: missing headers for xf86RamDac.h, IBM.h, etc.

* gnu/packages/xorg.scm (xf86-video-glint, xf86-video-openchrome
xf86-video-suncg6, xf86-video-sunffb, xf86-video-tga
xf86-video-trident): Remove packages.
* gnu/packages/patches/xf86-video-tga-remove-mibstore.patch: Remove patch.
* gnu/local.mk (dist_patch_DATA): Remove it.
 2023-03-02 11:29:17 +08:00
Hilton Chain
064d331068
gnu: hyfetch: Update to 1.4.7. 
* gnu/packages/admin.scm (hyfetch): Update to 1.4.7.
* gnu/packages/patches/hyfetch-fix-generator-script-quotation-escaping.patch,
* gnu/packages/patches/hyfetch-remove-old-catchy-os-py.patch: Remove files.
* gnu/local.mk (dist_patch_DATA): Remove them.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
 2023-02-27 23:40:43 +01:00
Lars-Dominik Braun
7df12c8ca6
gnu: ghc-9.2: Support static linking with glibc < 2.34. 
* gnu/packages/patches/ghc-9.2-glibc-2.33-link-order.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/haskell.scm (ghc-9.2)[origin]: Use it.
 2023-02-26 10:26:15 +01:00
Lars-Dominik Braun
ebea18357b
gnu: elm: Support GHC 9.2. 
* gnu/packages/elm.scm (elm-sans-reactor)[source]: Add patch to support GHC 9.2.
* gnu/packages/patches/elm-ghc9.2.patch: This one.
* gnu/local.mk: Add it.
 2023-02-26 10:26:15 +01:00
Lars-Dominik Braun
49a320aaa6
Upgrade Haskell packages. 
Script-aided bulk change.
 2023-02-26 10:26:07 +01:00
Maxim Cournoyer
3b18fbabb6
gnu: spice-vdagent: Update to 0.22.1. 
* gnu/packages/spice.scm (spice-vdagent): Update to 0.22.1.
[source]: Delete patch.
* gnu/packages/patches/spice-vdagent-glib-2.68.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): De-register it.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
 2023-02-25 14:46:53 -05:00
Maxim Cournoyer
7b64e57c4c
gnu: virglrenderer: Update to 0.7.0. 
* gnu/packages/spice.scm (virglrenderer): Update to 0.7.0.  Remove
patch. Re-indent and sort inputs.
* gnu/packages/patches/virglrenderer-CVE-2017-6386.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): De-register it.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
 2023-02-25 14:46:52 -05:00
Timotej Lazar
5cd3619545
gnu: qpdfview: Update to 0.5.0. 
* gnu/packages/pdf.scm (qpdfview): Update to 0.5.0.
* gnu/packages/patches/qpdfview-qt515-compat.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.

Signed-off-by: Leo Famulari <leo@famulari.name>
 2023-02-24 14:38:23 -05:00
Morgan Smith
4f08551a83
gnu: bees: Update to 0.9.2. 
* gnu/packages/file-systems.scm (bees): Update to 0.9.2.
[license]: Add two individual licences.
* gnu/packages/patches/bees-beesd-honor-destdir-on-installation.patch:
Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.

Signed-off-by: Tobias Geerinckx-Rice <me@tobias.gr>
 2023-02-19 01:00:06 +01:00
Efraim Flashner
042b92edb2
gnu: make-openbios-package: Update to 1.1-1.af97fd7. 
* gnu/packages/firmware.scm (make-openbios-package): Update to
1.1-1.af97fd7.
[source]: Remove patch.
[native-inputs]: Build with gcc-10. Add fcode-utils.
* gnu/packages/patches/openbios-gcc-warnings.patch: Remove file.
* ngu/local.mk (dist_patch_DATA): Remove it.
 2023-02-20 10:52:20 +02:00
Hilton Chain
28cefd2e56
gnu: hyfetch: Update to 1.4.6. 
* gnu/packages/patches/hyfetch-fix-generator-script-quotation-escaping.patch:
New file.
* gnu/packages/patches/hyfetch-remove-old-catchy-os-py.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add them.
* gnu/packages/admin.scm (hyfetch)[source]: Update to 1.4.6.
Switch to git source and add patches.
[inputs]: Remove python-hypy-utils.
[arguments]<#:phases>: Remove set-HOME phase.

Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
 2023-02-19 08:16:47 +01:00
Liliana Marie Prikler
243eb86c6f
gnu: Add emacs-pasp-mode. 
* gnu/packages/patches/emacs-pasp-mode-quote-file-names.patch: New file.
* gnu/local.mk: Register it here.
* gnu/packages/emacs-xyz.scm (emacs-pasp-mode): New variable.
 2023-02-19 08:16:47 +01:00
Philip McGrath
b5326763c7
gnu: racket: Update to 8.8. 
* gnu/packages/patches/racket-backport-8.7-pkg-strip.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Delete it.
* gnu/packages/racket.scm (%racket-origin)[patches]: Likewise.
(%racket-version): Update to 8.8.
(%zuo-version): Update to 1.6.
(racket)[inputs]<algol60, cext-lib, deinprogramm, draw, drracket>
<expeditor, gui, htdp, math, pict, r5rs, redex, sasl, scribble>
<typed-racket, string-constants, syntax-color>: Update checksums.
* gnu/packages/chez.scm (chez-scheme-for-racket): Update to
9.9.9-pre-release.14.

Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
 2023-02-19 08:16:47 +01:00
Skylar Hill
53daa23b2e
gnu: Add opentaxsolver. 
* gnu/packages/finance.scm (opentaxsolver): New variable.
* gnu/packages/patches/opentaxsolver-file-browser-fix.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.

Signed-off-by: Nicolas Goaziou <mail@nicolasgoaziou.fr>
 2023-02-18 12:36:09 +01:00