William A. Kennington III
1e1683f4ae
Add missing file
2015-03-25 14:17:22 -07:00
William A. Kennington III
8baaff95e6
intel-ucode: Generate an early loadable microcode image
2015-03-25 14:14:46 -07:00
William A. Kennington III
4d47c0dd24
kernel-config: Add microcode support + early loading on new kernels
2015-03-25 11:30:03 -07:00
William A. Kennington III
a040e15a48
kernel: 3.18.9 -> 3.18.10
2015-03-25 11:24:47 -07:00
Bjørn Forsman
ff9bc81946
lttng-modules: update to latest stable (fixes build)
...
Fixes build against linux 3.14.36+.
Also
* It works with linux 3.12 now, so remove that assert
* Remove unneeded patches (merged upstream)
2015-03-24 07:10:12 +01:00
Ricardo M. Correia
232b434bc4
gradm: Update from 3.1-201502222102 -> 3.1-201503211320
2015-03-24 03:47:27 +01:00
William A. Kennington III
786f3216bc
zfs_git: 2015-03-12 -> 2015-03-20
2015-03-22 12:20:53 -07:00
William A. Kennington III
d071563006
spl_git: 2015-03-03 -> 2015-03-20
2015-03-22 12:20:38 -07:00
Mathijs Kwik
5cac50b3bf
kernel: add support for experimental Realtek2800 models
...
tested with AVM Fritz wlan Stick N
2015-03-22 13:49:29 +01:00
Michael Raskin
d5b558c613
update sysdig
2015-03-21 21:29:39 +03:00
Michael Raskin
15e66fa577
update eudev
2015-03-21 21:29:39 +03:00
Ricardo M. Correia
0f5a5cae76
grsecurity: Update test patch from 3.1-3.19.2-201503182219 -> 3.1-3.19.2-201503201903
2015-03-21 06:23:26 +01:00
William A. Kennington III
6437ad00f0
kernel/common-config: More fixes
2015-03-20 15:05:43 -07:00
William A. Kennington III
6e404cb338
linux-testing: 4.0.0-rc2 -> 4.0.0-rc4
2015-03-20 15:02:01 -07:00
William A. Kennington III
9dc8335294
kernel/common-config: Fix older kernels
2015-03-20 14:41:03 -07:00
William A. Kennington III
36ada70250
kernel: 3.14.35 -> 3.14.36
2015-03-20 14:21:39 -07:00
William A. Kennington III
a7c32c8ea5
kernel: 3.19.1 -> 3.19.2
2015-03-20 14:19:49 -07:00
William A. Kennington III
b9537d17f6
kernel: 3.12.38 -> 3.12.39
2015-03-20 14:16:01 -07:00
William A. Kennington III
0517907801
kernel: 3.10.71 -> 3.10.72
2015-03-20 14:15:59 -07:00
Austin Seipp
3ff22a924f
Merge pull request #6871 from joachifm/apparmor-fixups
...
Apparmor fixups
2015-03-20 15:36:42 -05:00
Eelco Dolstra
2ed5c2bd6b
Set some meta.platforms
...
Also fix meta.platform -> meta.platforms in a few places.
2015-03-20 20:04:42 +01:00
Eelco Dolstra
dda16e0c06
pam_login: Remove
...
We haven't used/updated this package in years.
2015-03-20 16:38:21 +01:00
Eelco Dolstra
87c86f6711
pam_console: Remove
...
This package is no longer used in NixOS.
2015-03-20 16:18:10 +01:00
Shea Levy
19cd9f16a0
Merge branch 'staging'
2015-03-20 09:53:34 -04:00
Arseniy Seroka
48e06786fd
Merge pull request #6897 from joachifm/apparmor-revdeps
...
Change uses of apparmor to libapparmor (v2.9)
2015-03-19 19:53:27 +03:00
Eelco Dolstra
cb7b0f3c1b
Merge pull request #6898 from joachifm/redundant-params
...
kernelPatches: remove unused parameters
2015-03-19 15:31:03 +01:00
Joachim Fasting
fa843cdf11
lxc: use AppArmor 2.9
2015-03-19 14:12:15 +01:00
Joachim Fasting
cd55b6b5bb
kernelPatches: remove unused parameters
2015-03-19 14:08:16 +01:00
Ricardo M. Correia
5b074d20f8
zfs: Update from 0.6.3-1.2 -> 0.6.3-1.3
2015-03-19 06:08:08 +01:00
Ricardo M. Correia
1e28cd0c83
spl: Update from 0.6.3-1.2 -> 0.6.3-1.3
...
Removed time.patch (applied upstream).
2015-03-19 06:07:54 +01:00
Bjørn Forsman
5c59b23cef
alsa-firmware: longDescription => description
2015-03-18 21:26:20 +01:00
lethalman
626c7d8812
Merge pull request #6835 from bencef/alsa_firmware
...
Add alsa-firmware package
2015-03-18 15:31:29 +01:00
Joachim Fasting
b0698d4342
apparmor: fixup install locations
...
This patch fixes install locations for man pages, python modules
and vim scripts. This patch improves but does not fix the user-land
AppArmor utilities (i.e., they can now import the modules they need
but are broken in other ways still).
2015-03-18 12:11:02 +01:00
Joachim Fasting
dc71d5b602
apparmor: factor out common prePatch
2015-03-18 12:08:11 +01:00
Joachim Fasting
a470b2748b
Cleanup apparmor expression
...
Remove excessive whitespace & comments.
2015-03-18 12:07:49 +01:00
Yorick van Pelt
a2dc00c177
nvidiabl: fix for other kernel versions than current
...
It was using the version of currently *running* kernel (impurely).
Close #6869 .
2015-03-18 10:48:45 +01:00
Austin Seipp
b0519234dd
nixpkgs: musl 1.1.4 -> 1.1.6
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-03-17 20:29:46 -05:00
Austin Seipp
1840694a84
nixpkgs: lockdep 3.17 -> 3.19.1
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-03-17 20:29:46 -05:00
Bence Fabian
ba6aee260e
remove DESTDIR and don't strip
2015-03-17 20:59:31 +01:00
Bence Fabian
66e5b36378
remove /usr prefix in postInstall
2015-03-17 20:59:31 +01:00
Bence Fabian
90b083d387
Add alsa-firmware package
2015-03-17 20:59:31 +01:00
Vladimír Čunát
e924f05cc3
Merge branch 'master' into staging
2015-03-17 13:35:05 +01:00
Ricardo M. Correia
92501d62f4
zfs_git: Update to 2015-03-12
2015-03-17 03:43:31 +01:00
Austin Seipp
ef95600372
Merge pull request #6771 from joachifm/apparmor-2.9
...
Apparmor 2.9
2015-03-15 14:16:24 -05:00
Ricardo M. Correia
d848e34616
pax-utils: Update from 1.0.1 -> 1.0.2
2015-03-15 05:16:57 +01:00
Ricardo M. Correia
7c8247a8c5
grsecurity: Update stable and test patches
...
stable: 3.1-3.14.35-201503071140 -> 3.1-3.14.35-201503092203
test: 3.1-3.18.9-201503071142 -> 3.1-3.19.1-201503122205
2015-03-15 03:49:58 +01:00
Eelco Dolstra
ebef573641
Merge pull request #6476 from ts468/squashfs
...
Change kernel config: improve squashfs support of kernel
2015-03-12 21:41:53 +01:00
Joachim Fasting
e3b1b09779
Add AppArmor 2.9
...
The 2.9 series brings features such as support for dbus, unix
abstract sockets, ptrace mediation, and replaces Perl tools
with equivalents implemented in Python. See [1] for details.
The package expression has been changed to build each component
(library, parser) separately. Additionally, Perl is now only
used to build man pages and locale support has been removed.
The user-land tools are currently broken (fail to import the Python module),
but this isn't really a regression, as only two or three of the tools
installed by the previous version were functional. The most important
tool, aa-status, works, however.
Lastly, dbus support is compiled in, but is untested and probably
requires patching of dbus.
[1]: http://wiki.apparmor.net/index.php/ReleaseNotes_2_9_0
2015-03-12 11:45:53 +01:00
Eelco Dolstra
fa3bcc4f1c
perf: Use libunwind and libbfd
...
This gives better stack traces.
2015-03-11 18:15:48 +01:00
Eelco Dolstra
798e613e16
kernel: Enable kprobes and other tracing features
...
All of these should have minimal performance impact unless enabled at
runtime.
2015-03-11 17:14:37 +01:00
Eelco Dolstra
dfc6809215
Add perf-tools
2015-03-11 17:13:23 +01:00
William A. Kennington III
aad4e6fb84
zfs: 2015-03-05 -> 2015-03-10
2015-03-10 11:23:40 -07:00
Peter Simons
6694ef42a9
Merge branch 'master' into staging.
...
Conflicts:
pkgs/development/libraries/gtk+/2.x.nix
pkgs/tools/security/gnupg/21.nix
pkgs/top-level/all-packages.nix
2015-03-10 12:09:43 +01:00
William A. Kennington III
73f3432fbb
firmware-linux-nonfree: 2015-02-27 -> 2015-03-09
2015-03-09 17:01:31 -07:00
aszlig
8cd6d53930
kbd: Patch in support for the Neo keyboard layout.
...
This adds support for the Neo keyboard layout (http://neo-layout.org/ , a
layout optimized for the German language) for the native Linux console.
It also adds build dependencies on autotools and friends, because we
need to recreate the automake config in order to include a new keyboard
layout directory.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-03-09 19:42:59 +01:00
Michael Raskin
5c5ade16ba
update sysdig
2015-03-09 01:03:01 +03:00
Michael Raskin
8fcc960e6e
Update firejail
2015-03-09 01:03:01 +03:00
William A. Kennington III
6b666dca7c
kernel: 3.14.34 -> 3.14.35
2015-03-08 14:58:46 -07:00
William A. Kennington III
cf9d5ceda1
kernel: 3.18.8 -> 3.18.9
2015-03-08 14:57:44 -07:00
William A. Kennington III
a086f5df70
kernel: 3.2.67 -> 3.2.68
2015-03-08 14:57:44 -07:00
William A. Kennington III
4c01585211
kernel: 3.19 -> 3.19.1
2015-03-08 14:57:43 -07:00
William A. Kennington III
09e477a045
kernel: 3.10.70 -> 3.10.71
2015-03-08 14:55:11 -07:00
Thomas Strobel
0d1c39443b
Change kernel config: improve squashfs support of kernel
2015-03-08 13:58:00 +01:00
William A. Kennington III
e49db703dc
zfs_git: 2015-03-02 -> 2015-03-05
2015-03-06 11:56:43 -08:00
William A. Kennington III
bc49764fe2
spl_git: 2015-02-27 -> 2015-03-03
2015-03-06 11:56:43 -08:00
Shea Levy
6b53021205
Merge branch 'master' into staging
2015-03-06 19:02:36 +00:00
Lluís Batlle i Rossell
d1e302121a
Merging changes to make more things build on rpi2
2015-03-06 15:43:32 +00:00
Eelco Dolstra
3b9b620656
Revert "linux: disable UEVENT_HELPER*"
...
This reverts commit 9f87f3ccb0
2015-03-06 15:59:06 +01:00
Ricardo M. Correia
96b2d27e69
pax-utils: Update from 1.0 -> 1.0.1
2015-03-06 05:03:54 +01:00
Peter Simons
1d953779b0
Merge remote-tracking branch 'origin/master' into staging.
2015-03-05 12:24:57 +01:00
Lluís Batlle i Rossell
cfd9b77e82
kernel: I hope to fix the dtbs thing
...
I thought $arch was defined. Now I'm using karch, that should serve for cross
building as well.
2015-03-05 09:10:19 +00:00
Lluís Batlle i Rossell
31cccd88ed
kernel: Trying to fix makeflags of 'make dtbs'
2015-03-05 09:10:17 +00:00
Lluís Batlle i Rossell
42c6115872
kernel: I forgot $makeFlags in make dtbs
2015-03-05 09:10:15 +00:00
Lluís Batlle i Rossell
3e92c4e0ff
Trying to make DTBs if set in platform.
2015-03-05 09:09:34 +00:00
Lluís Batlle i Rossell
56989d9f20
Updating the raspberry pi kernel sources to recent, for pi2
2015-03-05 09:09:32 +00:00
Vladimír Čunát
7e042659b7
plymouth: hacky fix build (automake-related)
2015-03-04 22:02:09 +01:00
Ricardo M. Correia
9e19e5dc98
pax-utils: Update from 0.9.2 -> 1.0
2015-03-04 18:04:52 +01:00
Eelco Dolstra
c502efc72a
linux: Enable Intel idle driver
...
Also build the performance governor into the kernel so there is a sane
default. Note that cpufreq.service will still load "ondemand" on
non-pstate systems.
2015-03-04 17:11:41 +01:00
Eelco Dolstra
26da67ff73
Kernel config: Separate power management and debugging
2015-03-04 17:10:47 +01:00
aszlig
8ed8277c74
linux-testing: Update to version 4.0-rc2.
...
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-03-04 15:42:44 +01:00
aszlig
791b970c6e
linux/kernel: Remove EXT2_FS_XIP for version 4.0.
...
The option has been removed in torvalds/linux@6cd176a and thus we
shouldn't try to set it for kernel version 4.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-03-04 15:42:44 +01:00
William A. Kennington III
ebcc826bd6
zfs_git: 2015-02-24 -> 2015-03-02
2015-03-03 13:01:37 -08:00
William A. Kennington III
21ce0493f5
spl_git: 2015-02-04 -> 2015-02-27
2015-03-03 12:58:43 -08:00
William A. Kennington III
f311c156f5
linux-firmware-nonfree: 2015-02-24 -> 2015-02-27
2015-03-03 12:55:26 -08:00
Alexander V. Nikolaev
bd87d32efc
util-linux: update to 2.26 ( close #6553 )
...
Patch unshare-fix-map-root-user.patch appiled upstream, and removed.
Trigger mass-rebuild, so PR will be to staging
2015-03-03 11:36:53 +01:00
William A. Kennington III
24f25e6f9a
kernel: 3.18.7 -> 3.18.8
2015-03-02 19:52:26 -08:00
William A. Kennington III
103f9820f6
kernel: 3.14.33 -> 3.14.34
2015-03-02 19:52:26 -08:00
William A. Kennington III
f97b6e891c
kernel: Update testing to 4.0-rc1
2015-03-02 19:52:26 -08:00
William A. Kennington III
3ab435dfa8
kernel: 3.2.66 -> 3.2.67
2015-03-02 19:52:26 -08:00
William A. Kennington III
08b47c57f7
kernel: 3.12.37 -> 3.12.38
2015-03-02 19:52:26 -08:00
William A. Kennington III
cb24bc18b9
kernel: 3.10.69 -> 3.10.70
2015-03-02 19:52:26 -08:00
Eelco Dolstra
584ca36462
linux: Disable CONFIG_DEBUG_STACKOVERFLOW
...
This got enabled accidentally in
e64e3ad88a
2015-03-02 23:36:05 +01:00
Eelco Dolstra
06dfa19b99
nvidia-x11: Use GTK 2
...
Otherwise we end up with multiple versions of GTK in the system
closure. Also, GTK 3 is not well integrated in NixOS yet (e.g. it
doesn't respect KDE's colour scheme).
2015-03-02 00:23:43 +01:00
Eelco Dolstra
38b53b8e7d
nvidia-x11: Update to 346.47
2015-03-02 00:23:43 +01:00
Tobias Geerinckx-Rice
9f87f3ccb0
linux: disable UEVENT_HELPER*
...
Deprecated since 2006: http://lwn.net/Articles/166954/
2015-03-01 03:31:59 +01:00
William A. Kennington III
7d5ab9a4d2
linux-firmware-nonfree: Use date instead of git version
2015-02-25 11:53:14 -08:00
William A. Kennington III
a6ea74ac6a
spl_git: Use date format
2015-02-25 11:53:14 -08:00
William A. Kennington III
f08e87a01e
zfs_git: Update
2015-02-24 14:16:18 -08:00
William A. Kennington III
4bbc026594
linux-firmware-nonfree: Update
2015-02-24 14:14:34 -08:00
Vladimír Čunát
3009cc116e
nvidia_x11: fix missing xorg lib symlinks; refactor
...
The builder structure should be now easier to understand
and easier to avoid such problems in future.
Fixes #6546 .
2015-02-24 13:17:56 +01:00
Ricardo M. Correia
4ce947327a
gradm: Update from 3.0-201408301734 -> 3.1-201502222102
2015-02-23 18:38:23 +01:00
Ricardo M. Correia
e196cd5611
grsecurity: Update stable and test patches
...
stable: 3.0-3.14.33-201502200812 -> 3.1-3.14.33-201502222137
test: 3.0-3.18.7-201502200813 -> 3.1-3.18.7-201502222138
2015-02-23 18:38:13 +01:00
Arseniy Seroka
a477e91f47
zfs-git: fix name (use date)
2015-02-23 20:30:14 +03:00
Vladimír Čunát
7bf2021349
nvidia_x11: reintroduce libXv for nvidia-settings
...
It was dropped in 77986803a6
2015-02-21 17:28:02 +01:00
Vladimír Čunát
77986803a6
nvidia_x11: fix nvidia-settings after the major update
...
The GUI would no longer find libs it needed.
Now it's gtk3 by default, so we don't support gtk2 version for simplicity.
ldd finds no missing libs after this commit.
2015-02-21 16:07:53 +01:00
Ricardo M. Correia
50bf56fd09
grsecurity: Update stable and test patches
...
stable: 3.0-3.14.33-201502181906 -> 3.0-3.14.33-201502200812
test: 3.0-3.18.7-201502180834 -> 3.0-3.18.7-201502200813
2015-02-20 14:29:45 +01:00
Shea Levy
830c76d6ba
Merge branch 'xen_kernel' of git://github.com/ts468/nixpkgs
...
Add kernel config form dom0 of Xen
2015-02-20 07:49:46 -05:00
Ricardo M. Correia
99eb8705cd
grsecurity: Update stable patch from 3.0-3.14.33-201502180832 -> 3.0-3.14.33-201502181906
2015-02-19 04:47:44 +01:00
Ricardo M. Correia
c5a7115721
grsecurity: Update stable and test patches
...
stable: 3.0-3.14.32-201502062101 -> 3.0-3.14.33-201502180832
test: 3.0-3.18.6-201502062100 -> 3.0-3.18.7-201502180834
2015-02-18 17:24:53 +01:00
Eric Seidel
d2a987d6e3
fix travis evaluation by providing explicit libiconv for the rare cases
...
that need it, like uclibc
2015-02-17 20:10:26 -08:00
Thomas Strobel
eb97dc0013
Add kernel config for dom0 of Xen
2015-02-16 20:52:06 +01:00
Luca Bruno
915075ca0e
Revert "nfs-utils: update from 1.2.5 to 1.3.1"
...
This reverts commit bde3fe2335
2015-02-16 13:59:34 +01:00
Luca Bruno
8b666652a5
Revert "nfs-utils: Build and update for 1.3.2"
...
This reverts commit a4ef29c499
2015-02-16 13:59:34 +01:00
Eelco Dolstra
fb72208bcf
nvidia-x11: Update to 340.76
2015-02-16 11:49:17 +01:00
William A. Kennington III
50bcf4583f
zfs_git: Update
2015-02-15 23:59:27 -08:00
William A. Kennington III
f2e464c89b
iproute: 3.18.0 -> 3.19.0
2015-02-15 19:07:34 -08:00
Tobias Geerinckx-Rice
dff06cdd43
freefall 3.18.3 -> 3.19
2015-02-15 23:35:56 +01:00
William A. Kennington III
69a277e2cc
iwlegacy: Remove since it is already in linux-firmware-nonfree
2015-02-13 14:27:47 -08:00
William A. Kennington III
58a04a9359
kernel: 3.14.32 -> 3.14.33
2015-02-13 13:42:20 -08:00
William A. Kennington III
b41222e5c6
kernel: 3.10.68 -> 3.10.69
2015-02-13 13:42:20 -08:00
William A. Kennington III
a15f149f74
kernel: 3.18.6 -> 3.18.7
2015-02-13 13:42:19 -08:00
Peter Simons
54ce1a1810
Merge remote-tracking branch 'origin/master' into staging.
...
Conflicts:
pkgs/development/compilers/ghc/head.nix
pkgs/top-level/haskell-ng.nix
2015-02-13 22:13:25 +01:00
Eelco Dolstra
e783edc72e
Merge pull request #6296 from nckx/add-kernel-config
...
Enable kernel configuration option FANOTIFY
2015-02-13 13:32:48 +01:00
Tobias Geerinckx-Rice
a43db5fa20
kernel: common-config.nix: enable FANOTIFY
2015-02-12 19:39:44 +01:00
William A. Kennington III
5742b24271
zfs_git: Update and remove obsolete patch
2015-02-11 14:47:37 -08:00
Tobias Geerinckx-Rice
a5c072a610
kernel: common-config.nix: remove useless 'FTRACE n' before 'y'
2015-02-11 05:29:48 +01:00
Vladimír Čunát
57f2d329ac
linux_3_{10,12,14}: fix upstream regression, fixes #6231
...
Some modules wouldn't load crc32c dependency due to module renaming.
2015-02-10 13:45:20 +01:00
Michael Raskin
0a2e86849a
Update sysdig; 0.1.96 still doesn't work with Linux 3.19
2015-02-10 11:14:25 +03:00
William A. Kennington III
eeb5319a43
nvidia_x11: 343.36 -> 346.35
2015-02-09 21:41:47 -08:00
William A. Kennington III
650b2258f0
nonfree-firmware: Use the new kernel.org repository for tracking nonfree firmware changes
...
remove the obsolete iwlwifi firmware which is included in the repo.
2015-02-09 16:28:40 -08:00
Michael Raskin
0e73d1f9a5
Mark the kernel branch; put in the reminder about grsecurity
2015-02-09 21:51:48 +03:00
William A. Kennington III
14978d8674
kernel: Add 3.19 as latest
2015-02-09 10:42:19 -08:00
Peter Simons
7b99c149a4
Merge branch 'master' into staging.
2015-02-09 16:51:10 +01:00
William A. Kennington III
8405d37d9a
Merge pull request #5530 from abbradar/ibt-hw
...
linux-firmware: add ibt-hw firmware
2015-02-08 14:59:09 -08:00
William A. Kennington III
a4ef29c499
nfs-utils: Build and update for 1.3.2
2015-02-08 14:57:01 -08:00
Edward O'Callaghan
bde3fe2335
nfs-utils: update from 1.2.5 to 1.3.1
...
Potentially fixes CVE-2013-1923.
Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
2015-02-08 14:57:01 -08:00
William A. Kennington III
5a1089d024
Merge pull request #6245 from edwtjo/samba-collate-urls
...
fetchurl: collate samba project urls into a mirror
2015-02-08 13:38:01 -08:00
Edward Tjörnhammar
33a8a51657
fetchurl: collate samba project urls into a mirror
2015-02-08 22:29:27 +01:00
William A. Kennington III
7ae9c92f92
spl: Fix bad copy paste
2015-02-07 17:18:15 -08:00
William A. Kennington III
161e9648e4
spl: Make naming more consistent with zfs
2015-02-07 15:21:30 -08:00
William A. Kennington III
f177036817
zfs: Modularize and create a userspace only package
2015-02-07 15:07:38 -08:00
William A. Kennington III
91e6126a32
spl: Modularize and create a userspace only package
2015-02-07 15:07:38 -08:00
William A. Kennington III
73c7c7978c
zfs_git: Update to latest and add the compatability patch
2015-02-07 13:51:38 -08:00
William A. Kennington III
fe03dc1a10
spl_git: Update to latest
2015-02-07 13:51:37 -08:00
William A. Kennington III
c4d21cf1c4
kernel: 3.14.31 -> 3.14.32
2015-02-07 12:08:09 -08:00
William A. Kennington III
f103b0f78b
kernel: 3.18.5 -> 3.18.6
2015-02-07 12:07:17 -08:00
William A. Kennington III
321743728d
kernel: Remove outdated kernel 3.17
2015-02-07 12:05:55 -08:00
William A. Kennington III
0ea09cf926
kernel: 3.10.67 -> 3.10.68
2015-02-07 12:04:43 -08:00
William A. Kennington III
e5900a2f10
iproute: 3.17.0 -> 3.18.0
2015-02-06 12:53:10 -08:00
Pascal Wittmann
e27ff487bf
linux-console-tools: update from 1.4.7 to 1.4.8
2015-02-06 15:31:32 +01:00
