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 2daefaf4572.
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
Vladimír Čunát
4f73633f26
treewide: stop using fontbhttf
2016-08-29 22:28:50 +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
5185bc1773
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-07-15 14:41:01 +00:00
zimbatm
28fa4a2f03
Escape all shell arguments uniformly
2016-06-12 18:11:37 +01: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
Robin Gloster
9820cb1bf2
use dontBuild instead of hacks
...
changes:
* buildPhase = "true"
* buildPhase = ":"
2016-05-04 10:11:04 +00: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