Commit Graph

9058 Commits

Author SHA1 Message Date
Mario Rodas
41006ede40
Merge pull request #103390 from r-ryantm/auto-update/dstask
dstask: 0.23 -> 0.23.1
2020-11-11 03:56:52 -05:00
Mario Rodas
578194098c
Merge pull request #103417 from r-ryantm/auto-update/gramps
gramps: 5.0.1 -> 5.1.3
2020-11-11 03:55:50 -05:00
R. RyanTM
0aefa1ed8a gramps: 5.0.1 -> 5.1.3 2020-11-11 08:19:03 +00:00
R. RyanTM
9a7d633b59 dstask: 0.23 -> 0.23.1 2020-11-11 03:33:26 +00:00
Mario Rodas
d521ae0285
Merge pull request #103370 from r-ryantm/auto-update/cheat
cheat: 4.1.0 -> 4.1.1
2020-11-10 21:38:59 -05:00
R. RyanTM
74d1ab8949 cheat: 4.1.0 -> 4.1.1 2020-11-11 00:32:57 +00:00
Thiago Franco de Moraes
72bb100578 pwsafe: use wxGTK30 2020-11-10 15:07:57 -08:00
Jonathan Ringer
b2e857a5fe spicetify-cli: init at 1.1.0 2020-11-10 14:48:34 -08:00
Frederik Rietdijk
379aaa1e0c Merge master into staging-next 2020-11-10 10:11:08 +01:00
Markus S. Wamser
9ed8e03a09 mupdf: mark 1.17 as insecure but as still required as dependency 2020-11-09 09:57:38 -08:00
Markus S. Wamser
a08a95acd9 llpp: 32 -> 33 2020-11-09 09:57:38 -08:00
Markus S. Wamser
bbcc8b020e mupdf: adopt post-release bugfix-patches from upstream 2020-11-09 09:57:38 -08:00
Markus S. Wamser
e13120bb09 mupdf: 1.17.0 -> 1.18.0
fixes CVE-2017-5991
fixes CVE-2020-26519

also drops the patch for shared libs (not needed anymore)
2020-11-09 09:57:38 -08:00
Frederik Rietdijk
20f001c01e Merge master into staging-next 2020-11-09 14:33:52 +01:00
Alyssa Ross
a889b94fb9
Merge pull request #103113 from bbigras/nwg-launchers
nwg-launchers: 0.4.0 -> 0.4.2
2020-11-09 11:49:28 +00:00
Claudio Bley
78bf7f33d9 wtf: 0.33.0 -> 0.34.0 2020-11-09 11:40:52 +01:00
talyz
cfdeea41e6
keepassxc: Enable networking by default
Upstream builds with it enabled, as do other distros.
2020-11-08 16:40:23 +01:00
Gabriel Ebner
df88279649
Merge pull request #103004 from lovesegfault/octoprint-marlingcodedocumentation
octoprint: add marlingcodedocumentation
2020-11-08 11:42:08 +01:00
Bruno Bigras
b2f62cfa27 nwg-launchers: 0.4.0 -> 0.4.2 2020-11-08 00:32:39 -05:00
Florian Klink
c0f4be6652
Merge pull request #102995 from lovesegfault/plater-init
plater: init at 2020-07-30
2020-11-07 23:45:08 +01:00
freezeboy
10687019df xautoclick: 0.31 -> 0.34
Migrate to Gtk3 and Qt5
Adds support for fltk too
2020-11-07 11:30:54 -08:00
Mario Rodas
9e0b37869f
Merge pull request #103059 from marsam/update-archiver
archiver: 3.4.0 -> 3.5.0
2020-11-07 09:18:22 -05:00
Daniël de Kok
b1ae1e5d7c
Merge pull request #103072 from 0x4A6F/master-dasel
dasel: 1.1.0 -> 1.2.0
2020-11-07 15:08:57 +01:00
0x4A6F
1fe5d52eb8
dasel: 1.1.0 -> 1.2.0
- Add support for YAML multi-document files
2020-11-07 11:07:41 +00:00
Bernardo Meurer
5cd0d6d710
plater: init at 2020-07-30 2020-11-06 19:59:00 -08:00
Emery Hemingway
f979b589c7 elf-dissector: init at unstable-2020-11-14 2020-11-06 21:27:43 +01:00
Doron Behar
4c84556d6b
Merge pull request #102764 from jluttine/init-pass-secret-service 2020-11-06 22:22:46 +02:00
Bernardo Meurer
1122d28e9f
octoprint.python.pkgs.marlingcodevisualizer: init at 0.11.0 2020-11-06 11:48:08 -08:00
Michal Minář
40bd50cbbb megasync: 4.3.1.0 -> 4.3.5.0
Resolves #102634

