Commit Graph

1247 Commits

Author SHA1 Message Date
github-actions[bot]
7f0b38bc9a
Merge master into staging-next 2023-03-18 14:00:45 +00:00
Sergei Trofimovich
f749c3ec34 xorg.fontalias: 1.0.4 -> 1.0.5
Changes: https://www.spinics.net/lists/xorg/msg60833.html
2023-03-17 07:53:47 +00:00
Sergei Trofimovich
d2b2876373 xorg.libXvMC: 1.0.12 -> 1.0.13 2023-03-17 07:34:59 +00:00
Martin Weinelt
19680e9902
Merge pull request #217568 from trofi/stdenv-parallel-install
stdenv/generic/setup.sh: enable parallel installs for parallel builds
2023-03-15 17:10:19 +00:00
Vladimír Čunát
2d51a0e8ad
Merge branch 'master' into staging-next 2023-03-13 08:25:10 +01:00
Sergei Trofimovich
0f0473bd41 xorg: regenerate headers with ./generate-expr-from-tarballs.pl
Otherwise unrelated bumps produce the diffs.
2023-03-12 21:36:47 +00:00
Weijia Wang
a99778adf6 xorg.xorgserver: fix build on darwin 2023-03-08 12:19:58 +02:00
github-actions[bot]
fa94414f70
Merge master into staging-next 2023-03-07 00:02:41 +00:00
superherointj
0268565fcc
Merge pull request #219864 from thiagokokada/xorg-pkgs-bump
xorg.xf86video{suncg6,sunffb,sunleo,trident,qxl}: bumps
2023-03-06 18:41:30 -03:00
Martin Weinelt
8127b7ce48
Merge pull request #219852 from vcunat/p/xorgserver-darwin
xorg.xorgserver: fixup build on *-darwin
2023-03-06 19:51:09 +00:00
Martin Weinelt
d9b015c494 Merge remote-tracking branch 'origin/master' into staging-next 2023-03-06 19:33:49 +00:00
Thiago Kenji Okada
194e9a120a
Merge pull request #180523 from talyz/intel-mesa-22
xf86videointel: Use the `crocus` and `iris` DRI drivers
2023-03-06 19:26:48 +00:00
Thiago Kenji Okada
cfc997d86d xorg.xf86videoqxl: 0.1.5 -> 0.1.6 2023-03-06 18:31:25 +00:00
Thiago Kenji Okada
7a550f8b8d xorg.xf86videotrident: 1.3.8 -> 1.4.0
Release notes:
https://gitlab.freedesktop.org/xorg/driver/xf86-video-trident/-/merge_requests/4
2023-03-06 18:26:18 +00:00
Thiago Kenji Okada
be4adf5668 xorg.xf86videosunleo: 1.2.2 -> 1.2.3
Release notes:
https://gitlab.freedesktop.org/xorg/driver/xf86-video-sunleo/-/merge_requests/2
2023-03-06 18:23:38 +00:00
Thiago Kenji Okada
46f6c447aa xorg.xf86videosunffb: 1.2.2 -> 1.2.3
Release notes:
https://gitlab.freedesktop.org/xorg/driver/xf86-video-sunffb/-/merge_requests/2
2023-03-06 18:23:32 +00:00
Thiago Kenji Okada
9e88cf2c9e xorg.xf86videosuncg6: 1.1.2 -> 1.1.3
Release notes:
https://gitlab.freedesktop.org/xorg/driver/xf86-video-suncg6/-/merge_requests/2
2023-03-06 18:23:26 +00:00
Vladimír Čunát
fcc9c904ca
xorg.xorgserver: fixup build on *-darwin
Broken by the update in be54beb.
2023-03-06 17:51:34 +01:00
Martin Weinelt
8a085cd8e3 Merge remote-tracking branch 'origin/master' into staging-next 2023-03-05 15:36:16 +01:00
Vladimír Čunát
255bdfc8d2
Merge #218433: xorg.xf86videoamdgpu: 21.0.0 -> 23.0.0 2023-03-05 09:30:12 +01:00
github-actions[bot]
736c488efe
Merge staging-next into staging 2023-03-01 18:01:48 +00:00
Fabián Heredia Montiel
0c6d8cb679 xorg.xorgserver: 1.20.14 → 21.1.7
Diff:
https://github.com/freedesktop/xorg-xserver/compare/xorg-server-1.20.14...xorg-server-21.1.7

This reverts the revert on https://github.com/NixOS/nixpkgs/pull/174140
2023-03-01 08:47:09 -06:00
Sergei Trofimovich
69cf5181c3 stdenv/generic/setup.sh: enable parallel installs by default
The primary motivating example is openssl:

