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
65da25997d
xorg.xorgserver: don't use XORG_DRI_DRIVER_PATH
...
Our patch which adds this envvar has been removed.
2018-03-26 14:01:49 +03: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
Shea Levy
d0a8866622
Merge branch 'binutils-2.30' into staging
2018-03-22 07:28:10 -04: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
Matthew Justin Bauer
ce01740dae
Merge pull request #33685 from corngood/amdgpu-pro-upgrade
...
amdgpu-pro: 17.10 -> 17.40
2018-03-19 12:40:03 -05:00
Shea Levy
0f172e971c
libxshmfence: Bump to 1.3.
...
Needed with glibc-2.27.
2018-03-17 21:58:14 -04:00
Jan Tojnar
a31d98f312
tree-wide: autorename gnome packages to use dashes
2018-02-25 17:41:16 +01:00
Will Dietz
e7580d0f92
xorgserver: Builds! small workaround re:bad types
2018-02-13 09:44:55 -06:00
Franz Pletz
1e4ebccde4
xcbutilxrm: 1.0 -> 1.2
2018-01-28 18:52:27 +01:00
David McFarland
ebf1dade82
xorg: allow and check abiCompat on current version
2018-01-12 00:09:15 -04:00
adisbladis
c2316114bc
stdenv: Kill off ensureDir
2018-01-09 11:14:48 +08:00
John Ericson
4d2b763817
Merge pull request #26805 from obsidiansystems/cross-elegant
...
Make cross compilation elegant
2017-12-30 22:58:02 -05:00
John Ericson
e0f1739c75
treewide: Don't use nativePkgs
or crossPkgs
anymore
2017-12-30 22:04:22 -05: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
e001bd2c2f
xorg-server-1.18: fixup build with glibc-2.26
...
It's non-default version required by amdgpu-pro ATM. Thanks to Mounium.
2017-12-03 16:23:45 +01:00
Orivej Desh
6eddd8081f
xorg.fontmiscmisc: make the misc fonts available
...
Xorg was rejecting font directories with symlinks since
db6adec156
.
2017-12-01 10:37:03 +00:00
Tuomas Tynkkynen
86ad1451f2
xorg: Mark some xf86* drivers x86-only
...
https://hydra.nixos.org/eval/1413937?filter=xorg&compare=1358674
2017-11-30 19:03:14 +02: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
Orivej Desh
4549190441
xorg.bitmap: provide resource search path
2017-11-29 04:29:43 +00: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
John Ericson
da19c34d0f
stdenv setup: Always use both propagated files
...
This continues #23374 , which always kept around both attributes, by
always including both propagated files: `propgated-native-build-inputs`
and `propagated-build-inputs`. `nativePkgs` and `crossPkgs` are still
defined as before, however, so this change should only barely
observable.
This is an incremental step to fully keeping the dependencies separate
in all cases.
2017-11-21 10:44:44 -05:00
Peter Hoeg
07d429a722
Merge pull request #30828 from gnidorah/xwayland
...
xwayland: enable acceleration with help of glamor
2017-11-01 18:01:11 +08:00
Tuomas Tynkkynen
9812babaef
xorg.xf86inputlibinput: Split dev output
...
Closure goes from 160M -> 42M
2017-10-28 14:54:35 +03:00
gnidorah
6574d21664
xwayland: enable acceleration with help of glamor
2017-10-27 09:45:40 +03:00
Joerg Thalheim
c1addcdffa
xf86-video-intel: 2017-04-18 -> 2017-10-19
2017-10-25 01:44:04 +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
Yegor Timoshenko
db11d7fd2b
xf86-input-libinput: 0.25.1 -> 0.26.0
2017-10-15 12:13:58 -05: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
35f894860d
xf86-video-intel: fixup after #29039
...
This was one package in pkgs/servers/x11/xorg/default.nix
that was *not* generated, and that was missed in the PR
and overwritten (understandably).
Now the change is properly in overrides.nix to prevent that...
2017-10-08 10:55:34 +02:00
Vladimír Čunát
5dc3b2fdc6
xf86-video-amdgpu: 1.3.0 -> 1.4.0
2017-10-07 21:31:40 +02:00
Vladimír Čunát
35b4c8be51
xorg-server: fixup build after #29039
...
The expression uncarefully overrode whole nativeBuildInputs,
so after the pkgconfig move it got removed and the build failed.
1.19.3 doesn't need these lines anyway...
2017-10-07 09:38:42 +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
John Ericson
252b36a28d
misc pkgs: Recategorize some dependencies
2017-09-05 11:37:10 -04:00
Tuomas Tynkkynen
ebdbc08583
xorg: Split some man outputs from doc
...
Because soon manpages won't go to $doc anymore.
2017-08-11 21:32:53 +03:00
Carter Charbonneau
14bd516fa6
xf86-video-intel: build intel-virtual-output
2017-08-04 03:32:29 +02:00
John Ericson
ea7d13cf1a
stdenv-setup and misc hooks: Work with bash-3.4 for MacOS nix-shell
...
This is a temporary measure until this impurity is removed from Nix.
2017-07-26 09:08:01 -04:00
John Ericson
8d76effc17
stdenv-setup: Make the package accumulators associative arrays instead of strings
...
This is generally cleaner: less eval, less worrying about separators,
and probably also faster. I got the idea from that python wrapper
script.
2017-07-12 15:30:56 -04:00
Vladimír Čunát
403b3c2ddd
xkeyboard-config: 2.20 -> 2.21
2017-06-11 09:46:12 +02:00
Benjamin Staffin
7445649387
xorg-input-libinput: 0.25.0 -> 0.25.1
...
This isn't part of a full xorg release, so I just added it to the xorg
overrides.nix.
Changelog and release announcement:
https://lists.x.org/archives/xorg-announce/2017-May/002798.html
2017-06-04 13:47:05 -04: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
Robin Gloster
56e624b155
xorg.xf86videoxgi: fix build with upstream patch
2017-02-27 12:43:58 +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
Karn Kallio
a8d7a6a957
xwayland : fix build by giving wayland-protocols to the build.
2017-02-12 19:33:53 +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
Vladimír Čunát
ce9d30e734
Merge #22241 : amdgpu-pro: 16.50 -> 16.60
2017-02-07 20:49:58 +01:00
David McFarland
905627c7c5
xorg-server: fglrxCompat -> abiCompat
...
Allows it to be used for fglrx (1.17) and amdgpu-pro (1.18)
2017-02-06 23:16:21 -04: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
Michael Raskin
4675cb78cb
xorg.libXpm: 3.5.11 -> 3.5.12
2017-02-03 13:14:39 +01:00
Vladimír Čunát
42c1f449bd
intel-gpu-tools: finish removing the duplicate
2017-01-19 09:41:38 +01: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
volth
69ed58d88f
xorg.xserver: configure --with-xkb-path= ( #21653 )
2017-01-18 02:57:15 +03:00
Robin Gloster
289782b94b
xorg.xrandr: remove unnecessary xkeystone binary
...
Fixes #21714 (see this for more information)
2017-01-11 19:53:38 +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
33abc705b3
xorg-server variants: eradicate symlink to /var/tmp
...
- Fixes #19673 ; it caused problems in combination with buildEnv.
- As noted, X falls back to /tmp:
https://github.com/NixOS/nixpkgs/issues/19673#issuecomment-258871876
- Removing the directory is still required, as X would attempt to write
into it if allowed - and probably succeed in case the user set
nix.readOnlyStore = false; (X runs as root).
- Archeology link: 9d1569316
.
2016-12-04 09:43:05 +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
4fee7fc82e
xorg.libXrender: propagate renderproto
...
Fixes #19909 ; there's a dependency between the headers.
2016-10-27 22:16:04 +02: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
Alexander Ried
e7ded267bd
xserver: replace XKB_BINDIR with compile time option
...
---
Using the configure option relieves us of the patch and passing the path
via the env var in many places. Also the env var may not be inherited
when components like gdm spawn new sessions.
2016-10-03 15:03:02 +02:00
Eelco Dolstra
55f489eb74
libXp: Use multiple outputs
2016-10-02 19:22:19 +02:00
Eelco Dolstra
b6f3e08019
xinput: Remove libXfixes.dev from the closure
2016-09-26 19:59:02 +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
Tuomas Tynkkynen
e2c6740c37
Merge commit 'adaee73' from staging into master
...
This one was already merged into release-16.09, so let's not have the
stable branch is ahead of master and confuse things. In addition to
that, currently we have an odd situation that master has less things
actually finished building than in staging.
Conflicts:
pkgs/data/documentation/man-pages/default.nix
2016-09-03 01:02:51 +03:00
Tuomas Tynkkynen
79d673e21c
xorg: Mark obsolete xorgvideo* drivers broken
...
These are now showing up as broken builds in Hydra since 2daefaf457
.
None of these compiled even in 16.03 and I think all of them are
for pretty obsolete hardware, so just mark them as broken.
(In principle the xorg generator could be made to ignore them but that
would be more work.)
2016-09-02 16:38:46 +03:00
Eelco Dolstra
8172cd734c
docdev -> devdoc
...
It's "developer documentation", not "documentation developer" after
all.
2016-09-01 11:07:23 +02:00
Tuomas Tynkkynen
c4521aeffa
xcb-util-xrm: Fix 'lib.optional' usage
...
That produces a list containing a singleton list containing libX11.
2016-08-30 16:28:02 +03:00
Tuomas Tynkkynen
d3dc3d4130
Merge remote-tracking branch 'dezgeg/shuffle-outputs' into staging
...
https://github.com/NixOS/nixpkgs/pull/14766
2016-08-30 12:43:37 +03:00
Tuomas Tynkkynen
d4eb6887b9
xorg.xf86videoati: Use dev output of xorgserver
...
TODO: Darwin xorgserver should have consistent outputs with the Linux
one.
2016-08-30 02:41:12 +03:00
Vladimír Čunát
40dc278ee0
xorg.fontbhttf: mark as unfree
...
https://bugzilla.redhat.com/show_bug.cgi?id=317641
2016-08-29 22:40:32 +02:00
Tuomas Tynkkynen
a17216af4c
treewide: Shuffle outputs
...
Make either 'bin' or 'out' the first output.
2016-08-29 14:49:51 +03:00
Robin Gloster
0865e22567
xorg.xf86videoxgi: add patch to fix build
2016-08-29 08:25:12 +00: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
33e1c78ae3
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-08-16 07:54:01 +00:00
Robin Gloster
27b9f5d65e
xorg.*: disable relro/bindnow hardening
...
Breaks the module system at runtime otherwise.
2016-08-14 09:01:55 +00:00
Marius Bakke
ab53f39fae
xcbutilxrm: init at 1.0
2016-08-14 00:07:50 +01:00
Robin Gloster
f7da99c7ff
xorg.xorgserver: disable relro hardening
...
Fixes modesetting module loading.
2016-08-12 12:07:24 +00:00
Robin Gloster
b7787d932e
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-08-12 09:46:53 +00:00
Tuomas Tynkkynen
0eb827918d
xorg.libpciaccess: Not supported on Darwin
...
http://hydra.nixos.org/build/38160825/nixlog/1/raw
2016-08-04 23:11:45 +03:00
Robin Gloster
1b979d8384
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-08-03 13:34:44 +00:00
Tuomas Tynkkynen
17e94ebc6a
xorg.xcbutilcursor: Don't wipe out most meta attrs
2016-08-02 21:17:44 +03:00
Robin Gloster
63c7b4f9a7
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-07-31 20:51:34 +00:00
Gabriel Ebner
5c9309c231
xorg.xorgserver: enable glamor support
2016-07-30 13:37:51 +02:00
Robin Gloster
1f04b4a566
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-07-21 00:56:43 +00:00
Lluís Batlle i Rossell
13fc6e56fe
Adding intel-gpu-tools to xorg.
2016-07-20 12:33:24 +02:00
Robin Gloster
8031cba2ab
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-06-10 09:27:04 +00: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
Robin Gloster
2d382f3d98
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-05-30 19:39:34 +00:00
Vladimír Čunát
69cc0a7bc5
xf86-input-evdev: split dev output
2016-05-23 13:02:55 +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
ff2d137410
xorg: add fglrxCompat parameter
2016-05-22 22:16:12 +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
Vladimír Čunát
f4eb808554
xf86-input-synaptics: split dev output
2016-05-22 12:10:38 +02:00
Franz Pletz
f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv
2016-05-18 17:10:02 +02:00
Vladimír Čunát
e429a4012e
Merge #15360 : xscreensaver: Fix xscreensaver-text
2016-05-17 09:13:59 +02:00
Alexey Lebedeff
02ce05d1cc
appres: init at 1.0.4
2016-05-10 18:31:27 +03:00
Thomas Tuegel
668f93c719
xcb-util-cursor: multiple outputs
2016-04-25 19:04:24 -05:00
Robin Gloster
d020caa5b2
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-04-18 13:49:22 +00:00
Robin Gloster
f519a255a5
xorg: switch off bindnow hardening for all packages
...
X otherwise fails to load modules.
2016-04-04 14:15:31 +00:00
Vladimír Čunát
d039c87984
Merge branch 'master' into closure-size
2016-02-14 08:33:51 +01:00
Robin Gloster
9229e9c656
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-02-07 11:17:57 +00:00
Vladimír Čunát
ae74c356d9
Merge recent 'staging' into closure-size
...
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +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
Franz Pletz
936dfeb700
xorg.sessreg: Fix build on gcc-5
2016-01-30 16:36:57 +00:00
Tobias Geerinckx-Rice
32d40f0f98
Remove no longer (or never) referenced patches
...
55 files changed, 6041 deletions. Tested with `nix-build -A tarball`.
2016-01-24 02:02:21 +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
620c147cce
Merge branch 'master' into staging
2016-01-18 09:48:49 +01:00
Domen Kožar
9e8eba48ab
xorg.xorgserver: wrap Xvfb with required flags
2016-01-17 21:14:49 +01:00
Vladimír Čunát
2d0893088f
Merge branch 'master' into staging
2016-01-15 13:43:57 +01:00
Tobias Geerinckx-Rice
521f903b80
xorgVideoUnichrome: remove dead package
...
Broken since 2013, upstream very dead.
2016-01-11 00:16:01 +01:00
Vladimír Čunát
b1acaffe67
Merge branch 'master' into staging
2016-01-05 10:28:58 +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
16d0cd7c68
xorg: update tarballs list
...
There've been some updates of default.nix without corresponding updates
in the tarball list. Re-generation then added lots of downgrade cruft.
The intel driver can't be added this way, but at least we get much closer.
2016-01-04 12:03:37 +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
Vladimír Čunát
b559020e27
xorgReplacements: remove this ancient cruft
2016-01-04 10:31:58 +01:00
Vladimír Čunát
f9f6f41bff
Merge branch 'master' into closure-size
...
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
2015-12-31 09:53:02 +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
Jude Taylor
848064cef6
remove old patches and attributes from xorgserver
2015-12-16 12:03:29 -08: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
9579c9ec7f
Merge commit 'cb21b77' into master.upstream
...
This is a partial merge of staging for builds which are working
2015-11-13 15:53:10 -08: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
William A. Kennington III
dd2de66d61
Merge branch 'master.upstream' into staging.upstream
2015-10-30 17:16:07 -07:00
Lluís Batlle i Rossell
61c6597246
Bringing back eo symbols for xkb
...
I port the patch for esperanto symbols removed in
1be2acd1317aadc8e1a08d17312e524fb5fc2a4300 to the current
xkeyboardconfig.
(cherry picked from commit 4a830de0323e34592a36dea660d9a3ec8348964e)
2015-10-29 13:32:35 +01:00
Jude Taylor
c749714170
clean up xquartz arguments
2015-10-28 13:56:13 -07:00
Vladimír Čunát
787f322540
$docdev fixups: mostly to avoid empty output
...
... after auto-removing some kinds of files by default.
In some cases I let them be removed and in others I let them be put into
$docdev. That was more due to general indecisiveness on this question
than any reasons in the particular cases.
2015-10-28 18:58:06 +01:00
Vladimír Čunát
e153b68fce
xorg-server: avoid runtime references to xorgserver-dev
2015-10-28 10:22:58 +01:00
Tuomas Tynkkynen
db81e22148
treewide: Mass-replace 'xorgserver}/bin' with correct output
...
vcunat added one fix in xdummy.
2015-10-28 10:17:12 +01:00
Tuomas Tynkkynen
c7e3ee4153
libXvMC: Split into multiple outputs
2015-10-28 10:17:11 +01:00
Vladimír Čunát
06eba7d320
xorg: remove $man where it was only man3
...
Now man3 is deleted if not specified otherwise,
and I don't really see a reason for X libs to produce them.
(This fixes failures due to not producing $man outputs.)
The $doc outputs are also development docs (all probably),
but I left those for now.
2015-10-28 10:17:07 +01:00
Jude Taylor
5469e9c581
fix xquartz build
2015-10-26 18:37:05 -07:00
Jude Taylor
cf12f3e4d2
patch out system include in libAppleWM
2015-10-26 17:13:29 -07:00
Vladimír Čunát
4917a4f8b3
Merge master into staging
2015-10-23 01:57:14 +02:00
Vladimír Čunát
2755d2b241
xorg: adjust generator to work with other archive types
...
In the end I didn't utilize it, but it shouldn't hurt.
2015-10-19 10:08:16 +02: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
e25da7e5c8
xorg: split outputs of various libs
2015-10-14 14:27:07 +02:00
Vladimír Čunát
fa6ddd7fa6
xorg.{libICE,libSM}: split dev and doc outputs
2015-10-13 20:19:01 +02:00
Vladimír Čunát
783c40eb68
dbus: split into multiple outputs and fix referrers
2015-10-13 20:19:01 +02:00
Vladimír Čunát
47305626ab
xorg{xcb-util-keysyms,libxkbfile}: split the dev output
2015-10-13 20:18:59 +02:00
Vladimír Čunát
e4f38fb050
xorg.xcb-util: split into multiple outputs
...
I see no references likely to break.
2015-10-05 16:00:55 +02:00
Vladimír Čunát
32b31398eb
xorg.libXt: re-split into multiple outputs
...
Fixed all 'libXt}' references, too.
2015-10-05 11:23:34 +02:00
Tuomas Tynkkynen
753cfbe09b
libXmu: Split into multiple outputs
...
We need to override BITMAPDIR, since the default:
-DBITMAPDIR=\"$(includedir)/X11/bitmaps\"
would cause cycles between the outputs. Setting it to a nonexistent path
doesn't affect the code logic, since the corresponding single-output
directory $out/include/X11/bitmaps doesn't exist either.
(cherry picked from commit 15007c88108d9c6a3bc82b22eff53175bbddf75e)
2015-10-03 16:36:21 +02:00
Tuomas Tynkkynen
0100b27069
imake: Add uberhack to workaround broken 'gcc -x c'
...
Our cc-wrapper is broken whenever the '-x' flag is used:
'gcc -x c foo.c -o bar' doesn't work the same way as 'gcc foo.c -o bar'
does. (Try both with NIX_DEBUG=1.)
What happens is that passing '-x' causes linker-related flags (such as
-Wl,-dynamic-linker) not to be added, just like if '-c' is passed.
The bug happens outside the multiple-outputs branch as well, but it
doesn't break imake there. It only breaks in multiple-outputs because
linking without -Wl,-dynamic-linker produces a binary with an invalid
ELF interpreter path. (Which arguably, is a bug in its own.)
2015-10-03 14:08:51 +02:00
Tuomas Tynkkynen
947542be6d
libxft: Fix reference to incorrect output
2015-10-03 14:08:50 +02:00
Tuomas Tynkkynen
f72376fd20
x11: Remove conflicting outputs produced by auto merge
2015-10-03 13:39: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
Jude Taylor
4f9ef9bbfb
give xquartz impure deps to make it build
2015-09-28 14:45:45 -07:00
Jude Taylor
76a6539829
work on making xquartz buildable in a pure environment
2015-09-22 16:27:51 -07:00
Jude Taylor
d78936131a
preparation for being able to build xquartz
2015-09-17 16:11:18 -07:00
William A. Kennington III
8dc7073546
Merge branch 'master.upstream' into staging.upstream
2015-09-15 12:04:41 -07:00
Mathnerd314
eb7404d97a
all-packages: Use callPackage where possible
2015-09-14 22:27:19 -06:00
Benjamin Saunders
a6f6c0eeeb
libxcb: add xinput support ( close #9835 )
2015-09-13 10:51:21 +02:00
Vladimír Čunát
8ab4c20998
xorg.{libXi,libxcb}: maintenance update
2015-09-13 10:51:21 +02:00
Domen Kožar
66214fba8d
Xorg: apply patch to fix X crashes
...
(cherry picked from commit dc0fe8ebf40b7724de1ca0b195236854591fdb5f)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-09-04 18:47:40 +02:00
Tuomas Tynkkynen
6b866a37fc
xrdb: Use mcpp as the preprocessor
...
Close #9501 , fixes #9480 .
By default, xrdb uses GCC as the preprocessor at runtime for X resource files.
However, gcc is a large dependency, so replace it with mcpp, a much smaller
preprocessor (currently under a megabyte on i686).
Arch Linux already does this as well, so this should be relatively safe:
https://projects.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD?h=packages/xorg-xrdb
2015-08-29 08:29:59 +02:00
William A. Kennington III
2ac70270e8
Merge branch 'master.upstream' into staging.upstream
2015-08-18 11:36:32 -07:00
Max Zerzouri
807a0e4609
xorg-server: fix XKB_BINDIR usage ( close #8993 )
...
Previously, XKB_BINDIR was read inside a loop over the program
arguments, so was only read if it had arguments that weren't matched by
the first some number of checks.
2015-08-18 10:14:11 +02:00
Charles Strahan
f178817aee
xquartz: 1.14.6 -> 1.17.2
...
closes #9126
2015-08-05 13:57:02 -05:00
William A. Kennington III
09b4a7cc1b
Merge branch 'master.upstream' into staging.upstream
2015-07-31 17:26:20 -07:00
John Wiegley
23562aad59
Revert "emacs: Update Mac Port Emacs to 24.5-mac-5.9"
...
This reverts commit 5c896e5511
, which was
a set of local changes unrelated to the commit title.
2015-07-30 16:21:39 -07:00
William A. Kennington III
aaef42ab8c
Merge branch 'master.upstream' into staging.upstream
2015-07-29 10:23:08 -07:00
John Wiegley
5c896e5511
emacs: Update Mac Port Emacs to 24.5-mac-5.9
2015-07-28 20:08:53 -07:00
Vladimír Čunát
2600e00ca9
xorg.xproto: maintenance update
2015-07-28 19:13:50 +02:00
Eelco Dolstra
e1f78bf677
More docs/manpages in separate outputs
2015-07-27 00:27:54 +02:00
Vladimír Čunát
a2f16fdcff
Merge branch 'staging'
2015-07-24 15:12:28 +02:00