Signed-off-by: Michal Minář <mic.liamg@gmail.com>
2020-11-06 09:26:08 -08:00
Frederik Rietdijk
99fb79ae84 Merge master into staging-next 2020-11-06 12:51:56 +01:00
Jaakko Luttinen
efa1a8b5c4
pass-secret-service: init at unstable-2020-04-12 2020-11-06 13:10:50 +02:00
Robert Hensing
e2a129348b
Merge pull request #100585 from magnetophon/tiv
tiv: init at 1.1.0
2020-11-06 10:11:09 +01:00
Bernardo Meurer
7fede29d83
nixos/octoprint: remove references to deprecated/removed m33-fio plugin 2020-11-06 00:39:50 -08:00
Mario Rodas
487c44867a archiver: 3.4.0 -> 3.5.0 2020-11-06 04:20:00 +00:00
Bart Brouns
5ff62a94f2 tiv: init at 1.1.0 2020-11-06 01:25:30 +01:00
Robert Hensing
587e1e27d5
Merge pull request #100496 from penguwin/charm
charm: 0.8.3 -> 0.8.4
2020-11-06 00:52:19 +01:00
Frederik Rietdijk
dfb9e8689d kupfer: fix build 2020-11-05 19:16:46 +01:00
Jan Tojnar
a821be7531
Merge branch 'master' into staging-next 2020-11-05 09:42:47 +01:00
Jörg Thalheim
f7dd7e86cb
Merge pull request #102822 from 0x4A6F/master-dasel
dasel: init at 1.1.0
2020-11-05 06:20:25 +01:00
Guillaume Bouchard
2de3de4631 antlr: 4.7 -> 4.8 2020-11-04 15:26:29 -08:00
Ryan Mulligan
440a3a497c
Merge pull request #102695 from r-ryantm/auto-update/pdfsam-basic
pdfsam-basic: 4.1.4 -> 4.2.0
2020-11-04 12:59:34 -08:00
0x4A6F
d5edfc50ef
dasel: init at 1.1.0 2020-11-04 20:47:24 +00:00
Kevin Cox
2802d2a825
Merge pull request #101902 from sikmir/gpxsee
gpxsee: 7.33 → 7.35
2020-11-04 07:31:13 -05:00
Arnout Engelen
ef2333fb03
inkcut: update to 2.1.2
wasn't able to test with an actual cutter due to covid, but the GUI
starts correctly
2020-11-04 12:38:27 +01:00
Nikolay Korotkiy
dda8bdcf6d
gpxsee: 7.33 → 7.35 2020-11-04 14:24:56 +03:00
Nikolay Korotkiy
43e8cb49b9
mu-repo: 1.8.0 → 1.8.1 2020-11-04 13:41:37 +03:00
Frederik Rietdijk
10c57af49c Merge staging-next into staging 2020-11-04 09:28:07 +01:00
R. RyanTM
5c31f534f1 obsidian: 0.9.4 -> 0.9.6 2020-11-03 22:48:31 -08:00
David Birks
2ac37a3e8a dbeaver: 7.2.3 -> 7.2.4 2020-11-03 22:40:31 -08:00
R. RyanTM
566c7012c0 pdfsam-basic: 4.1.4 -> 4.2.0 2020-11-04 02:43:31 +00:00
Sergey Lukjanov
30804e21c7 hugo: 0.77.0 -> 0.78.0 2020-11-03 12:09:22 -08:00
Jonathan Ringer
7543833ccf haxor-news: use python3, fix build 2020-11-03 07:35:35 -08:00
Frederik Rietdijk
470f05cb5d Merge staging-next into staging 2020-11-03 12:06:41 +01:00
R. RyanTM
428701ba39 krename: 5.0.0 -> 5.0.1 2020-11-03 11:24:29 +08:00
StigP
90609ba9e4
Merge pull request #102498 from r-ryantm/auto-update/keepass
keepass: 2.45 -> 2.46
2020-11-03 00:30:58 +00:00
R. RyanTM
9f9bc40e57 keepass: 2.45 -> 2.46 2020-11-02 16:41:45 +00:00
R. RyanTM
dac94664e2 minder: 1.9.2 -> 1.11.3 2020-11-02 07:53:50 -08:00
Ryan Mulligan
565b20bf98
Merge pull request #102474 from r-ryantm/auto-update/hr
hr: 1.2 -> 1.3
2020-11-02 05:44:57 -08:00
R. RyanTM
8e4be5cb2f hr: 1.2 -> 1.3 2020-11-02 11:35:17 +00:00
R. RyanTM
461e95e086 heimer: 1.20.0 -> 1.21.0 2020-11-02 09:53:43 +00:00
Pavol Rusnak
2c931312ce treewide: simplify rev/repo arguments in src
+ use fetchFromGithub where possible
2020-11-01 23:02:24 -08:00
R. RyanTM
c6edffbbe8 gphoto2: 2.5.23 -> 2.5.26 2020-11-01 17:21:12 -08:00
R. RyanTM
468d013043 fetchmail: 6.4.12 -> 6.4.13 2020-11-01 15:13:17 -08:00
roconnor
eaf06c30ac
Merge pull request #101945 from roconnor/OSCAR
OSCAR: init at 1.2.0
2020-11-01 14:25:49 -05:00
Frederik Rietdijk
409ca6f1f9 Merge staging-next into staging 2020-11-01 11:06:35 +01:00
Frederik Rietdijk
54f7498601
Merge pull request #101369 from doronbehar/pkg/kdeApplications/qt515
kdeApplications: Use latest qt515 by default
2020-11-01 11:05:05 +01:00
Frederik Rietdijk
83dde6c52c Merge staging-next into staging 2020-11-01 10:11:12 +01:00
Sergey Lukjanov
5c4342674b hugo: 0.76.5 -> 0.77.0 2020-10-30 21:20:52 -07:00
Lassulus
858e014efc
Merge pull request #102002 from RaghavSood/electrum-ltc/ledger
electrum-ltc: enable hardware wallets
2020-10-30 19:39:43 +01:00
Doron Behar
ea9de43bf4 tellico: Use libkcddb from libsForQt5's scope.
Part of (#101369): kdeApplications points to a set of derivations built
with a specific qt version, where libkcddb is available in libsForQt5's
callPackage scope, thanks to the parent commit of this commit.
2020-10-30 20:34:14 +02:00
Peter Hoeg
0d25246f4d kdeconnect: part of kdeApplications 2020-10-30 22:34:02 +08:00
ymeister
1d4dc932d5 rss-bridge-cli: init
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2020-10-30 20:10:20 +07:00
Mario Rodas
d3a4ebdb95
Merge pull request #102074 from r-ryantm/auto-update/geoipupdate
geoipupdate: 4.3.0 -> 4.5.0
2020-10-30 07:45:30 -05:00
Mario Rodas
543c744d0d
Merge pull request #102082 from r-ryantm/auto-update/batsignal
batsignal: 1.1.2 -> 1.1.3
2020-10-30 07:44:06 -05:00
Ryan Mulligan
eaa64c3e7d
Merge pull request #102047 from r-ryantm/auto-update/dstask
dstask: 0.22 -> 0.23
2020-10-29 13:56:07 -07:00
R. RyanTM
9fb7ea1f17 batsignal: 1.1.2 -> 1.1.3 2020-10-29 17:54:46 +00:00
Doron Behar
85eb1b58d3
Merge pull request #101747 from doronbehar/pkg/syncthingtray 2020-10-29 18:13:34 +02:00
R. RyanTM
3e8c98e128 geoipupdate: 4.3.0 -> 4.5.0 2020-10-29 16:01:39 +00:00
Russell O'Connor
069e485c18 OSCAR: init at 1.2.0 2020-10-29 11:00:13 -04:00
R. RyanTM
89507db3bc dstask: 0.22 -> 0.23 2020-10-29 13:48:13 +00:00
Alexander Bantyev
f68a893294
Merge pull request #101997 from cab404/super-slicer-2-2-54-2
super-slicer: 2.2.54.1 -> 2.2.54.2
2020-10-29 14:43:12 +03:00
Mario Rodas
6ff80e7ac3
Merge pull request #102008 from evenbrenden/jotta-cli-bump-version
jotta-cli: 0.6.24251 -> 0.7.33634
2020-10-29 06:39:42 -05:00
Even Brenden
fe3041b879 jotta-cli: 0.6.24251 -> 0.7.33634 2020-10-29 09:27:01 +01:00
Raghav Sood
438a67de33
electrum-ltc: enable hardware wallets 2020-10-29 15:38:47 +08:00
Vladimir Serov
1b27fadae0
super-slicer: 2.2.54.1 -> 2.2.54.2
Signed-off-by: Vladimir Serov <me@cab404.ru>
2020-10-29 08:43:43 +03:00
Mario Rodas
8305cce210
Merge pull request #100638 from xrelkd/add/clipcat
clipcat: init at 0.4.19
2020-10-28 23:00:38 -05:00
Mario Rodas
6a730c547c
Merge pull request #101989 from marsam/update-archiver
archiver: 3.3.2 -> 3.4.0
2020-10-28 22:51:32 -05:00
dawidsowa
c69407d606
gallery-dl: 1.15.1 -> 1.15.2 (#101977)
* gallery-dl: 1.15.1 -> 1.15.2
2020-10-28 22:49:39 -05:00
Anderson Torres
066bf7dd5d
Merge pull request #101894 from AndersonTorres/terminal-emulators
Create a directory-category for terminal emulators
2020-10-28 23:27:05 -03:00
Martin Weinelt
2755df8657
Merge pull request #101844 from helsinki-systems/telepromter-2.4.0
teleprompter: 2.3.4 -> 2.4.0
2020-10-29 00:58:59 +01:00
Scriptkiddi
9bb8fdf842
teleprompter: 2.3.4 -> 2.4.0 2020-10-29 00:48:56 +01:00
Anderson Torres
c13da09a6f
Merge pull request #101231 from djanatyn/pkg/peaclock
peaclock: init at 0.4.3
2020-10-28 16:06:00 -03:00
Vladimír Čunát
0b32140b34
Merge branch 'staging-next' into staging 2020-10-28 18:48:56 +01:00
AndersonTorres
2bb3a9da24 A directory-category for terminal emulators
This is a mostly cosmetical commit, in the sense it doesn't change the contents
of any package, but reorganizes the overall Nixpkgs expressions.

Terminal emulators are an ubiquitous tool for any Unix user; even the beginners
are routinely familiarized to it. And, manifestly, there are many
implementations of terminal emulators out there, from those traditionally made
in C and C++ to those written in Haskell and Go.

Terminal emulators deserve more highlight. This commit does that by creating a
category for them.
2020-10-28 10:22:39 -03:00
Anderson Torres
c3feda093d
Merge pull request #101569 from AndersonTorres/megafix
Fixing some URLs
2020-10-28 10:15:26 -03:00
Mario Rodas
8d1c9bcdf9 archiver: 3.3.2 -> 3.4.0
https://github.com/mholt/archiver/releases/tag/v3.4.0
2020-10-28 04:20:00 +00:00
Andreas Rammhold
db0fe5c3eb
Merge branch master into staging to fix eval error
This fixes the eval error of the small (and "big"?) NixOS test set that
was fixed in 1088f05 & eba8f542.
2020-10-28 03:03:27 +01:00
Ben Siraphob
db74029e3e treewide: remove package names from prefix of descriptions 2020-10-27 09:15:07 -07:00
Jonathan Strickland
c84ddc7bf4 peaclock: init at 0.4.3
Co-authored-by: r-burns <52847440+r-burns@users.noreply.github.com>
2020-10-27 10:05:08 -04:00
Lassulus
4c5ff0a412
Merge pull request #101804 from nyanloutre/ledger_update
electron-cash: 4.1.1 -> 4.2.0
2020-10-27 08:00:23 +01:00
nyanloutre
765b7f33ea
electron-cash: 4.1.1 -> 4.2.0 2020-10-27 00:06:52 +01:00
Max Hausch
a8d35dc10d
ssw 0.3 -> 0.6 2020-10-26 23:57:03 +01:00
Ryan Mulligan
bcbb5833a0
Merge pull request #101708 from r-ryantm/auto-update/nwg-launchers
nwg-launchers: 0.3.3 -> 0.4.0
2020-10-26 11:29:58 -07:00
lewo
a7a1447e5d
Merge pull request #100985 from devhell/mediainfo-20.09
mediainfo{-gui}: 20.08 -> 20.09
2020-10-26 17:26:25 +01:00
devhell
8a4edf9087 {lib}mediainfo{-gui}: 20.08 -> 20.09
This release includes a fix for https://github.com/NixOS/nixpkgs/issues/92874
2020-10-26 15:57:08 +00:00
Anderson Torres
ac08a3973c
Merge pull request #100536 from AndersonTorres/corectrl
corectrl: init at 1.1.1
2020-10-26 10:34:12 -03:00
Ryan Mulligan
f861aae44c
Merge pull request #101719 from r-ryantm/auto-update/opentx
opentx: 2.3.9 -> 2.3.10
2020-10-26 05:48:17 -07:00
Ryan Mulligan
3ea0a61e08
Merge pull request #101711 from r-ryantm/auto-update/obsidian
obsidian: 0.9.1 -> 0.9.4
2020-10-26 05:42:04 -07:00
Alexey Shmalko
a3368f0eea
Merge pull request #101348 from cab404/super-slicer-2-2-54-1
super-slicer: 2.2.54.0 -> 2.2.54.1
2020-10-26 12:44:28 +02:00
Doron Behar
a5ca6e8e84 syncthingtray: 0.11.0 -> 1.0.0 2020-10-26 12:10:40 +02:00
Vladimír Čunát
336bc8283b
Re-Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"
This reverts commit c778945806.

I believe this is exactly what brings the staging branch into
the right shape after the last merge from master (through staging-next);
otherwise part of staging changes would be lost
(due to being already reachable from master but reverted).
2020-10-26 08:19:17 +01:00
AndersonTorres
af299d2891 sakura: 3.7.0 -> 3.7.1 2020-10-26 01:13:47 -03:00
AndersonTorres
846266d9af corectrl: init at 1.1.1 2020-10-25 23:11:40 -03:00
R. RyanTM
d26ac92618 opentx: 2.3.9 -> 2.3.10 2020-10-26 01:23:54 +00:00
R. RyanTM
cf74b2f737 obsidian: 0.9.1 -> 0.9.4 2020-10-25 23:49:23 +00:00
R. RyanTM
c3097f46c4 nwg-launchers: 0.3.3 -> 0.4.0 2020-10-25 23:26:07 +00:00
Jan Tojnar
3825e74193 treewide: drop gnome2.pango alias 2020-10-25 23:48:29 +01:00
Serg Nesterov
0e111847bc pueue: 0.7.1 -> 0.8.1 2020-10-26 00:24:00 +03:00
Nikolay Korotkiy
a974fa3727
gpscorrelate: wrap to avoid crashing due to lack of schemas 2020-10-25 15:28:30 +03:00
Jon Banafato
bc5cf003aa keepassxc: 2.6.1 -> 2.6.2
KeePassXC has a new release. [Changelog](https://github.com/keepassxreboot/keepassxc/releases/tag/2.6.2)
2020-10-25 10:38:30 +01:00
R. RyanTM
2e5f96c7a4 heimer: 1.19.0 -> 1.20.0 2020-10-25 09:47:51 +01:00
Vladimír Čunát
2f6b00b15e
Merge branch 'staging-next' into staging 2020-10-25 09:47:04 +01:00
R. RyanTM
3302edd92f j4-dmenu-desktop: 2.17 -> 2.18 2020-10-25 09:46:05 +01:00
R. RyanTM
297cb34d46 kanboard: 1.2.15 -> 1.2.16 2020-10-25 09:45:48 +01:00
Vladimír Čunát
c778945806
Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"
I'm sorry; I didn't notice it contained staging commits.

This reverts commit 17f5305b6c, reversing
changes made to a8a018ddc0.
2020-10-25 09:41:51 +01:00
R. RyanTM
4614342aae xmrig-proxy: 5.11.0 -> 6.3.0 2020-10-25 09:41:09 +01:00
Vladimír Čunát
17f5305b6c
Merge #101508: libraw: 0.20.0 -> 0.20.2 2020-10-25 09:28:53 +01:00
Andreas Rammhold
250fb4611f
Merge pull request #100456 from maralorn/boolToString
treewide: De-inline uses of lib.boolToString
2020-10-25 00:45:11 +02:00
Ryan Mulligan
43ddf205c5
Merge pull request #101573 from r-ryantm/auto-update/dstask
dstask: 0.21 -> 0.22
2020-10-24 14:08:20 -07:00
Daniël de Kok
793a236e4c
Merge pull request #101483 from Flakebi/birdtray
birdtray: 1.8.1 -> 1.9.0
2020-10-24 20:42:28 +02:00
R. RyanTM
76a15c71b6 dstask: 0.21 -> 0.22 2020-10-24 16:13:30 +00:00
Johannes Schleifenbaum
3d3e792965
dbeaver: 7.2.2 -> 7.2.3 2020-10-24 17:32:41 +02:00
Anderson Torres
2dfad07d44
Merge pull request #99494 from jb55/barrier_2_3_3
barrier: 2.3.2 -> 2.3.3
2020-10-24 08:49:29 -03:00
Ryan Burns
c58233a34a blugon: fix build on darwin 2020-10-23 18:06:36 -07:00
WORLDofPEACE
949f7f9227
Merge pull request #98316 from NixOS/gnome-3.38
GNOME 3.38
2020-10-23 20:02:38 -04:00
Jan Tojnar
0e5492a72c
gramps: Do not use gnome3.gexiv2 alias 2020-10-24 01:18:46 +02:00
Jan Tojnar
f0584c52fe
pdf-quench: Switch to Python 3 2020-10-24 01:18:45 +02:00
Piotr Bogdan
0bfec2ed81
gnome-usage: 3.33.2 -> 3.38.0
* add libhandy

Co-authored-by: WORLDofPEACE <worldofpeace@protonmail.ch>
2020-10-24 01:15:08 +02:00
Piotr Bogdan
8ddf4e9bc2
orca: 3.36.5 -> 3.38.0
https://gitlab.gnome.org/GNOME/orca/-/blob/ORCA_3_38_0/NEWS
2020-10-24 01:15:00 +02:00
Flakebi
8995b667c3
birdtray: 1.8.1 -> 1.9.0 2020-10-23 20:09:46 +02:00
Jan Tojnar
3e01d383ee
Merge branch 'staging-next' into staging 2020-10-22 21:20:32 +02:00
Doron Behar
5f7a159538
Merge pull request #101346 from r-ryantm/auto-update/CopyQ
copyq: 3.12.0 -> 3.13.0
2020-10-22 15:57:25 +03:00
Doron Behar
e97848c10a
Merge pull request #101340 from r-ryantm/auto-update/calcurse
calcurse: 4.6.0 -> 4.7.0
2020-10-22 15:55:39 +03:00
GuangTao
f5a8ea23bd
polar-bookshelf: 1.13.10 -> 2.0.42
* polar-bookshelf: 1.13.10 -> 2.0.42

* Update pkgs/applications/misc/polar-bookshelf/default.nix

Co-authored-by: Zak B. Elep <zakame@zakame.net>
2020-10-22 13:35:35 +02:00
Vladimir Serov
2ee31417c9
super-slicer: 2.2.54.0 -> 2.2.54.1 2020-10-22 13:26:11 +03:00
R. RyanTM
ee0e15a8fc copyq: 3.12.0 -> 3.13.0 2020-10-22 09:51:53 +00:00
Eelco Dolstra
357a62df6c
Merge pull request #101272 from edolstra/fix-kdeconnect
Fix kdeconnect
2020-10-22 11:18:38 +02:00
R. RyanTM
8f778f861c calcurse: 4.6.0 -> 4.7.0 2020-10-22 09:18:32 +00:00
Eelco Dolstra
42bf61811b kdeconnect: 20.08.1 -> 20.08.2
Fixes an invalid MIME type.
2020-10-21 20:39:37 +02:00
Daiderd Jordan
bb0b872b61
Merge pull request #100388 from thefloweringash/darwin-dylib-names-hook
treewide: move fixDarwinDylibNames to nativeBuildInputs
2020-10-21 19:25:48 +02:00