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
Jude Taylor
2e29399993
update packages with new cf-private compatibility
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
f8c211fd2b
fontconfig: split into multiple outputs
...
Fixed all 'fontconfig}' references as well, hopefully, ugh!
2015-10-05 12:23:56 +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
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
Vladimír Čunát
e6ca18e9bf
xwayland: fix build
...
Maybe it was just covered by #7524 until now.
/cc #5061 and @echo-oddly.
2015-06-27 11:40:04 +02:00
William A. Kennington III
8e19ac8d7c
Merge branch 'master.upstream' into staging.upstream
2015-06-17 11:57:40 -07:00
William A. Kennington III
8310045b14
Add missing patch
2015-06-16 23:56:15 -07:00
William A. Kennington III
061887e38a
xf86-video-intel: Kernel 4.0 match
2015-06-16 23:37:05 -07:00
William A. Kennington III
e4316b8c17
xorg-server: 1.16.4 -> 1.17.2
2015-06-16 23:36:11 -07:00
William A. Kennington III
57ee8d6131
xorgserver: Add gcc5 compat patch
2015-06-16 14:21:54 -07:00
Eelco Dolstra
553abf71ba
Merge remote-tracking branch 'origin/staging' into gcc-4.9
...
Conflicts:
pkgs/build-support/cc-wrapper/default.nix
pkgs/development/libraries/wayland/default.nix
pkgs/development/tools/build-managers/cmake/default.nix
pkgs/top-level/all-packages.nix
2015-06-01 20:08:43 +02: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
Eelco Dolstra
e8e0995bd0
Fix inputproto and probably other packages
...
"grep Requires" failed on *.pc files that had no Requires fields, due
to pipefail. But this error was previously masked by #7524 .
2015-05-13 18:17:25 +02:00
Eric Seidel
662a6b1ca6
remove all references to stdenv.cc.cc.is{GNU,Clang}
...
use the new `stdenv.cc.is{GNU,Clang}` instead, which will always be
defined.
2015-05-11 14:44:50 -07:00
Vladimír Čunát
375bc8def7
Merge staging into closure-size
2015-05-05 11:49:03 +02:00
Vladimír Čunát
30f31c9afc
Merge 'master' into staging
...
(relatively simple conflicts)
2015-04-26 22:52:08 +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
Nikita Mikhailov
a29182a6f5
xorg: fix Xephyr
2015-04-11 11:34:35 +02:00
Eric Seidel
13dae62ec2
libxkbfile: patch for clang36
2015-03-24 20:54:47 -07: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
Nikolay Amiantov
edaa3a7643
xorg-server: add Xephyr ( close #6715 )
2015-03-12 20:15:21 +01:00
aszlig
0ccf34039c
xorg.mxfontscale: Fix segfault with some fonts.
...
The update to version 1.1.2 in 9c22c1b
introduces a segfault when
mkfontscale is processing fonts where the family name is missing.
Applies a patch from Stefan Dirsch <sndirsch@suse.com> to be found at:
https://bugs.freedesktop.org/show_bug.cgi?id=89409
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-03-11 16:57:21 +01:00
Vladimír Čunát
6c20e1d0bd
xf86-video-vmware: drop patch included in update
2015-03-09 15:55:28 +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
Alexander V. Nikolaev
279d5af119
Proper default path for XKB config files
2015-02-24 21:38:30 +02: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
1982ac0b65
xorg.xinit: fix on Linux after #6160
2015-02-05 11:09:14 +01:00
Eric Seidel
7f7482b6bd
fix xorgserver / xquartz on darwin
2015-02-04 15:14:36 -08:00
Shea Levy
df430ab2ea
Fix imake on darwin.
...
Taken from joelteon/nixpkgs@6b3f7e6fb0
Original author Mike Sperber <sperber@deinprogramm.de>
2015-02-04 10:00:50 +00:00
John Wiegley
bff056703a
xquartz: depend on font binaries instead of source
2015-01-03 07:53:08 -05:00
Vladimír Čunát
0bc5228fd2
xorg.xf86-video-intel: maintenance update
2014-12-25 10:06:49 +01:00
Vladimír Čunát
081e5c8387
Merge #5061 : add xwayland
...
Also resolve minor nitpicks -- *during* the merge commit.
2014-12-25 09:25:05 +01:00