JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
264,322 Commits 2 Branches 0 Tags 13 GiB
baf9e277a4
Commit Graph

3962 Commits

Author SHA1 Message Date
freezeboy
bf629416f0 banner: 1.3.4 -> 1.3.5 2020-12-27 16:12:44 +01:00
Sandro
81181e752a
Merge pull request #106377 from oxalica/osu-lazer 2020-12-26 20:10:50 +01:00
Matt McHenry
13e3d2bc4b openjdk: 14.0.2 -> 15.0.1 
* update two explicit references to jdk14 to just jdk, which no longer
  points at jdk8 after #89731.

* patch an explicit -XX:+UseConcMarkSweepGC to -XX:UseG1GC, as the
  former now throws an error (after having been deprecated since jdk 9)
 2020-12-26 11:58:06 -05:00
github-actions[bot]
309b7614e7
Merge staging-next into staging 2020-12-26 00:47:55 +00:00
Sandro
8dbd5276fe
Merge pull request #103826 from Thra11/augustus-2-0-0 2020-12-25 22:32:04 +01:00
Tom Hall
8992e8d5fc augustus: 1.4.1a -> 2.0.1 
Mark as broken on darwin.
 2020-12-25 18:47:54 +00:00
oxalica
58e72782e3
osu-lazer: 2020.1204.0 -> 2020.1225.0 2020-12-25 23:06:54 +08:00
oxalica
1f3cbd31b9
osu-lazer: fix runtime error 2020-12-25 23:06:54 +08:00
github-actions[bot]
09a970dcd2
Merge staging-next into staging 2020-12-25 12:23:40 +00:00
Timo Kaufmann
675660e2f3
Merge pull request #106638 from Atemu/anki-bin 
anki-bin: init at 2.1.36
 2020-12-25 11:41:42 +01:00
github-actions[bot]
8d42e46e8e
Merge staging-next into staging 2020-12-24 12:25:45 +00:00
Jonathan Ringer
9721604610 steamPackages.steam: add udev rules 2020-12-23 22:46:56 -08:00
Atemu
847b317a95 anki-bin: force x11 
Co-authored-by: Vika <vika@fireburn.ru>
 2020-12-24 07:02:43 +01:00
Atemu
0769fe2712 anki-bin: add darwin support 2020-12-24 07:02:43 +01:00
Atemu
18906f453e anki-bin: init at 2.1.36 
Works around https://github.com/NixOS/nixpkgs/issues/78449

Co-authored-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
 2020-12-24 07:02:24 +01:00
Frederik Rietdijk
736dd028ca Merge staging-next into staging 2020-12-22 19:43:32 +01:00
Sandro
c8e43db4d3
Merge pull request #107245 from lheckemann/manaplus 2020-12-22 16:12:15 +01:00
Linus Heckemann
a59c33f33a manaplus: init at 1.9.3.23 2020-12-22 07:06:34 +01:00
github-actions[bot]
d87de5dd7d
Merge staging-next into staging 2020-12-21 12:23:08 +00:00
Sandro
d8375c5b79
Merge pull request #107290 from fgaz/mindustry/121.4 
mindustry,mindustry-server: 120.2 -> 121.4
 2020-12-21 07:56:12 +01:00
Jonathan Ringer
373cb5d41d steam: fix readonly boostrap.tar.xz 
steam writes it with 444 permissions, which makes
simple deletions fails, and steam will crash
 2020-12-20 22:38:18 -08:00
Jonathan Ringer
ab91cd998f steam: fix desktop link 2020-12-20 22:38:18 -08:00
Jonathan Ringer
473ec944a1 steamPackages.steam: 1.0.0.61 -> 1.0.0.68 2020-12-20 22:38:18 -08:00
Jonathan Ringer
0179b5f173 steam-fhsenv: normalize ldPath 2020-12-20 22:38:18 -08:00
github-actions[bot]
204a4ef360
Merge staging-next into staging 2020-12-21 00:45:57 +00:00
Sandro
e98df3d14a
Merge pull request #105391 from reedrw/r2mod 2020-12-21 00:01:41 +01:00
Francesco Gazzetta
15d67698c0 mindustry,mindustry-server: 120.2 -> 121.4 2020-12-20 23:23:19 +01:00
Milan Pässler
a333985d59 libtorrentRasterbar: rename to libtorrent-rasterbar 
This is done to match upstream naming:
https://github.com/NixOS/nixpkgs/pull/107194#issuecomment-748501379
 2020-12-20 20:51:28 +01:00
