Commit graph

1143 commits

Author SHA1 Message Date
Sergei Trofimovich
592d3c7b16
Merge pull request #208024 from trofi/xhost-update
xorg:xhost: 1.0.8 -> 1.0.9
2023-01-01 20:49:06 +00:00
Naïm Favier
4df10debe7
lib/customisation.overrideDerivation: propagate evaluation condition
The new derivation should evaluate only if the old derivation does.

Sadly this means that the old derivation cannot depend on the new one
any more, which was used by xorgserver on Darwin. But this is not a
problem as `overrideAttrs` can (and should) usually be used instead.

This change allowed catching an invalid `meta.platforms` in the linux_rpi
kernels, which use `overrideDerivation`.
2023-01-01 14:10:42 +01:00
Sergei Trofimovich
518bede442 xorg:xhost: 1.0.8 -> 1.0.9
Adds IPv6 support into command line.

Changes: https://www.spinics.net/lists/xorg/msg60787.html
2022-12-27 21:17:22 +00:00
Rouven Czerwinski
d2df783515 xwayland: 22.1.6 -> 22.1.7
Changelog: https://lists.x.org/archives/xorg-announce/2022-December/003309.html
2022-12-20 19:57:19 +01:00
Vladimír Čunát
39812f47c4
Merge #206420: xorg.xorgserver: apply CVE patches 2022-12-17 10:11:17 +01:00
Artturin
a6edc3de15 xorg.xorgserver: apply CVE patches
https://www.mail-archive.com/xorg-announce@lists.x.org/msg01511.html
2022-12-16 17:26:50 +02:00
Rouven Czerwinski
6a2f790f7a xwayland: 22.1.5 -> 22.1.6
Changelog: https://lists.x.org/archives/xorg-announce/2022-December/003304.html
2022-12-16 11:33:29 +01:00
github-actions[bot]
6aeef7531c
Merge staging-next into staging 2022-11-28 06:01:53 +00:00
Daniel Nagy
308abeb67b
xorg.xinit: also use systemwide xinitrc (#186997)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2022-11-28 01:06:57 +01:00
github-actions[bot]
f8c61f361e
Merge staging-next into staging 2022-11-25 12:02:07 +00:00
Rouven Czerwinski
152ed82e8f xwayland: 22.1.3 -> 22.1.5
Package bump:
- Grabs are now deactivated on Xwayland, leaving them to the compositor
- Memleak and length-check fixes for xkb
- Fix for kinetic scrolling
- Delayed wl_surface destruction to fix a race
2022-11-22 11:04:28 +01:00
Artturin
efb9b804a7 xorg.xdm: fix cross
```
xdm-aarch64-unknown-linux-gnu> checking for cpp... no
xdm-aarch64-unknown-linux-gnu> checking if aarch64-unknown-linux-gnu-gcc -E requires -undef... aarch64-unknown-linux-gnu-gcc: fatal error: noinput files
xdm-aarch64-unknown-linux-gnu> compilation terminated.
xdm-aarch64-unknown-linux-gnu> aarch64-unknown-linux-gnu-gcc: fatal error: no input files
xdm-aarch64-unknown-linux-gnu> compilation terminated.
xdm-aarch64-unknown-linux-gnu> aarch64-unknown-linux-gnu-gcc: fatal error: no input files
xdm-aarch64-unknown-linux-gnu> compilation terminated.
xdm-aarch64-unknown-linux-gnu> configure: error: aarch64-unknown-linux-gnu-gcc -E defines unix with or without -undef.  I don't know what to do.
```

it appears that the configure script isn't checking
`${ac_tool_prefix}cpp`

```
for ac_prog in cpp
do
  # Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_RAWCPP+:} false; then :
```
2022-11-11 16:57:35 +02:00
Artturin
ddb88250e4 xorg.imake: fix cross
```
imake-aarch64-unknown-linux-gnu> checking for cpp... no
imake-aarch64-unknown-linux-gnu> checking if aarch64-unknown-linux-gnu-gcc -E requires -undef... aarch64-unknown-linux-gnu-gcc: fatal error: noinput files
imake-aarch64-unknown-linux-gnu> compilation terminated.
imake-aarch64-unknown-linux-gnu> aarch64-unknown-linux-gnu-gcc: fatal error: no input files
imake-aarch64-unknown-linux-gnu> compilation terminated.
imake-aarch64-unknown-linux-gnu> aarch64-unknown-linux-gnu-gcc: fatal error: no input files
imake-aarch64-unknown-linux-gnu> compilation terminated.
imake-aarch64-unknown-linux-gnu> configure: error: aarch64-unknown-linux-gnu-gcc -E defines unix with or without -undef.  I don't know what to do.
```

it appears that the configure script isn't checking
`${ac_tool_prefix}cpp`

```
for ac_prog in cpp
do
  # Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_RAWCPP+:} false; then :
```
2022-11-11 16:57:35 +02:00
Artturin
7e00495eae xorg: use top-level xorg instead of self in overrides.nix
the packages will be spliced correctly
2022-11-11 04:45:27 +02:00
Artturin
d6a9e82668 xorg: detect if XORG_FONT_REQUIRED_PROG(MKFONTSCALE in generate-expr-from-tarballs 2022-11-11 04:43:46 +02:00
Artturin
4c65406f57 xorg: fix the cross-compilation of fonts 2022-11-11 04:43:46 +02:00
Artturin
6381e4475e xorg: improve splicing situtation 2022-11-11 04:43:46 +02:00
Artturin
1a77429299 xorg.xdm: add libxcrypt to buildInputs 2022-11-11 04:43:46 +02:00
sternenseemann
5924132e50 xorg.libXi: propagate libXext due to header dependencies
While looking into #197407, I noticed that <X11/extensions/XInput2.h>
depends on <X11/extensions/Xge.h> which is found in libXext and thus
needs to be propagated.
2022-11-04 00:18:56 +01:00
Weijia Wang
238fca0edb xorg.xorg-server: mark as broken on darwin 2022-10-24 21:27:55 +02:00
github-actions[bot]
aac580f88f
Merge master into staging-next 2022-10-20 00:05:13 +00:00
Vladimír Čunát
8d7a17eaf0
Merge #194802: libXft: 2.3.4 -> 2.3.6
...into staging
2022-10-13 19:15:07 +02:00
Sergei Trofimovich
d35d7ca6f9 xorg.libXaw3d: remove in favour of Xaw3d
Noticed this redundant attribute that no package uses. All packages
use `Xaw3d`. Let's use that instead.
2022-10-12 07:33:51 +01:00
Martin Weinelt
dbf9333f2c
xorg.xdm: fix build with libxcrypt 2022-10-09 18:10:35 +02:00
Christian Kögler
167fc5aa3e libXft: 2.3.4 -> 2.3.6 2022-10-06 22:14:45 +02:00
Artturin
0734f54ef2 treewide: move pkg-config, autoreconfHook, intltool to nativeBuildInputs
found with nixpkgs-lint
2022-09-26 17:53:26 +03:00
Jan Tojnar
1ab5ab5fca xorg.libX11: 1.7.2 → 1.8.1
https://gitlab.freedesktop.org/xorg/lib/libx11/-/compare/libX11-1.7.2...libX11-1.8.1
2022-08-30 17:43:36 +02:00
Vladimír Čunát
4ba8bc7d40
Merge branch 'master' into staging-next 2022-07-24 09:44:09 +02:00
Rouven Czerwinski
8ad9860b50
xwayland: 22.1.1 -> 22.1.3 (#174926)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2022-07-23 21:21:25 +02:00
Vladimír Čunát
2503667ddc
Merge #175058: xorg.xorgserver: fix cross-compilation
...into staging.  Well, fix it in future when we update it again.
2022-07-20 20:36:26 +02:00
Vladimír Čunát
f888751efd
Merge #181702: xorg.xorgserver: patch two CVEs
...into staging-next
2022-07-17 08:22:45 +02:00
Vladimír Čunát
98137b4db1
xorg.xorgserver: patch two CVEs
https://lists.x.org/archives/xorg/2022-July/061035.html
2022-07-16 11:06:53 +02:00
Artturi
4e6cb9efd9
Merge pull request #172064 from Artturin/xorgstrictautogen
xorg/generate-expr-from-tarballs.pl: enable strictDeps
2022-07-08 21:48:33 +03:00
Sergei Trofimovich
35f3cb8c6e xorg.xf86videoxgi: pull upstream fix for -fno-common toolchains
Without the change build fails on upstream gcc-10 as:

    ld: src/xgi_accel.h:125: multiple definition of `Alignment';
      src/xgi_accel.h:125: first defined here
2022-06-09 23:10:11 +01:00
Sergei Trofimovich
f6df882131
xorg.xf86videoopenchrome: pull upstream fix for -fno-common toolchain (#176074)
* xorg.xf86videoopenchrome: pull upstream fix for -fno-common toolchain

Without the chage build fails on upstream gcc-10 as:

    ld: .libs/via_xvmc.o:/build/xf86-video-openchrome-0.6.0/src/via_vt1632.h:47: multiple definition of
      `via_vt1632_funcs'; .libs/via_analog.o:/build/xf86-video-openchrome-0.6.0/src/via_vt1632.h:47: first defined here

* Update pkgs/servers/x11/xorg/overrides.nix

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2022-06-03 17:13:23 +02:00
Brian McKenna
b5e4221402 xserver: fix cross-compilation 2022-05-28 12:13:35 +10:00
Vladimír Čunát
1e65cb9c88
xorg.xorgserver: 1.20.13 -> 1.20.14
https://lists.x.org/archives/xorg-announce/2021-December/003124.html
2022-05-23 18:08:39 +02:00
Vladimír Čunát
43b7c9611c
Revert "xorg.xorgserver: 1.20.13 -> 21.1.3"
This reverts commit 3312352596.
Fixes #170856: issues of some users.
2022-05-23 17:54:40 +02:00
Artturin
25d02e65d0 generate-expr-from-tarballs.pl: enable strictDeps 2022-05-16 20:16:00 +03:00
Yuriy Taraday
7db78758fa xorg: Mark several drivers as broken on Darwin
Several drivers are built for Darwin on Hydra even though they never
worked and probably never will work there. Mark them as broken to avoid
wasted cycles.
2022-05-13 20:07:10 +03:00
Artturin
7ae04c1c4d xorg.xcbutilerrors: add dev output to not propagate a dev output 2022-05-08 23:12:20 +03:00
Thiago Kenji Okada
0cb205e355 xorg.xf86videointel: 2019-12-09 -> 2021-01-15
This is the exactly same version shipped on Arch Linux:
92eee4f353/trunk/PKGBUILD (L7)

Also Debian:
https://packages.debian.org/sid/xserver-xorg-video-intel

Probably some other distros too.
2022-04-19 11:53:25 +01:00
github-actions[bot]
e15ff925b0
Merge staging-next into staging 2022-04-09 00:02:40 +00:00
github-actions[bot]
9aa014c46a
Merge staging-next into staging 2022-03-31 12:02:10 +00:00
Rouven Czerwinski
850992fc1f xwayland: 22.1.0 -> 22.1.1
Minor release bump with various use-after-free fixes and a fix for
windowed vulkan windows rendering at 58FPS instead of the expected
60FPS.

Signed-off-by: Rouven Czerwinski <rouven@czerwinskis.de>
2022-03-31 10:22:39 +02:00
Martin Weinelt
4c9568e20e
Merge pull request #153994 from TredwellGit/xorg.xorgserver 2022-03-29 22:21:46 +02:00
Rouven Czerwinski
a83b0c7150 xwayland: 21.4.0 -> 22.1.0 2022-02-21 10:48:56 +01:00
Uri Baghin
ceeddeb81e xorg.xorgserver: remove abi 1.17 2022-02-02 10:54:12 +11:00
Vladimír Čunát
5bca7618c5
Merge #151862: xorg.libxcvt: init at 0.1.1 2022-01-16 09:20:52 +01:00
TredwellGit
3312352596 xorg.xorgserver: 1.20.13 -> 21.1.3
https://lists.x.org/archives/xorg-announce/2021-October/003115.html
https://lists.x.org/archives/xorg-announce/2021-November/003116.html
https://lists.x.org/archives/xorg-announce/2021-December/003125.html
https://lists.x.org/archives/xorg-announce/2022-January/003127.html
2022-01-09 01:52:23 +00:00