Commit Graph

593 Commits

Author SHA1 Message Date
Lengyel Balazs
a8bc355b06 xorg/xf86-video-neomagic: 1.2.9 -> 1.3.0 2019-01-04 14:38:57 +01:00
Lengyel Balazs
f4a53ff3bc treewide/xorg: replace *proto with xorgproto 2019-01-04 14:38:57 +01:00
Lengyel Balazs
c3db044b54 xorg: replace *proto with xorgproto 2019-01-04 14:38:57 +01:00
Lengyel Balazs
167e609faa xorg: use https for sources without mirrors 2019-01-04 14:38:57 +01:00
Robin Gloster
2d0fad757a
xorg: generate python into nativeBuildInputs 2018-11-28 14:28:32 +01:00
Will Dietz
8bbf525fd3 libx11: 1.6.6 -> 1.6.7
https://lists.x.org/archives/xorg-announce/2018-October/002921.html
2018-11-21 15:31:34 -06:00
Vladimír Čunát
9108b24253
xorg: init xf86-video-vboxvideo at 1.0.0
... and switch to it by default in virtualbox guests
2018-11-12 20:29:14 +01:00
John Ericson
1147d2ed89 Merge remote-tracking branch 'upstream/master' into xorg-override 2018-10-18 12:00:37 -04:00
Andrew Childs
fb9604c4b7 xorg: simplify argument passing into xorg and overrides 2018-10-11 15:03:06 -04:00
Andrew Childs
9454f71fef xorg: allow overriding via overrideScope 2018-10-11 13:41:27 -04:00
Will Dietz
f66ae2c8b2 libxcb: 1.13 -> 1.13.1 (#47450)
https://lists.freedesktop.org/archives/xcb/2018-September/011155.html
(cherry picked from commit b043a056a2cc6a4ab129ab1ce2bf7d4aa7d2ea69)
2018-09-28 10:15:59 +02:00
Will Dietz
7047d60ef4 libXinerama: 1.1.3 -> 1.1.4
https://lists.x.org/archives/xorg-announce/2018-July/002905.html
2018-09-25 20:07:31 -05:00
Vladimír Čunát
3a09a4b579
Merge branch 'master' into staging
Hydra: ?compare=1480463
2018-09-24 21:18:23 +02:00
Linus Heckemann
155e017390 xorg.libxcb: 1.12 -> 1.13 2018-09-23 13:53:25 +01:00
Will Dietz
55a5236630 xf86-input-libinput: 0.26.0 -> 0.28.0
https://cgit.freedesktop.org/xorg/driver/xf86-input-libinput/log/
2018-09-21 07:58:57 -05:00
Vladimír Čunát
cb44c3ff4c
xorg.libX11: 1.6.5 -> 1.6.6 (security)
CVE-2018-14598, CVE-2018-14599, CVE-2018-14600
https://lists.x.org/archives/xorg-announce/2018-August/002915.html
2018-08-21 19:32:13 +02:00
John Ericson
db965063b3 treewide: Make configureFlags lists 2018-08-03 17:06:03 -04:00
Silvan Mosberger
5edb09c3db
Merge pull request #40625 from romildo/fix.xkeyboard-config
xkeyboard-config: enable xkb rules symlink
2018-07-28 04:37:46 +02:00
Yegor Timoshenko
c9a1e46085 xkbcomp: 1.4.0 -> 1.4.2 (#43589) 2018-07-16 10:41:07 +02:00
Pascal Wittmann
b85d1f638a
xeyes: 1.1.1 -> 1.1.2 2018-07-12 22:18:03 +02:00
Silvan Mosberger
5bdd9bddb5
xorg.xkeyboardconfig: 2.23.1 -> 2.24 2018-07-09 04:51:18 +02:00
Will Dietz
f22cbe5c35 xbacklight: 1.2.1 -> 1.2.2 (#43101) 2018-07-06 11:27:49 +02:00
Silvan Mosberger
57bccb3cb8 treewide: http -> https sources (#42676)
* treewide: http -> https sources

This updates the source urls of all top-level packages from http to
https where possible.

* buildtorrent: fix url and tab -> spaces
2018-06-28 20:43:35 +02:00
John Ericson
db4d77779c Merge remote-tracking branch 'upstream/master' into staging 2018-05-21 20:21:48 -04:00
David McFarland
456d0e280e xorg: fix missing gbm dependency for amdgpu driver 2018-05-19 17:40:04 -03:00
David McFarland
2b7fe3bf5a xorg: replace edits to generated script
- update versions in .list files to match
- move cf-files postInstall to overrides.nix
2018-05-19 17:21:40 -03:00
José Romildo Malaquias
14cbd4d17a xkeyboard-config: enable xkb rules symlink 2018-05-16 22:57:45 -03:00
Tuomas Tynkkynen
3c6e077301 Merge remote-tracking branch 'upstream/master' into HEAD
Conflicts:
	pkgs/development/tools/misc/binutils/default.nix
2018-04-22 22:31:30 +03:00
Daiderd Jordan
d7d692778c
Merge pull request #39173 from knedlsepp/enable-xskat-darwin
Enable some imake builds on darwin
2018-04-20 08:37:19 +02:00
Josef Kemetmüller
820da05d78 xorg.xorgcffiles: Don't use darwin's /usr/bin
All imake (xmkmf) based builds use the lib/X11/config/darwin.cf file to
define locations of cpp, cc, c++ (in /usr/bin by default). We remove the
directoy part to force darwin builds to search the $PATH for those
commands.
2018-04-20 01:03:08 +02:00
Matthew Justin Bauer
13fb4458c2
Merge pull request #37578 from ryantm/auto-update/xkeyboard-config
xkeyboard_config: 2.22 -> 2.23.1
2018-04-17 10:39:49 -05:00
Nikolay Amiantov
a798ec30f9 xorg: update autogeneration script
* Fix shebang so that it's usable on NixOS;
* Enable warnings (they were enabled with Perl flag before);
* Switch from mesa to libGL.
2018-03-26 14:01:49 +03:00
Tuomas Tynkkynen
809b0d26bd Merge remote-tracking branch 'upstream/master' into staging 2018-03-22 09:54:10 +02:00
Ryan Mulligan
ba144aa630 xorg.xinit: 1.3.4 -> 1.4.0
Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.4.0 with grep in /nix/store/bxyqz9d31nzmjxahn97f60706ck895sw-xinit-1.4.0
- directory tree listing: https://gist.github.com/6f82742b7f83f4fcd6fddb1da6311b84
2018-03-21 22:38:14 +00:00
Ryan Mulligan
3a3b34dbcc xorg.xf86videovesa: 2.3.4 -> 2.4.0
Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.4.0 with grep in /nix/store/61y7ka641q9l5ykkfdilk1507xqv8gnl-xf86-video-vesa-2.4.0
- directory tree listing: https://gist.github.com/148425747ac738aa905b76186c75afc4
2018-03-21 22:28:19 +00:00
Ryan Mulligan
e3fe9f0b15 xorg.xf86videoati: 7.9.0 -> 18.0.1
Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 18.0.1 with grep in /nix/store/00hw6alrivxhdl0x9alclhidmnq358mb-xf86-video-ati-18.0.1
- directory tree listing: https://gist.github.com/094fbc79ea86324a9b95f4784be3e1cd
2018-03-21 22:27:49 +00:00
Ryan Mulligan
0e443ceb9e xorg.libXfixes: 5.0.2 -> 5.0.3
Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 5.0.3 with grep in /nix/store/g5hcg35wmg25sgfjp7mvi4cx3shldbxd-libXfixes-5.0.3
- directory tree listing: https://gist.github.com/7398ada0908969ebbd1e7e629a1e0ef7
2018-03-21 22:23:36 +00:00
Ryan Mulligan
13ab409b1e xorg.utilmacros: 1.19.1 -> 1.19.2
Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.19.2 with grep in /nix/store/0dsmsg3p8dzp24h3ldc8xl0kzjwxpg6b-util-macros-1.19.2
- directory tree listing: https://gist.github.com/c2988d9a6c1d7cd8bfd5b9513e60d79c
2018-03-21 22:22:53 +00:00
obadz
e05a926713 Revert "xorg.xkill: 1.0.4 -> 1.0.5"
This reverts commit 4f0d0cc6ad.
2018-03-21 22:09:18 +00:00
Ryan Mulligan
4f0d0cc6ad xorg.xkill: 1.0.4 -> 1.0.5
Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/gjg9nnbybyy2mig9hkd8kfsv7msdi733-xkill-1.0.5/bin/xkill -v` and found version 1.0.5
- found 1.0.5 with grep in /nix/store/gjg9nnbybyy2mig9hkd8kfsv7msdi733-xkill-1.0.5
- directory tree listing: https://gist.github.com/220fd7765fdc12432a2b23fd0f68c24b
2018-03-21 22:08:23 +00:00
Ryan Mulligan
1a6439fea2 xkeyboard_config: 2.22 -> 2.23.1
Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.23.1 with grep in /nix/store/rzna96awj2li59rvgpk0ib40bj0jx8xx-xkeyboard-config-2.23.1
- directory tree listing: https://gist.github.com/6c094cb77d9d6e1110bc5d44144a55ba
2018-03-21 08:39:58 -07:00
Jan Tojnar
a31d98f312
tree-wide: autorename gnome packages to use dashes 2018-02-25 17:41:16 +01:00
Vladimír Čunát
291eac9d70
xorg-server: 1.19.5 -> 1.19.6 (maintenance) 2017-12-29 10:01:22 +01:00
Vladimír Čunát
5f020d5627
Merge branch 'staging'
There are security fixes in multiple packages /cc #32117,
so I'm merging a little earlier, with a few thousand jobs
still not finished on Hydra for x86_64-darwin and aarch64-linux.
2017-11-29 10:02:40 +01:00
rnhmjoj
69450d8ce3 xorg.bitmap: init at 1.0.8 2017-11-29 04:26:24 +00:00
Vladimír Čunát
db6adec156
xorg.libXfont*: security update for CVE-2017-16611 2017-11-28 21:00:56 +01:00
Vladimír Čunát
98e3af04b6
xorg.libXcursor: security 1.1.14 -> 1.1.15
Fix heap overflows when parsing malicious files. (CVE-2017-16612)
2017-11-28 20:59:59 +01:00
Vladimír Čunát
f6fe84d15d
xorg.bdftopcf: 1.0.5 -> 1.1 2017-11-27 13:09:19 +01:00
Vladimír Čunát
0ebb3e3926
xorg.libpciaccess: 0.13.5 -> 0.14 2017-11-27 13:08:46 +01:00
Vladimír Čunát
734c21a9f7
xf86-input-libinput: 0.25.0 -> 0.26.0 2017-11-27 13:07:35 +01:00
Vladimír Čunát
525e121626
xorg.libXfont: 1.5.2 -> 1.5.3
It fixes CVE-2017-{13720,13722} but it's apparently very low-impact.
2017-10-21 10:10:44 +02:00
Vladimír Čunát
2baf618c3e
xorg-server: security 1.19.4 -> 1.19.5
CVE-2017-{12176,12177,12178,12183}
2017-10-14 11:55:21 +02:00
Vladimír Čunát
6328c76e77
xorg libXfont2, libXres: security updates
CVE-2013-1988, CVE-2017-{13720,13722}
2017-10-14 11:53:23 +02:00
Vladimír Čunát
994036d857
Merge branch 'master' into staging
Hydra: ?compare=1400181
2017-10-09 11:24:35 +02:00
Vladimír Čunát
58efdfd50c
xorg.xkeyboard-config: 2.21 -> 2.22 2017-10-08 18:24:11 +02:00
Vladimír Čunát
07efaaa722
xorg-server: security 1.19.3 -> 1.19.4
CVE-2017-{13721,13723}
https://lists.x.org/archives/xorg-announce/2017-October/002808.html
2017-10-08 17:32:13 +02:00
Vladimír Čunát
5dc3b2fdc6
xf86-video-amdgpu: 1.3.0 -> 1.4.0 2017-10-07 21:31:40 +02:00
John Ericson
f8a18cd4cf misc pkgs: Manual fixup pkgconfig nativeBuildInputs after sed
Importantly, this included regenerating pkgs/servers/x11/xorg, to
clobber the old sed.
2017-09-21 15:49:54 -04:00
John Ericson
531e4b80c9 misc pkgs: Basic sed to get fix pkgconfig and autoreconfHook buildInputs
Only acts on one-line dependency lists.
2017-09-21 15:49:53 -04:00
John Ericson
fd9c7eb2e8 misc pkgs: Make solitary pkgconfig buildInputs nativeBuildInputs 2017-09-21 15:49:53 -04:00
Carter Charbonneau
14bd516fa6 xf86-video-intel: build intel-virtual-output 2017-08-04 03:32:29 +02:00
Vladimír Čunát
403b3c2ddd
xkeyboard-config: 2.20 -> 2.21 2017-06-11 09:46:12 +02:00
Vladimír Čunát
51e0f8f759
Merge branch 'master' into staging
Some more larger rebuilds from master.
2017-05-12 12:03:37 +02:00
Jörg Thalheim
9394314d79
xf86-video-intel: 2017-02-05 -> 2017-04-18 2017-05-11 05:55:32 +01:00
Vladimír Čunát
7830ce47cb
xf86-video-nouveau: maintenance 1.0.14 -> 1.0.15 2017-05-06 12:48:15 +02:00
Vladimír Čunát
1823113f87
xorg: misc updates 2017-05-06 11:51:24 +02:00
Vladimír Čunát
7286dfebbb
xorg xf86-input-libinput: 0.23.0 -> 0.25.0 2017-04-02 18:50:42 +02:00
Vladimír Čunát
9ceea2ff45 xorg xf86-video-amdgpu: 1.2.0 -> 1.3.0 (#24561) 2017-04-02 18:49:16 +02:00
Vladimír Čunát
6bce07f876
xorg xf86-video-openchrome: 0.3.3 -> 0.6.0
Now it builds (again), but I haven't tested it in any other way.
2017-04-02 15:26:46 +02:00
Vladimír Čunát
8eec2948ba
xorg-server: maintenance 1.19.2 -> 1.19.3 2017-04-02 15:21:04 +02:00
Vladimír Čunát
3932d080be
xorg xf86-video-nouveau: 1.0.13 -> 1.0.14 2017-04-02 15:20:23 +02:00
Vladimír Čunát
b5121db20d
xorg xf86-video-ati: 7.8.0 -> 7.9.0 2017-04-02 15:19:44 +02:00
Vladimír Čunát
da3c0ac19c
xorg.xorgserver: security 1.19.1 -> 1.19.2
Various bugfixes including CVE-2017-2624.
It seems to run without any problems for me.
2017-03-04 09:05:22 +01:00
Vladimír Čunát
59d1ce1c7a
xorg.libX11: 1.6.4 -> 1.6.5
It seems like a maintenance release.
2017-02-27 20:33:53 +01:00
Vladimír Čunát
2dba30af72
Merge recent staging
It's almost finished by Hydra now.
2017-02-12 19:51:01 +01:00
Vladimír Čunát
3348905cde
xorg-server: major bump 1.18.4 -> 1.19.1
I encountered no problems with it.  Nvidia binary drivers are tested,
and AMD ones now both set `abiCompat` to use older server versions.
2017-02-12 13:24:44 +01:00
Vladimír Čunát
c5c0f63320
xorg xf86-video-qxl: 0.1.3 -> 0.1.5 2017-02-12 13:10:51 +01:00
Vladimír Čunát
d4b8737e00
xorg: add xf86-video-{sisusb,sunleo}
They might be useless, but they build :-)
2017-02-12 13:07:55 +01:00
Vladimír Čunát
53600eae3d
xorg xf86-input-libinput: 0.19.1 -> 0.23.0 2017-02-12 13:01:24 +01:00
Vladimír Čunát
e970b8e8df
xorg xf86-input-evdev: 2.10.3 -> 2.10.5 2017-02-12 13:00:37 +01:00
Vladimír Čunát
ffefd83897
xorg xf86-video-*: bump drivers that seem unused
I verified they build, at least with xorg-server-1.19.1.
2017-02-12 12:57:42 +01:00
Vladimír Čunát
a750890b0e
xorg xkeyboard-config: 2.19 -> 2.20 2017-02-11 10:36:48 +01:00
Vladimír Čunát
473f95d809
xorg.xauth: 1.0.9 -> 1.0.10 2017-02-11 10:36:47 +01:00
Vladimír Čunát
78a115dd47
xorg util-macros: 1.19.0 -> 1.19.1 2017-02-11 10:36:46 +01:00
Vladimír Čunát
201f0cec12
xorg.presentproto: 1.0 -> 1.1 2017-02-11 10:36:45 +01:00
Vladimír Čunát
6cf8875abd
xorg.{libXi,libXpm}: minor update 2017-02-11 10:36:41 +01:00
Shea Levy
0cd174899c xf86-video-intel: 15c5ff1245 -> e4fe79cf0d.
Fixes a GPU hang bug, see https://bugs.freedesktop.org/show_bug.cgi?id=99696
2017-02-06 21:27:44 -05:00
Pascal Wittmann
08e99191f6
remove xorg.intelgputools in favor of intel-gpu-tools
There is no reason in having both and the latter is a
separate derivation and thus easier to maintain.

Closes #21976
2017-01-18 21:47:22 +01:00
Vladimír Čunát
ad0d7f6a05
Merge branch 'staging' 2016-12-04 19:22:36 +01:00
Vladimír Čunát
8d86d16db3
xf86-video-vmware: 13.1.0 -> 13.2.1
I only tested building.
2016-12-04 13:36:21 +01:00
Vladimír Čunát
16a0657c9b
xf86-video-amdgpu: 1.1.2 -> 1.2.0
I only tested building, as I've got no compatible GPU.
2016-12-04 13:34:16 +01:00
Vladimír Čunát
cb2c5f4a43
xf86-video-ati: 7.7.1 -> 7.8.0
I runs fine for me.
2016-12-04 11:31:38 +01:00
Vladimír Čunát
1b158bd1c8
xf86-input-*: update drivers not in common use 2016-12-04 10:57:26 +01:00
Vladimír Čunát
3b3daf4104
xf86-input-synaptics: 1.8.3 -> 1.9.0
I'm getting new error in X.0.log:
"Synaptics driver unable to detect protocol"
but the touchpad still works fine.  It seems the driver is trying to
additionally apply to my regular (wireless) mouse which fails.
I hope this is just harmless.
2016-12-04 10:52:53 +01:00
Vladimír Čunát
bf220b1b4a
Revert "xf86-input-synaptics: 1.8.3 -> 1.9.0"
This reverts commit d34ccd1db4.
By a mistake, it included much more than intended at this point.
2016-12-04 10:50:30 +01:00
Vladimír Čunát
d34ccd1db4
xf86-input-synaptics: 1.8.3 -> 1.9.0
I'm getting new error in X.0.log:
"Synaptics driver unable to detect protocol"
but the touchpad still works fine.  It seems the driver is trying to
additionally apply to my regular (wireless) mouse which fails.
I hope this is just harmless.
2016-12-04 10:40:35 +01:00
Vladimír Čunát
b9f511d279
xorg.xproto: 7.0.29 -> 7.0.31 2016-12-03 13:55:23 +01:00
Vladimír Čunát
7581600808
xkeyboard_config: 2.18 -> 2.19 2016-12-03 13:54:31 +01:00
Vladimír Čunát
c9668e40fe
xorg.libXfont: 1.5.1 -> 1.5.2 2016-12-03 13:52:36 +01:00
Vladimír Čunát
96798a2702
xorg.libXi: 1.7.7 -> 1.7.8
The announcement claims it resolves some crashes.
2016-11-15 00:19:39 +01:00
Vladimír Čunát
0240306d01
xorg-server: maintenance 1.18.3 -> 1.18.4 2016-10-18 22:11:51 +02:00
Vladimír Čunát
47df822937 xf86-video-nouveau: 1.0.12 -> 1.0.13 2016-10-18 22:11:32 +02:00
Vladimír Čunát
f755299443 xorg: security fixes #19234
https://lists.x.org/archives/xorg-announce/2016-October/002720.html
2016-10-11 20:38:33 +02:00
Vladimír Čunát
73f59a794d Merge #18717: xf86-video-intel: update and use DRI3
... by default
2016-09-18 22:19:47 +02:00
Benjamin Saunders
c640fbfdc3 xf86-video-intel: 2016-05-22 -> 2016-09-08
Enable DRI3 by default while we're at it.
2016-09-17 20:07:07 -07:00
Vladimír Čunát
772d14d8c2 xorg: expression cleanup
The generating script needed to be updated not to overwrite the
hardening changes back.
2016-09-16 22:41:20 +02:00
Vladimír Čunát
16ed17d6c8 xf86-input-evdev: bugfix 2.10.2 -> 2.10.3 2016-09-16 22:41:19 +02:00
Vladimír Čunát
8aad4e8602 xf86-video-{ati,amdgpu}: maintenance updates 2016-09-16 22:41:19 +02:00
Vladimír Čunát
f12378e5b7 xorg xkeyboard-config: 2.17 -> 2.18 2016-09-16 22:41:18 +02:00
Vladimír Čunát
3efebb1680 xorg.xf86-input-libinput: 0.19.0 -> 0.19.1
It fixes a typo in API (!).
https://lists.x.org/archives/xorg-announce/2016-September/002705.html
2016-09-14 00:05:12 +02:00
obadz
24a9183f90 Merge branch 'hardened-stdenv' into staging
Closes #12895

Amazing work by @globin & @fpletz getting hardened compiler flags by
enabled default on the whole package set
2016-08-22 01:19:35 +01:00
Vladimír Čunát
ab95a3ff7f xorg xf86-video-amdgpu: init at 1.1.0
Fixes #17682, closes #17857.
The resulting binary is the same as in the PR,
but this uses auto-generated expression with override.
2016-08-21 11:32:26 +02:00
Robin Gloster
27b9f5d65e xorg.*: disable relro/bindnow hardening
Breaks the module system at runtime otherwise.
2016-08-14 09:01:55 +00:00
Gabriel Ebner
5c9309c231 xorg.xorgserver: enable glamor support 2016-07-30 13:37:51 +02:00
Lluís Batlle i Rossell
13fc6e56fe Adding intel-gpu-tools to xorg. 2016-07-20 12:33:24 +02:00
Vladimír Čunát
a03ff26080 Merge #15639: xorg-server 1.17.4 -> 1.18.3
... and fglrxCompat to maintain compatibility.
2016-06-05 00:52:06 +02:00
Vladimír Čunát
5908d31cf4 xorg-server: major update 1.17.4 -> 1.18.3 2016-05-23 10:13:47 +02:00
Vladimír Čunát
0b192a0976 Merge branch 'master' into staging
That's to get mesa rebuild from master, as it's nontrivial.
2016-05-23 09:02:10 +02:00
Eelco Dolstra
a0f89ee509 xf86-video-intel: 2015-11-14 -> 2016-05-22
This fixes compositing in KDE on a Intel HD Graphics 530 for me.
2016-05-22 23:05:47 +02:00
Eelco Dolstra
600cd79f1e xkeyboard-config: 2.16 -> 2.17 2016-05-22 23:05:42 +02:00
Eelco Dolstra
c7d92f9485 xf86-video-modesetting: Remove
This driver is part of xorg-server now, so we were using an outdated
version.
2016-05-22 23:05:30 +02:00
Vladimír Čunát
69ed132f82 xorg: various updates
It would cost quite some work to split this into more commits sensibly,
and there would probably be little gain.
2016-05-22 12:10:39 +02:00
Alexey Lebedeff
02ce05d1cc appres: init at 1.0.4 2016-05-10 18:31:27 +03:00
Vladimír Čunát
d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
Vladimír Čunát
d6a30fccbf xorg xf86-input-evdev: bugfix update 2.10.0 -> 2.10.1 2016-02-02 07:29:43 +01:00
Vladimír Čunát
716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Vladimír Čunát
556a28908e Merge: xorg and gtk-related updates 2016-01-05 09:53:01 +01:00
Vladimír Čunát
62bb0329ae xorg.xf86*{libinput,nouveau}: minor driver updates 2016-01-04 12:00:28 +01:00
Vladimír Čunát
cba685ba45 xorg.xorgcffiles: update 1.0.5 -> 1.0.6 (probably unused) 2016-01-04 11:58:30 +01:00
Vladimír Čunát
9714056914 xorg: small but mass-rebuild updates 2016-01-04 11:57:11 +01:00
Vladimír Čunát
a6812c1ca5 xorg.xf86videorendition: init at 4.2.6 2016-01-04 11:54:10 +01:00
Vladimír Čunát
88dff78662 xorg.libXfont2: init at 2.0.1 2016-01-04 11:52:51 +01:00
Bjørn Forsman
a5b68eb4f6 xorg: add meta.platforms
Add it to the generator script (generate-expr-from-tarballs.pl) and then
add the updated generated file (pkgs/servers/x11/xorg/default.nix) after
performing the steps outlined in the generator script.

NOTE: People seem to have updated .../default.nix manually (even though
it has a "THIS IS A GENERATED FILE.  DO NOT EDIT!" header), so I had to
skip some changes to not downgrade several packages.
2015-12-30 12:50:54 +01:00
Luca Bruno
5b0352a6a4 Merge branch 'master' into closure-size 2015-12-11 18:31:00 +01:00
Luca Bruno
a412927924 Merge remote-tracking branch 'origin/master' into closure-size 2015-11-25 21:37:30 +01:00
Vladimír Čunát
333d69a5f0 Merge staging into closure-size
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
William A. Kennington III
baf30718ca Merge branch 'master.upstream' into staging.upstream 2015-11-18 02:36:33 -08:00
William A. Kennington III
f9f3b47c72 xkbcomp: 1.3.0 -> 1.3.1 2015-11-18 02:36:18 -08:00
William A. Kennington III
4da7935a8e xinput: 1.6.1 -> 1.6.2 2015-11-18 02:36:18 -08:00
William A. Kennington III
b52f2f6401 xorg-server: 1.18.0 -> 1.17.4
There were lots of issues with the proprietary nvidia driver on 352.63
and we don't yet have a proprietary AMD driver.
2015-11-18 02:34:26 -08:00
William A. Kennington III
ee153a619a xorg: Fix hashes 2015-11-17 21:25:15 -08:00
William A. Kennington III
2e595e32f6 xf86-video-ati: 7.5.0 -> 7.6.1 2015-11-17 21:15:30 -08:00
William A. Kennington III
2792b9228c xf86-input-synaptics: 1.8.2 -> 1.8.3 2015-11-17 21:15:04 -08:00
William A. Kennington III
7a2283b08e xf86-input-libinput: 0.14.0 -> 0.15.0 2015-11-17 21:14:46 -08:00
William A. Kennington III
5b3bbd1ac1 xf86-input-evdev: 2.9.2 -> 2.10.0 2015-11-17 21:14:18 -08:00
William A. Kennington III
020f6cfadc xorg-server: 1.17.2 -> 1.18.0 2015-11-17 21:11:53 -08:00
aszlig
d81fc427da
xf86-video-intel: 2015-11-13 -> 2015-11-14
Fixes quite an annoying and reproducable memory leak when I was using
multiple heads. This is the fix in question:

http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/commit/?id=2d26643cab33a32847afaf13b50d326d09d58bf7

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-11-17 14:46:52 +01:00
William A. Kennington III
64f31fbc35 xf86-video-intel: 2015-11-10 -> 2015-11-13 2015-11-13 10:37:27 -08:00
William A. Kennington III
bf985091d5 xf86-video-intel: 2015-07-22 -> 2015-11-10 2015-11-10 18:27:46 -08:00
Vladimír Čunát
b6059b2c6a xorg: add three missing video drivers - chips, s3virge, xgi
Only building was tested.
2015-10-19 10:06:48 +02:00
Vladimír Čunát
ff94673659 xorg.xf86-video-sis: minor update 0.10.7 -> 0.10.8 2015-10-19 09:39:32 +02:00
Vladimír Čunát
801a843bdb xorg.xorg-server: use the generated expression
... to avoid future surprises. Also add libunwind to deps.
I don't know why libxshmfence is no longer detected.
2015-10-19 09:35:07 +02:00
Vladimír Čunát
15f27723b3 xorg.xf86-input-libinput: update 0.12.0 -> 0.14.0 2015-10-19 09:20:13 +02:00
Robert Irelan
678c81b74d xorg.xf86-video-ast: 0.98.0 -> 1.1.5 (close #10451)
Fix failure of 0.98.0 to compile with NixOS 15.09 (due to referencing a
symbol `IOADDRESS` that has been removed from X.org drivers).
2015-10-19 09:06:33 +02:00
Vladimír Čunát
5227fb1dd5 Merge commit staging+systemd into closure-size
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
William A. Kennington III
773b4deb7c Merge commit 'a6f6c0e' into master.upstream
This is a partial merge of staging where we have up to date binaries for
all packages.
2015-09-15 12:16:49 -07:00
Mathnerd314
eb7404d97a all-packages: Use callPackage where possible 2015-09-14 22:27:19 -06:00
Vladimír Čunát
8ab4c20998 xorg.{libXi,libxcb}: maintenance update 2015-09-13 10:51:21 +02:00
Vladimír Čunát
2600e00ca9 xorg.xproto: maintenance update 2015-07-28 19:13:50 +02:00
Vladimír Čunát
a2f16fdcff Merge branch 'staging' 2015-07-24 15:12:28 +02:00
William A. Kennington III
d8991a7b3b xf86-video-intel: 2.99.917 -> 2015-07-22 2015-07-22 13:14:27 -07:00
Vladimír Čunát
1be2acd131 xkeyboard-config: updates
Also drop Esperanto patch for now, as it doesn't apply anymore
and there are some Esperanto variants inside. Discussed:
https://github.com/NixOS/nixpkgs/commit/fa5a583098
2015-07-19 13:33:04 +02:00
Vladimír Čunát
00dfcfb76a xorg: driver updates
Also fixup tarball list after e4316b8c17,
and drop a patch integrated in the update.
2015-07-19 13:33:03 +02:00
William A. Kennington III
e4316b8c17 xorg-server: 1.16.4 -> 1.17.2 2015-06-16 23:36:11 -07:00
Vladimír Čunát
edeab75913 xcompmgr: generate along with xorg stuff
Also a minor update.
/cc maintainer @astsmtl.
2015-05-26 20:06:53 +02:00
Vladimír Čunát
0e270def52 xorg.x11perf: larger update
Seems to run fine.
2015-05-26 20:06:52 +02:00
Vladimír Čunát
471a2a7ee7 xorg {xorg-docs,kbproto}: minor updates 2015-05-26 20:06:52 +02:00
Vladimír Čunát
e5fa9ab0fd xlsfonts: generate along with xorg stuff
Also a minor update.
/cc maintainer @viric.
2015-05-26 20:06:51 +02:00
Vladimír Čunát
688b4ca5db xorg: add xmag and xgc apps
Tested very briefly.
2015-05-26 20:06:51 +02:00
Vladimír Čunát
1a13909173 xorg: minor updates of apps 2015-05-26 20:06:50 +02:00
Vladimír Čunát
6bddcbda8a xorg: maintenance updates of libs 2015-05-26 20:06:50 +02:00
Vladimír Čunát
3287103b00 xorg: add libXpresent and xcb-util-errors 2015-05-26 20:06:48 +02:00
Vladimír Čunát
34c9d898da xorg: update randr 2015-05-24 23:28:41 +02:00
Vladimír Čunát
3c5b83262b xorg: update cirrus and libinput drivers 2015-05-24 23:26:07 +02:00
Vladimír Čunát
3115d18c53 xorg: update drivers that seem useless 2015-05-24 23:10:52 +02:00
Vladimír Čunát
bf414c9d4f Merge 'staging' into closure-size
- there were many easy merge conflicts
- cc-wrapper needed nontrivial changes

Many other problems might've been created by interaction of the branches,
but stdenv and a few other packages build fine now.
2015-04-18 11:22:20 +02:00
Vladimír Čunát
3dba642c33 xorg: add xf86-input-libinput and xf86-video-i740 2015-04-18 07:11:55 +02:00
Vladimír Čunát
4b6b03e2ce xcb-util-cursor: autogenerate as other xorg pkgs
HEAD version still needed on darwin, reportedly:
https://github.com/vcunat/nixpkgs/commit/0c915b8812#commitcomment-10615086
2015-04-18 07:08:45 +02:00
Vladimír Čunát
4f0dae99f9 xorg misc maintenance updates 2015-04-18 07:08:16 +02:00
Vladimír Čunát
e7aec13bda xorg libs: maintenance updates 2015-04-18 07:08:16 +02:00
Vladimír Čunát
6087b3d16c xorg drivers: minor updates 2015-04-18 07:08:15 +02:00
Vladimír Čunát
6a230188c6 xorg.libXfont: security update
Fixes CVE-2015-{1802,1803,1804}.
http://lists.x.org/archives/xorg-announce/2015-March/002550.html
Almost nothing needs rebuilding.
2015-03-17 18:36:52 +01:00
Vladimír Čunát
a3e0ee10e5 xf86-video-vmware: update 2015-03-09 15:55:23 +01:00
Vladimír Čunát
9c22c1b3d7 xorg: update various modules 2015-03-09 15:55:23 +01:00
Vladimír Čunát
cf1550cbbf xorg-server: security+bugfix, including CVE-2015-0255
Tested briefly against 14.12.
2015-02-12 20:15:16 +01:00
Vladimír Čunát
0bc5228fd2 xorg.xf86-video-intel: maintenance update 2014-12-25 10:06:49 +01:00
Sebastián Bernardo Galkin
06e6d7def2 xorg-server: enable DRI3 (close #5381)
TEST needed. I tested on my NixOS Thinkpad with Optimus nvidia and intel
cards.  Testing in other architectures is needed.

This patch also improves the regular expressions that scan the build
configuration files to enable the building of a binary utility in
xf86-video-intel: intel-virtual-output. This utility is useful for some
Optimus laptops

DRI3 was added to xorg-server propagatedBuildInputs so now it's inherited
by several projects that can use it.
2014-12-18 18:17:42 +01:00
Vladimír Čunát
84d6debf46 xorg-server: security update to RC1 of 1.16.3
Close #5292. There are almost no other changes since 1.16.2
than fixing that CVE-2014-8092. See also:
http://www.x.org/wiki/Development/Security/Advisory-2014-12-09/
2014-12-16 19:28:42 +01:00
Vladimír Čunát
ea557c8fd1 xorg xf86-input-evdev: update and add needed inputs 2014-12-03 13:26:32 +01:00
Vladimír Čunát
ea1dd9fd4a xorg: revert to older xf86-input-evdev for now
How could I forget to test to build it at least :-/
2014-11-28 22:04:39 +01:00
Vladimír Čunát
442cad9cbd xorg: update some modules 2014-11-28 20:42:07 +01:00
Vladimír Čunát
4a62542f55 xorg.xf86-video-intel: use the new versions
The old driver wasn't updated since August 2013, and e.g. won't compile
with glibc-2.20. Distros like Arch or Ubuntu are using newer one for a long time.

(cherry picked from commit 515dcb0f66)
 because the old driver won't compile with new X server.
2014-11-12 16:33:20 +01:00
Vladimír Čunát
dcd2590c98 xorg-server: major bump 1.14.* -> 1.16.1 (incl. deps) 2014-11-05 07:55:25 +01:00
Vladimír Čunát
9877fdb39d xorg: updates some modules; mostly minor changes 2014-10-19 20:10:19 +02:00
Vladimír Čunát
8da52a642a Merge branch 'staging' into v/modular
Conflicts (easy):
	pkgs/development/interpreters/perl/5.10/setup-hook.sh
	pkgs/development/interpreters/perl/5.8/setup-hook.sh
	pkgs/development/libraries/gtk+/2.x.nix
2014-08-31 12:23:18 +02:00
Vladimír Čunát
4c3e6a4675 xorg: go back to using the new nix syntax
This reverts commit 86a372683a.
The original revert was just temporary.

Conflicts (auto-solved):
	pkgs/servers/x11/xorg/default.nix
2014-08-31 12:20:34 +02:00
Vladimír Čunát
e51f73652d Merge recent master into staging
Hydra: ?compare=1149952

Conflicts:
	nixos/doc/manual/configuration.xml (changed split file)
	nixos/modules/config/users-groups.nix (choosing filterNull instead of inline definition)
	pkgs/development/libraries/readline/readline6.3.nix (auto-solved)
2014-08-30 10:04:02 +02:00
Vladimír Čunát
fb59f27a43 WIP: getting good 2014-08-27 01:14:09 +02:00
Vladimír Čunát
99e300c4f8 xorg: add xf86-video-qxl 2014-08-23 18:55:30 +02:00
Vladimír Čunát
8c8197dfb3 xorg: stop using the new nix syntax
Partial revert of 5ea8497933.
2014-08-23 16:15:28 +02:00
Vladimír Čunát
96cec2a7bd Merge 'staging' into multiple-outputs
Conflicts:
	pkgs/applications/audio/flac/default.nix
	pkgs/build-support/gcc-wrapper/builder.sh
	pkgs/development/libraries/apr-util/default.nix
	pkgs/development/libraries/apr/default.nix
	pkgs/development/libraries/atk/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/gdk-pixbuf/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/glibc/2.17/builder.sh
	pkgs/development/libraries/glibc/2.17/locales.nix
	pkgs/development/libraries/libjpeg/default.nix
	pkgs/development/libraries/libogg/default.nix
	pkgs/development/libraries/libsamplerate/default.nix
	pkgs/development/libraries/libtiff/default.nix
	pkgs/development/libraries/libvorbis/default.nix
	pkgs/development/libraries/mesa/default.nix
	pkgs/development/libraries/pango/default.nix
	pkgs/development/web/nodejs/default.nix
	pkgs/os-specific/linux/pam/default.nix
	pkgs/os-specific/linux/systemd/default.nix
	pkgs/stdenv/generic/setup.sh
	pkgs/stdenv/linux/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-small.nix
2014-08-23 16:04:53 +02:00
Vladimír Čunát
59e3e06076 xorg: update probably unused modules 2014-08-21 15:13:22 +02:00
Vladimír Čunát
acf8919844 xorg.xrandr: minor bugfix update 2014-08-21 15:13:21 +02:00
Vladimír Čunát
c31c79f0dd xorg.xcb (lib+proto): update (seems mainly bug fixes) 2014-08-21 15:13:21 +02:00
Charles Strahan
6f2bd70fd0 Remove old comment, and delete confusing LaunchDaemon 2014-08-18 11:36:34 -04:00
Charles Strahan
5ea8497933 get xorg/x11 working on Darwin 2014-08-12 20:40:57 -04:00
Vladimír Čunát
91b53aaebc xorg.libXext: minor update 2014-08-02 04:43:19 +02:00
Vladimír Čunát
f456abacb7 xorg.libXi: bugfix update 2014-07-20 08:38:06 +02:00
Vladimír Čunát
edec3719a6 xorg: update a few modules 2014-07-13 21:35:25 +02:00
Vladimír Čunát
dfd80a1b7e Merge recent master into x-updates
Hydra eval: 1131611
2014-06-26 22:05:15 +02:00
Vladimír Čunát
3f15312b44 xorg: add xkbprint
Suggested by @KoviRobi on ML.
2014-06-22 10:04:10 +02:00
Vladimír Čunát
ff327554e9 xorg: maintenance updates of several modules 2014-06-17 09:00:29 +02:00
Vladimír Čunát
bd96a4bb43 xorg: maintenance updates of a few modules 2014-05-26 22:45:50 +02:00
Vladimír Čunát
832c661822 xorg.libXfont: security update, CVE-2014-{0209,0210,0211}
For details see http://lists.x.org/archives/xorg-announce/2014-May/002431.html
2014-05-16 18:33:24 +02:00
Vladimír Čunát
6da5d7922d xorg: minor update of xf86-input-{evdev,synaptics} 2014-05-06 18:43:01 +02:00
Vladimír Čunát
9e9f282309 xorg-server: go back to 1.14.6 due to intel problems
Again, stable releases not compiling together :-/
2014-04-19 23:42:54 +02:00
Vladimír Čunát
5d850ba9d3 xorg: revert fontsproto update, as it breaks libXfont
This partially reverts commit 30ac332563.
https://groups.google.com/forum/#!msg/xorg-devel/SvgqiQnSN7c/f0wjRhauqvUJ

It's sad that the currently *released* versions don't even compile together,
and no dev reacts for four days so far...
2014-04-19 22:15:32 +02:00
Vladimír Čunát
f66e5664e0 xorg-server: major update 1.14.5 -> 1.15.1 2014-04-19 14:31:14 +02:00
Vladimír Čunát
30ac332563 xorg: minor updates of three packages 2014-04-19 14:30:48 +02:00
Vladimír Čunát
44f4862041 xorg.xtrans: maintenance update 2014-04-01 10:53:34 +02:00
Vladimír Čunát
bd1abb36dd xorg: minor updates of xrandr and util-macros 2014-03-29 16:15:13 +01:00
Vladimír Čunát
9ddc57cbea xorg.xf86-video-vmware: minor update
Patch no longer needed to build.
2014-03-27 22:14:51 +01:00
Vladimír Čunát
150102ce30 xorg.libFS: maintenance update 1.0.5 -> .6 2014-03-21 10:34:20 +01:00
Vladimír Čunát
23682d02d0 xorg: update, regenerate (new: glamor-egl)
Updates caught by nixpkgs monitor.
2014-03-21 10:34:19 +01:00
Vladimír Čunát
4f50a0917e xorg: add xf86-video-modesetting 2014-03-21 10:08:31 +01:00
Vladimír Čunát
88d490588d xorg: add some modules
I was testing whether 10.1 mesa might solve the LLVM RTTI problems,
and it seems mesa will need these (and the problems aren't solved).
2014-02-22 18:37:05 +01:00
Vladimír Čunát
5a8a3195a0 xorg.xcb-util-wm: minor update 0.4.0 -> .1 2014-02-22 17:40:01 +01:00
Vladimír Čunát
546bd7738d xorg xkeyboard-config: update, unify with the other expression 2014-01-30 13:46:02 +01:00
Vladimír Čunát
b27477054f xorg xcb-util-wm: minor update 2014-01-30 09:12:51 +01:00
Vladimír Čunát
edb1e2996f xorg.xtrans: update to 1.3.3
Another forgotten X lib; we had ~2 years without updating it.
2014-01-28 12:11:35 +01:00
Vladimír Čunát
5fb366d1e5 xorg: move nouveau driver here, some updates of modules
It seems that most of the modules is rarely used, but still.

Some of the updated modules don't build, just as they didn't before.
2014-01-26 09:03:01 +01:00
Vladimír Čunát
7e0b78f7b2 Merge master into x-updates
Conflicts (re-created on master, preserved):
	pkgs/development/compilers/llvm/3.3/more-memory-for-bugpoint.patch
2014-01-23 22:52:18 +01:00
Vladimír Čunát
fcb9e031f8 xorg.xf86-video-ati: update 7.2.0 -> 7.1.0
Proposed by @kosmikus.
2014-01-16 14:36:42 +01:00
Vladimír Čunát
91b7fa9169 Merge master into x-updates 2014-01-11 18:44:55 +01:00
Nixpkgs Monitor
e148a016f5 xlibs.xf86videointel: update from 2.21.9 to 2.21.15 2014-01-08 16:17:32 +01:00
Vladimír Čunát
e01af040ed xorg.libXfont: bugfix update, CVE-2013-6462
This lib is deprecated and almost unused, but still...
2014-01-07 17:51:22 +01:00
Vladimír Čunát
f0419a0bfc xorg: update a few sub-packages 2013-12-30 22:12:22 +01:00
Vladimír Čunát
4f8809a091 libXtst: forgotten security update 2013-12-23 18:24:24 +01:00
Vladimír Čunát
095949bdc8 xorg server: maintenance update 1.14.4 -> .5
Also drop dri-path patch which wasn't needed for several months,
and now it no longer applied. I tested that drivers are still found.
2013-12-14 23:17:15 +01:00
Vladimír Čunát
834af9c905 xorg-server: bugfix update 1.14.3 -> .4, including CVE
CVE-2013-4396, otherwise a few fixes, see
http://lists.x.org/archives/xorg-announce/2013-November/002352.html
2013-11-05 23:13:31 +01:00
Vladimír Čunát
5bcdc3efd2 xorg server: major update 1.13.4 -> 1.14.3
- The 1.13 branch gets no updates since April,
  so I thought it's a good time to switch.
- Some xorg modules needed to be updated to build,
  but some don't have the update (probably all very obscure).
- Maybe it would be good to update the intel driver (or some others),
  I don't know.
2013-10-05 22:17:01 +02:00
Mathijs Kwik
1a55c4b89f Merge remote-tracking branch 'official/master' into multiple-outputs
Conflicts:
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/libpng/default.nix
	pkgs/development/libraries/pango/default.nix
	pkgs/tools/typesetting/tex/texlive/default.nix
	pkgs/top-level/all-packages.nix
2013-09-11 10:53:31 +02:00
Eelco Dolstra
7c8518c194 Cleanup 2013-08-23 10:02:07 +02:00
Vladimír Čunát
daf9c75ef4 xorg: bugfix updates of some libs
Now using stable release of libXi, instead of the git version we had due
to security stuff.
2013-08-03 15:38:46 +02:00
Eelco Dolstra
cab211de88 xorg: Split some more packages 2013-06-26 14:27:12 +02:00
Eelco Dolstra
552fd3d599 Merge remote-tracking branch 'origin/master' into multiple-outputs
Conflicts:
	pkgs/development/libraries/atk/default.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/gmime/default.nix
	pkgs/development/libraries/pango/default.nix
	pkgs/servers/x11/xorg/default.nix
	pkgs/top-level/all-packages.nix
2013-06-25 18:42:56 +02:00
Eelco Dolstra
935a054de9 libXrender, libXvMC: Update 2013-06-14 14:53:36 +02:00
Eelco Dolstra
32d02132c2 libxcb: Put docs/manpages in separate outputs 2013-06-11 13:26:27 +02:00
Eelco Dolstra
99b88cfb53 Merge remote-tracking branch 'origin/master' into multiple-outputs
Conflicts:
	pkgs/development/libraries/acl/default.nix
	pkgs/development/libraries/atk/2.6.x.nix
	pkgs/development/libraries/attr/default.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/glib/2.34.x.nix
	pkgs/development/libraries/gtk+/2.24.x.nix
	pkgs/development/libraries/libtiff/default.nix
	pkgs/development/libraries/openssl/default.nix
	pkgs/development/libraries/pango/1.30.x.nix
	pkgs/misc/cups/default.nix
	pkgs/os-specific/linux/util-linux/default.nix
	pkgs/servers/x11/xorg/builder.sh
	pkgs/servers/x11/xorg/default.nix
	pkgs/top-level/all-packages.nix
2013-06-09 00:41:27 +02:00
Vladimír Čunát
ba6c764a51 xorg: intel driver bugfix update 2013-06-08 15:40:39 +00:00