github-actions[bot]
266489aefb
Merge staging-next into staging 2020-12-20 18:19:55 +00:00
Sandro
6efd4d4343
Merge pull request #106439 from Xottab-DUTY/patch-2 
openxray: update package description
 2020-12-20 16:58:08 +01:00
github-actions[bot]
fd51d0dfe3
Merge staging-next into staging 2020-12-20 00:44:00 +00:00
Pavol Rusnak
0c3a7f97fd
Merge pull request #107224 from petabyteboy/feature/xonotic-fix-desktop-item 
xonotic: fix desktop item
 2020-12-19 23:51:38 +01:00
Lluís Batlle i Rossell
7d6cb4e614 frogatto: update to latest master and fix build 2020-12-19 22:00:25 +01:00
Milan Pässler
40262d4559
xonotic: fix desktop item 
The desktop item was referring to "$out/bin/xonotic" as executable, but
since it's built in its own derivation now, "$out" did not contain the
xonotic wrapper.
Since it seems to be common practise to use a relative path, I changed
it to do that here as well.
 2020-12-19 21:15:20 +01:00
Frederik Rietdijk
f081225a83
Merge pull request #106533 from helsinki-systems/refactor/waf-hook 
[staging] wafHook: Don't wrap Python 2
 2020-12-19 19:28:05 +01:00
Janne Heß
c71fd1848b
simutrans: Fix hash 2020-12-17 19:01:32 +01:00
wucke13
2bb504e1f5 flightgear: 2020.1.3 -> 2020.3.4 2020-12-17 10:19:48 -05:00
Jonathan Baldwin
0127c29713 steam/fhsenv: Add LD_LIBRARY_PATH (and hence OpenGL driver library path) to output of --print-steam-runtime-library-paths 2020-12-16 14:04:44 -08:00
Tim Steinbach
be4cf62b67
minecraft: Update script URL 2020-12-16 12:53:58 -05:00
Tim Steinbach
fc3926ea2d
Revert "minecraft: 2.2.909 → 2.2.741" 
This reverts commit 8d4d8ef274.

The update script pulls the version info from AUR and they still use the old version.
Sorry...
 2020-12-16 11:31:33 -05:00
Tim Steinbach
8d4d8ef274
minecraft: 2.2.909 → 2.2.741 2020-12-16 10:43:39 -05:00
Milan Pässler
df4de2fcc4 superTuxKart: 1.1 -> 1.2 2020-12-14 20:21:47 +01:00
Reed
ba5e56f3e6 r2mod_cli: init at 1.0.5 2020-12-14 03:27:17 -05:00
Xottab_DUTY
3414ae7dfc openxray: update package description 
To correspond the current project description.
 2020-12-12 20:17:37 +03:00
Guillaume Girol
9101c027ae
Merge pull request #105136 from cizra/remove-tdm 
tdm: removed
 2020-12-11 20:04:00 +00:00
Carles Pagès
f1f9a55fb4 minecraft: 2.2.741 -> 2.2.909 2020-12-11 00:50:26 +01:00
Carles Pagès
219301713a
Merge pull request #106065 from bjpbakker/minecraft-fix-java_home 
minecraft: fix JAVA_HOME
 2020-12-10 23:51:34 +01:00
Martin Weinelt
6a4be92dd8
Merge pull request #106409 from jonringer/fix-steam 
steam: fix paradox launchers, and electron apps
 2020-12-09 17:08:05 +01:00
R. RyanTM
253de1fcdb alephone-infinity: 20190331 -> 20200904 2020-12-09 15:53:30 +01:00
Emery Hemingway
c5f714710c alephone: 20150620 -> 1.3.1 2020-12-09 15:53:29 +01:00
Jonathan Ringer
2831a66be6
steam: share ipc, fix some gui launchers 2020-12-08 18:42:56 -08:00
Jonathan Ringer
f162839a1e
steam: fix electron launchers 2020-12-08 18:04:49 -08:00
Jonathan Ringer
f3103fe2d1 steamPackages.steam-runtime: 0.20200720.0 → 0.20201203.1 2020-12-08 16:07:51 -08:00
Jonathan Ringer
e6bf832880 steamPackages.steam-runtime: add update script, fix pname 2020-12-08 16:07:51 -08:00
ajs124
497afae7e8
sauerbraten: 5492 -> 2020-12-04 
http://www.sauerworld.org/new-sauerbraten-2020-edition-released/
 2020-12-08 04:51:19 +01:00