Before the change full package build took 1m54s minutes.
After the change full package build takes 59s.

About a 2x speedup.

The difference is visible because openssl builds hundreds of manpages
spawning a perl process per manual in `install` phase. Such a workload
is very easy to parallelize.

Another example would be `autotools`+`libtool` based build system where
install step requires relinking. The more binaries there are to relink
the more gain it will be to do it in parallel.

The change enables parallel installs by default only for buiilds that
already have parallel builds enabled. There is a high chance those build
systems already handle parallelism well but some packages will fail.

Consistently propagated the enableParallelBuilding to:
- cmake (enabled by default, similar to builds)
- ninja (set parallelism explicitly, don't rely on default)
- bmake (enable when requested)
- scons (enable when requested)
- meson (set parallelism explicitly, don't rely on default)
- waf (set parallelism explicitly, don't rely on default)
- qmake-4/5/6 (enable by default, similar to builds)
- xorg (always enable, similar to builds)
2023-02-26 22:02:09 +00:00
Vladimír Čunát
2faf6b3aa7
xorg.xf86videoamdgpu: 21.0.0 -> 23.0.0 2023-02-26 14:01:14 +01:00
github-actions[bot]
3cdd771820
Merge staging-next into staging 2023-02-23 18:01:49 +00:00
Alyssa Ross
52c286ee5b
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/development/libraries/pmdk/default.nix
2023-02-23 13:51:34 +00:00
Artturin
f9fdf2d402 treewide: move NIX_CFLAGS_COMPILE to the env attrset
with structuredAttrs lists will be bash arrays which cannot be exported
which will be a issue with some patches and some wrappers like cc-wrapper

this makes it clearer that NIX_CFLAGS_COMPILE must be a string as lists
in env cause a eval failure
2023-02-22 21:23:04 +02:00
Artturin
6f6cc4a22d treewide: use toString on list NIX_CFLAGS_COMPILE
with structuredAttrs lists will be bash arrays which cannot be exported
which will be a issue with some patches and some wrappers like cc-wrapper
2023-02-22 21:23:04 +02:00
github-actions[bot]
aaa6cd4e04
Merge staging-next into staging 2023-02-18 14:13:15 +00:00
Alyssa Ross
38f0121cce
Merge master (+ 11b095e revert) into staging-next
Conflicts:
	pkgs/development/libraries/libvisual/default.nix
2023-02-18 14:04:32 +00:00
Sergei Trofimovich
9b0c789970
Merge pull request #215938 from trofi/xorg.xkbcomp-update
xorg.xkbcomp: 1.4.5 -> 1.4.6
2023-02-18 09:49:18 +00:00
Sergei Trofimovich
e2dcad25f2
Merge pull request #215838 from trofi/xorg.libXxf86vm-update
xorg.libXxf86vm: 1.1.4 -> 1.1.5
2023-02-18 09:48:58 +00:00
K900
a57fd65b7b libX11: 1.8.3 -> 1.8.4 2023-02-15 01:54:08 +03:00
Kiskae
c73f3cf927
xwayland: enable libunwind 2023-02-13 18:27:53 +01:00
Sergei Trofimovich
06184acf6c xorg.xkbcomp: 1.4.5 -> 1.4.6
Changes: https://www.mail-archive.com/xorg-announce@lists.x.org/msg01492.html
2023-02-12 08:15:12 +00:00
Sergei Trofimovich
08e194a913 xorg.libXxf86vm: 1.1.4 -> 1.1.5
Changes: https://www.mail-archive.com/xorg-announce@lists.x.org/msg01422.html
2023-02-11 14:43:56 +00:00
Artturi
aaa9ea8ec6
Merge pull request #208537 from Artturin/makesetuphooksupportstrictdeps 2023-02-10 20:08:32 +02:00
github-actions[bot]
bece38afcc
Merge staging-next into staging 2023-02-09 00:02:56 +00:00
Vladimír Čunát
1e42908aa7
Merge branch 'master' into staging-next 2023-02-08 21:50:23 +01:00
Rouven Czerwinski
900cf6ed74 xwayland: 22.1.7 -> 22.1.8
Changelog: https://lists.x.org/archives/xorg-announce/2023-February/003322.html
2023-02-08 08:00:58 +01:00
Artturin
4e3dcf364e treewide: makeSetupHook deps -> propagatedBuildInputs 2023-02-07 21:02:00 +02:00
github-actions[bot]
371c2a6303
Merge staging-next into staging 2023-02-07 18:02:15 +00:00
Vladimír Čunát
48043f3f7d
Merge #215113: xorg.xorgserver: patch CVE-2023-0494
...into staging-next
2023-02-07 16:56:59 +01:00
Vladimír Čunát
7f41ad6c6c
xorg.xorgserver: patch CVE-2023-0494
https://lists.x.org/archives/xorg/2023-February/061255.html
2023-02-07 13:10:57 +01:00
github-actions[bot]
dae72e8486
Merge staging-next into staging 2023-02-05 12:02:01 +00:00
Vladimír Čunát
44cb005294
furnace, boringssl, gloox, xorg.xf86videovmware: gcc12 fixups 2023-02-05 11:57:01 +01:00
Sergei Trofimovich
22080492aa
Merge pull request #214421 from trofi/xorg.fontutil-update
xorg.fontutil: 1.3.1 -> 1.3.3
2023-02-04 22:12:24 +00:00
Sergei Trofimovich
8c24528b11 xorg.fontutil: 1.3.1 -> 1.3.3
Changes:
- 1.3.3: https://lists.x.org/archives/xorg-announce/2022-July/003190.html
- 1.3.2: https://lists.x.org/archives/xorg-announce/2019-August/003019.html
2023-02-03 21:23:31 +00:00
Weijia Wang
e9202e95e6
Merge pull request #207167 from alyssais/xorg-darwin
xorg.xorgserver: 1.18.4 -> 1.20.14 on Darwin (still broken)
2023-02-02 06:23:57 +01:00
Weijia Wang
327876fb7a xorg.xorgserver: remove 1.18 compat 2023-02-02 04:08:37 +01:00
Vladimír Čunát
9287f4461d
Merge #206907: stdenv: gcc11 -> gcc12 2023-02-01 16:54:44 +01:00
Sergei Trofimovich
04e8afb797
Merge pull request #213743 from trofi/xorg.fontalias-update
xorg.fontalias: 1.0.3 -> 1.0.4
2023-01-31 18:22:17 +00:00
Sergei Trofimovich
4be79e3516 xorg.fontalias: 1.0.3 -> 1.0.4
Changes: https://lists.x.org/archives/xorg-announce/2020-August/003054.html
2023-01-31 08:50:45 +00:00
Sergei Trofimovich
8f97ea1afb
Merge pull request #213425 from trofi/xorg.lndir-update
xorg.lndir: 1.0.3 -> 1.0.4
2023-01-30 07:15:59 +00:00
Sergei Trofimovich
202f1529c3 xorg.lndir: 1.0.3 -> 1.0.4 2023-01-29 19:14:14 +00:00
Sergei Trofimovich
8932edc3de
Merge pull request #213210 from trofi/xorg.bdftopcf-update
xorg.bdftopcf: 1.1 -> 1.1.1
2023-01-29 08:32:24 +00:00
Sergei Trofimovich
119726d93a xorg.bdftopcf: 1.1 -> 1.1.1
Changes: https://www.spinics.net/lists/xorg/msg60690.html
2023-01-28 19:12:42 +00:00
github-actions[bot]
fa361440fc
Merge staging-next into staging 2023-01-28 12:01:44 +00:00
Vladimír Čunát
1ea7e2bc44
xorg.libXpm: 3.5.13 -> 3.5.15
There are mainly the security fixes:
CVE-2022-46285 CVE-2022-44617 CVE-2022-4883

The new dependency adds just several kilobytes.
https://www.mail-archive.com/xorg-announce@lists.x.org/msg01521.html
https://www.mail-archive.com/xorg-announce@lists.x.org/msg01522.html
https://www.mail-archive.com/xorg-announce@lists.x.org/msg01470.html
2023-01-28 10:51:56 +01:00
Fabián Heredia Montiel
0cf5d85f0c treewide: add gcc12 flags 2023-01-27 21:20:52 -06:00
github-actions[bot]
637a1f98b5
Merge staging-next into staging 2023-01-27 00:02:55 +00:00
github-actions[bot]
2a8fae3ee5
Merge master into staging-next 2023-01-27 00:02:25 +00:00
Sergei Trofimovich
73d6c02f4b xorg.xprop: 1.2.5 -> 1.2.6
Changes: https://www.spinics.net/lists/xorg/msg60754.html
2023-01-25 21:28:40 +00:00
Artturi
5e0e716865
Merge pull request #212115 from Artturin/splitthings1 2023-01-25 21:45:02 +02:00
Sergei Trofimovich
f870683639
Merge pull request #212229 from trofi/xorg.libX11-update
xorg.libX11: 1.8.1 -> 1.8.3
2023-01-25 08:51:30 +00:00
Sergei Trofimovich
1a13817d32 xorg.libX11: 1.8.1 -> 1.8.3
Changes:
- 1.8.2: https://www.spinics.net/lists/xorg/msg60726.html
- 1.8.3: https://www.spinics.net/lists/xorg/msg60791.html
2023-01-23 08:53:19 +00:00
Sergei Trofimovich
1c5726d283
Merge pull request #212061 from trofi/xset-update
xorg.xset: 1.2.4 -> 1.2.5
2023-01-23 08:45:39 +00:00
Artturin
0ffa8f6b9e xorg.libXt: move share/doc to devdoc
1.2M
2023-01-22 19:00:44 +02:00
Sergei Trofimovich
30e489228b xorg.xset: 1.2.4 -> 1.2.5
Changes: https://www.spinics.net/lists/xorg/msg60756.html
2023-01-22 09:33:17 +00:00
Alyssa Ross
13d8068354
xorg.libpciaccess: fix build on NetBSD 2023-01-13 04:49:21 +00:00
Alyssa Ross
abdc781d4c
xorg.libpciaccess: broaden platforms 2023-01-13 04:49:20 +00:00
Artturi
5ce27e15ea
Merge pull request #208900 from Artturin/xorgwrapWithXFileSearchPathHook 2023-01-04 16:52:48 +02:00
Artturin
c42e7b71d2 xorg.xf86videor128: 6.11.0 -> 6.12.1
includes a cross fix

- 6.12.0: https://lists.x.org/archives/xorg-announce/2018-July/002909.html
- 6.12.1: https://lists.x.org/archives/xorg-announce/2022-December/003275.html
2023-01-03 20:00:12 +02:00
Artturin
e349e79866 xorg.xf86videomga: 2.0.0 -> 2.0.1
includes a cross fix

https://lists.x.org/archives/xorg-announce/2022-July/003184.html
2023-01-03 19:54:16 +02:00
Sergei Trofimovich
050a94b3df xorg.xauth: 1.1.0 -> 1.1.2
Changes:
- 1.1.1: https://lists.x.org/archives/xorg-announce/2021-November/003118.html
- 1.1.2: https://lists.x.org/archives/xorg-announce/2022-April/003158.html
2023-01-03 19:35:28 +02:00
Artturin
68ed486d30 xorg: remove unnecessary overrides 2023-01-03 19:31:00 +02:00
Artturin
659574008e xorg.{libFS,libWindowsWM}: fix cross 2023-01-03 19:14:17 +02:00
Artturin
277a523dda xorg: add wrapWithXFileSearchPathHook
supersedes PR 70239

Description from that PR

Make xorg apps look as intended. Most notable change: xmag color picker is usable now.

Before this commit, only two apps had properly configured resource paths: bitmap and xcalc. This commit automates and generalizes it to the rest of xorg.* apps.

xorg.bitmap: bin/bitmap-color is no longer installed. If you would like bitmap to be viewable in color, please refer to man 1 bitmap, selection COLORS. The described method is also applied to some other affected apps.
2023-01-03 18:51:48 +02:00
Jan Tojnar
5810109b42 Merge branch 'staging-next' into staging
- readline6 attribute removed from all-packages.nix in d879125d61
- readline attribute was bumped to readline82 in 50adabdd60
2023-01-02 03:04:32 +01:00
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
Weijia Wang
90af686ddb xorgcffiles: add aarch64-darwin support 2022-12-30 06:40:45 +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
Jan Tojnar
72c37eddec Merge branch 'staging-next' into staging 2022-12-25 01:30:47 +01:00
Alyssa Ross
0a55054b16
xorg.xorgserver: 1.18.4 -> 1.20.14 on Darwin (still broken)
Previously, Darwin was kept on 1.18 because more recent versions were
broken, but now 1.18 is also broken on Darwin, so we might as well get
rid of the special case and bring Darwin forward.  With these changes,
xQuartz builds on Darwin, but when run it will exit immediately.

This makes Darwin use the same derivation as Linux by default, which
will enable further cleanups.  But as a result, we have to fix some
Linuxisms.

 * Only add libdrm dependency on compatible platforms.
 * Add libepoxy dependency for all platforms.
 * Add bootstrap_cmds dependency on Darwin.
 * Disable glamor on Darwin.
2022-12-21 22:39:58 +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
github-actions[bot]
392cc9b8fe
Merge staging-next into staging 2022-12-17 12:01:41 +00: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
github-actions[bot]
2f395f3cac
Merge staging-next into staging 2022-12-16 12:01:41 +00: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
Artturin
c01f509e44 treewide: source .attrs in builders
if theres a source $stdenv then this is needed

for structuredAttrs
2022-12-08 21:09:02 +02: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