Bart Bakker
0451efc553
minecraft: fix JAVA_HOME 
JAVA_HOME should point to the root directory of the JRE, not the `bin` folder.
 2020-12-06 14:43:09 +01:00
Sandro
87e8335402
Merge pull request #105907 from lukegb/factorio115 
factorio-experimental, factorio-headless-experimental: 1.1.4 -> 1.1.5
 2020-12-04 22:33:18 +01:00
Luke Granger-Brown
ff9d4cc09b factorio-experimental, factorio-headless-experimental: 1.1.4 -> 1.1.5 2020-12-04 19:38:40 +00:00
R. RyanTM
b0e8e8365b osu-lazer: 2020.1128.0 -> 2020.1204.0 2020-12-04 19:24:46 +00:00
TredwellGit
814df2946d minecraft: 2.1.17785 -> 2.2.741 2020-12-03 22:50:28 +00:00
Luke Granger-Brown
41742f1139 factorio-experimental, factorio-headless-experimental: 1.1.3 → 1.1.4 2020-12-03 16:55:33 +00:00
Sandro
0278e49268
Merge pull request #105692 from fgaz/mindustry/120.2 2020-12-02 22:04:03 +01:00
Sandro
85fa47d04b
Merge pull request #105649 from r-ryantm/auto-update/freeciv 
freeciv: 2.6.2 -> 2.6.2.1
 2020-12-02 17:18:03 +01:00
Francesco Gazzetta
298ddbb049 mindustry,mindustry-server: 120 -> 120.2 2020-12-02 13:53:31 +01:00
Francesco Gazzetta
5faf8cbfa5 mindustry,mindustry-server: mark as broken for darwin 
There is a hash mismatch when built on darwin:
https://github.com/NixOS/nixpkgs/pull/105590#issuecomment-737120293
 2020-12-02 13:52:19 +01:00
R. RyanTM
76e79467b2 freeciv: 2.6.2 -> 2.6.2.1 2020-12-02 04:33:17 +00:00
Francesco Gazzetta
48d423ee2a
mindustry,mindustry-server: 104.6 -> 120 (#105590) 
* mindustry,mindustry-server: 104.6 -> 120

* mindustry,mindustry-server: remove trailing space
 2020-12-01 17:44:51 +01:00
Sandro
5897ce498c
Merge pull request #105542 from r-ryantm/auto-update/osu-lazer 
osu-lazer: 2020.1121.0 -> 2020.1128.0
 2020-12-01 10:44:12 +01:00
R. RyanTM
df4f8c6ddb osu-lazer: 2020.1121.0 -> 2020.1128.0 2020-12-01 04:51:10 +00:00
Luke Granger-Brown
f838208033 factorio-experimental, factorio-headless-experimental: 1.1.2 -> 1.1.3 2020-11-30 20:27:23 +01:00
Luke Granger-Brown
8a63eaab52 factorio: add lukegb as maintainer 2020-11-30 18:07:19 +00:00
Luke Granger-Brown
2c8f7755d4 factorio: add an updateScript 
The updateScript knows how to automatically fetch and update the version
data from the Factorio versions API (and update the hashes
appropriately), which makes it easier to update whenever experimental
does.
 2020-11-30 18:07:16 +00:00
Elmo Todurov
9f196de48d tdm: removed 2020-11-29 23:25:09 +02:00
Frederik Rietdijk
db29c15173
Merge pull request #105151 from B4dM4n/copy-desktop-hook 
copyDesktopItems: add new setup-hook
 2020-11-29 13:26:40 +01:00
Sarah Brofeldt
dd59931b57
Merge pull request #104294 from gnidorah/openxray 
openxray: replace fix with proper patch
 2020-11-29 11:04:58 +01:00
gnidorah
f7029d628b openxray: replace fix with proper patch 
for glibc 2.32 compatibility
 2020-11-29 12:47:58 +03:00
R. RyanTM
bf7fa0189d pentobi: 18.3 -> 18.4 2020-11-29 04:43:00 +00:00
Fabian Möller
74088bad64 xonotic: use copyDesktopItems hook 2020-11-29 04:17:12 +01:00
Fabian Möller
81e2df3ce1 minecraft: use copyDesktopItems hook 2020-11-29 04:17:12 +01:00
Mario Rodas
ef7d285204
Merge pull request #104561 from r-ryantm/auto-update/nudoku 
nudoku: 2.0.0 -> 2.1.0
 2020-11-28 16:08:40 -05:00
Tim Steinbach
13ebb30910
minecraft-server: Add test 2020-11-28 12:43:17 -05:00
Tim Steinbach
0dc74a15ad
minecraft: Add test 2020-11-28 12:43:17 -05:00
nyanotech
c3f2f8ff1c
factorio-experimental, factorio-headless-experimental: 1.1.1 -> 1.1.2 2020-11-28 14:28:47 +00:00
Reed
d595620c38 papermc: 1.16.2r141 -> 1.16.4r296 2020-11-27 18:10:18 -05:00
Sandro
639017c738
Merge pull request #96192 from Artturin/change-multimc 
multimc: remove unneeded flag
 2020-11-27 22:48:41 +01:00
Sandro
ec421ca248
Merge pull request #100532 from piegamesde/fix-desktopitems 
treewide: Fix broken desktop files and mark packages as broken
 2020-11-27 22:27:59 +01:00
Tim Steinbach
0ce6c50370
minecraft: Skip desktop file validation 2020-11-27 15:43:21 -05:00
Doron Behar
2a84a4981d
Merge pull request #104705 from prusnak/voxelands 
voxelands: 1512.00 -> 1704.00
 2020-11-27 09:08:20 +02:00
Pavol Rusnak
1ed49e3ea9
voxelands: 1512.00 -> 1704.00 2020-11-26 10:59:32 +01:00
Sandro
56e6adf649
Merge pull request #102263 from Thra11/julius-1-5-1 
julius: 1.4.1 -> 1.5.1
 2020-11-26 02:33:32 +01:00
Thibault Polge
cf1efe2c7e
eduke32: fix version number, use string interpolation for src.url 
This fixes mistakes I've introduced in 7798a4e19c.
 2020-11-25 21:52:48 +01:00
MetaDark
61b94d7072 clonehero: init at 0.23.2.2 2020-11-25 13:32:53 -05:00
Luke Granger-Brown
6421a1b0ce factorio-experimental, factorio-headless-experimental: 1.1.0 -> 1.1.1 2020-11-25 14:45:57 +01:00
Mario Rodas
252fdbe2e0 nudoku: add platforms 2020-11-25 04:20:00 +00:00
Sandro
9b18fbb931
Merge pull request #104829 from r-ryantm/auto-update/gcompris 
gcompris: 0.98 -> 1.0
 2020-11-25 02:25:02 +01:00
R. RyanTM
7275a26ed5 gcompris: 0.98 -> 1.0 2020-11-25 00:38:23 +00:00
Pavol Rusnak
2b884eb9f6
Merge pull request #104732 from lukegb/factorio-fail-if-no-creds 
factorio: fail fetch early if no credentials provided
 2020-11-24 23:33:55 +01:00
Tom Hall
c96656d306 julius: 1.4.1 -> 1.5.1 
Mark as broken on darwin
 2020-11-24 22:29:18 +00:00
Graham Christensen
bc49a0815a
utillinux: rename to util-linux 2020-11-24 12:42:06 -05:00
Alvar Penning
6f88d6332d openrct2: 0.3.1 -> 0.3.2 2020-11-24 11:26:57 +01:00
Alvar Penning
f67c9a36f3 openrct2: 0.3.0 -> 0.3.1 2020-11-24 10:55:18 +01:00
Luke Granger-Brown
0508481dc9 factorio-experimental, factorio-headless-experimental: 1.0.0 -> 1.1.0 2020-11-24 04:05:30 +01:00
Luke Granger-Brown
86aa2a57d3 factorio: fail fetch early if no credentials provided 
The download URL will redirect to the login page if credentials are not
present, but will return an error if the credentials are wrong.

Since we know we always expect credentials, we can fail the fetch in
the preHook if they're not provided.

We can't use e.g. builtins.throw because we want the fetchurl derivation
to be evaluated in all cases - because that's the mechanism which allows
you to just manually add the tarball to the Nix store.
 2020-11-24 01:32:53 +00:00
Sandro
c9a9197078
Merge pull request #102269 from pkern/terraria 
terraria-server: 1.4.0.5 -> 1.4.1.2
 2020-11-24 00:17:47 +01:00
Jonathan Ringer
a748764be4 amoeba: xlibs -> xorg, fix borg 2020-11-23 11:40:23 -08:00
Ryan Mulligan
eb8f06106d
Merge pull request #104669 from oxalica/osu-lazer 
osu-lazer: 2020.1017.0 -> 2020.1121.0
 2020-11-23 11:19:17 -08:00
Jonathan Ringer
97178a01ed amoeba: fix build 2020-11-23 07:01:13 -08:00
Max Wilson
e82c3b68e1 steam: http -> https 2020-11-23 06:58:18 -08:00
Maximilian Bosch
b11ca24578
EmptyEpsilon: 2020.08.25 -> 2020.11.23 
https://github.com/daid/SeriousProton/releases/tag/EE-2020.11.23
 2020-11-23 15:55:37 +01:00
oxalica
2fd0efd7cb
osu-lazer: 2020.1017.0 -> 2020.1121.0 2020-11-23 20:41:06 +08:00
Pavol Rusnak
8eea9bd923 pioneers: 15.4 -> 15.6 2020-11-23 09:12:57 +01:00
R. RyanTM
04830655d7 nudoku: 2.0.0 -> 2.1.0 2020-11-22 05:10:07 +00:00
Francesco Gazzetta
0667d730bf domination: init at 1.2.3 2020-11-21 16:24:43 +01:00
Thibault Polge
7798a4e19c eduke32: 20190330 -> 20200907 2020-11-21 12:04:38 +01:00
freezeboy
9290417300 pentobi: 18.1 -> 18.3 
* Rewrite without stdenv and wrapQtAppsHook
 * Fetch source from GithHub
 2020-11-20 22:24:20 +01:00
freezeboy
9f930f68c0 solarus: move to multiple outputs 
motivation: Let solarus-quest-editor require only required bits
 2020-11-20 22:24:19 +01:00
Anderson Torres
ead04a6639
Merge pull request #104316 from AndersonTorres/at1985-update 2020-11-20 12:12:43 -03:00
AndersonTorres
c56cde86ca 1oom: init at 1.0 2020-11-19 19:05:23 -03:00
Jörg Thalheim
8313dacb11 treewide: remove trailing whitespace 2020-11-18 22:37:56 -08:00
Jörg Thalheim
72f6df338d remove genesis maintainer 
genesis has no longer access to github
 2020-11-18 22:37:56 -08:00
Peter Hoeg
b9a2a8a261 lgogdownloader: 3.5 -> 3.7 2020-11-17 15:51:05 +08:00
Anderson Torres
b77f0d0bc1
Merge pull request #103229 from zyansheep/master 
lunar-client: init at version 2.4.0
 2020-11-16 18:33:30 -03:00
Philipp Kern
990ddd4968 terraria-server: 1.4.0.5 -> 1.4.1.2 2020-11-14 22:44:35 +01:00
Zyansheep
660864eb6f lunar-client: init at 4.2.0 2020-11-13 12:27:46 -05:00
Maximilian Bosch
02a1379d45
EmptyEpsilon: 2020.08.07 -> 2020.08.25 
https://github.com/daid/EmptyEpsilon/releases/tag/EE-2020.08.25
 2020-11-12 19:41:27 +01:00
gnidorah
3aca0e1e6c vkquake: 1.05.0 -> 1.05.1 2020-11-10 09:05:15 +08:00
Samuel Gräfenstein
3ca5220350 keen4: add final newline to builder.sh 2020-11-09 11:39:28 +00:00
Michael Weiss
197ddbced2
mesa: Replace all usages of old aliases 2020-11-08 22:56:55 +01:00
Robert Hensing
c1cc245934
Merge pull request #100747 from oxalica/osu-lazer 
osu-lazer: 2020.925.0 -> 2020.1017.0
 2020-11-06 01:07:12 +01:00
gnidorah
c2bd0a4871 openxray: 730-july-preview -> 784-october-preview 2020-11-04 11:32:01 +01:00
freezeboy
ff16a8b8e9 scummvm: 2.1.2 -> 2.2.0 2020-11-04 09:22:02 +08:00
Matt Layher
55be01a0a3
minecraft-server: 1.16.3 -> 1.16.4 
Signed-off-by: Matt Layher <mdlayher@gmail.com>
 2020-11-02 14:10:14 -05:00
Michael Raskin
5db46fe5bf
Merge pull request #102416 from freezeboy/unbreak-liquidwar5 
liquidwar5: 5.6.4 -> 5.6.5, unbreak
 2020-11-02 09:31:51 +00:00
Pavol Rusnak
2c931312ce treewide: simplify rev/repo arguments in src 
+ use fetchFromGithub where possible
 2020-11-01 23:02:24 -08:00
freezeboy
0e17599e8e liquidwar5: 5.6.4 -> 5.6.5, unbreak 2020-11-02 02:58:54 +01:00
gnidorah
8c7ef10f71 vkquake: 1.04.1 -> 1.05.0 2020-11-01 20:54:39 +08:00
gnidorah
61040fa997 iortcw: init at 1.51c 2020-11-01 11:45:57 +01:00
WORLDofPEACE
8faab3de9a
Merge pull request #101384 from eyJhb/among-sus 
among-sus: init at 2020-10-22
 2020-10-30 16:45:53 -04:00
eyjhb
76cd544455
among-sus: init at 2020-10-29 2020-10-30 21:22:42 +01:00
WORLDofPEACE
c110da169d
Merge pull request #101859 from andir/steam-desktop 
steam: Do $PATH lookup in steam.desktop instead of hardcoding derivation
 2020-10-27 12:33:24 -04:00
Ben Siraphob
db74029e3e treewide: remove package names from prefix of descriptions 2020-10-27 09:15:07 -07:00
Michael Raskin
7371c2cc9b
Merge pull request #101837 from xfix/sgtpuzzles-20200610 
sgtpuzzles: 20191114 -> 20200610
 2020-10-27 16:08:02 +00:00
Klemens Nanni
db236e588d steam: Do $PATH lookup in steam.desktop instead of hardcoding derivation 
The desktop application and the absoloute path work fine.
But consider desktop environments such as KDE where, in the application
menu, one can right click entries and pin them to widgets/panels, add
them to the desktop, etc.

Doing so effectively means copying
/run/current-system/sw/share/applications/steam.desktop to
~/.local/share/plasma_icons/ or ~/Desktop/, i.e. managed stated gets
duplicated outside the nix scope.

The problem here is that steam.desktop hardcodes

	Exec=/nix/store/<derivation hash>-steam/bin/steam %U

this means such copies will point at wrong/outdated derivations once
the steam package changes, i.e. widgets/panels/desktop icons will no
longer work and must be recreated.

Therefore replace the absoloute path with a $PATH lookup to allow "safe"
copying;  this isn't optimal but other applications such Firefox and
Thunderbrid currently behave the same way ($PATH lookup in their
.desktop file).
 2020-10-27 16:21:43 +01:00
Maximilian Bosch
3c7890d47e
Merge pull request #101240 from gnidorah/openxray 
Fix builds of my packages w/glibc-2.32
 2020-10-27 15:10:54 +01:00
Konrad Borowski
d838ef0795 sgtpuzzles: 20191114 -> 20200610 2020-10-27 11:28:02 +01:00
Bob van der Linden
8dee03f40d
springlobby: move build tools to nativeBuildInputs 2020-10-26 22:33:58 +01:00
Bob van der Linden
b3b40bc7d0
springlobby: patch libcurl cmake configuration 2020-10-26 22:33:13 +01:00
Jan Tojnar
3825e74193 treewide: drop gnome2.pango alias 2020-10-25 23:48:29 +01:00
Ben Siraphob
c98962e1a3 treewide: remove periods from end of package descriptions 2020-10-25 20:13:18 +07:00
R. RyanTM
627b6f3f09 easyrpg-player: 0.6.2.1 -> 0.6.2.3 2020-10-25 10:46:31 +01:00