BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
160936 commits 1 branch 0 tags 3.8 GiB
Commit graph

726 commits

Author SHA1 Message Date
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
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
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
Sebastián Bernardo Galkin
06e6d7def2 xorg-server: enable DRI3 (close #5381) 
TEST needed. I tested on my NixOS Thinkpad with Optimus nvidia and intel
cards.  Testing in other architectures is needed.

This patch also improves the regular expressions that scan the build
configuration files to enable the building of a binary utility in
xf86-video-intel: intel-virtual-output. This utility is useful for some
Optimus laptops

DRI3 was added to xorg-server propagatedBuildInputs so now it's inherited
by several projects that can use it.
 2014-12-18 18:17:42 +01:00
Vladimír Čunát
84d6debf46 xorg-server: security update to RC1 of 1.16.3 
Close #5292. There are almost no other changes since 1.16.2
than fixing that CVE-2014-8092. See also:
http://www.x.org/wiki/Development/Security/Advisory-2014-12-09/
 2014-12-16 19:28:42 +01:00
Vladimír Čunát
ea557c8fd1 xorg xf86-input-evdev: update and add needed inputs 2014-12-03 13:26:32 +01:00
Vladimír Čunát
ea1dd9fd4a xorg: revert to older xf86-input-evdev for now 
How could I forget to test to build it at least :-/
 2014-11-28 22:04:39 +01:00
Vladimír Čunát
442cad9cbd xorg: update some modules 2014-11-28 20:42:07 +01:00
David Virgilio
9a2b2e7b34 new package: xwayland 2014-11-20 06:21:47 -06:00
Eelco Dolstra
a0f3faf34e Merge remote-tracking branch 'origin/glibc-2.20' into staging 2014-11-16 22:17:36 +01:00
Vladimír Čunát
4a62542f55 xorg.xf86-video-intel: use the new versions 
The old driver wasn't updated since August 2013, and e.g. won't compile
with glibc-2.20. Distros like Arch or Ubuntu are using newer one for a long time.

(cherry picked from commit 515dcb0f66)
 because the old driver won't compile with new X server.
 2014-11-12 16:33:20 +01:00
Eelco Dolstra
0518ccf5af Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/stdenv/generic/default.nix
 2014-11-06 10:16:39 +01:00
Mateusz Kowalczyk
007f80c1d0 Turn more licenses into lib.licenses style 
Should eval cleanly, as far as -A tarball tells me.

Relevant: issue #2999, issue #739
 2014-11-06 00:48:16 +00:00
Vladimír Čunát
dcd2590c98 xorg-server: major bump 1.14.* -> 1.16.1 (incl. deps) 2014-11-05 07:55:25 +01:00
Eelco Dolstra
7495c61d49 Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging 
Conflicts:
	pkgs/applications/editors/vim/macvim.nix
 2014-11-04 14:30:43 +01:00
Vladimír Čunát
515dcb0f66 xorg.xf86-video-intel: use the new versions 
The old driver wasn't updated since August 2013, and e.g. won't compile
with glibc-2.20. Distros like Arch or Ubuntu are using newer one for a long time.
 2014-11-01 23:38:06 +01:00
Vladimír Čunát
95b475da09 xorg.xf86-input-vmmouse: fix build with glibc-2.20 2014-11-01 23:26:44 +01:00
Vladimír Čunát
4cc61d6d08 xorg.xf86-video-vmware: fix build against glibc-2.20 2014-11-01 22:29:42 +01:00
Vladimír Čunát
9877fdb39d xorg: updates some modules; mostly minor changes 2014-10-19 20:10:19 +02:00
Joel Taylor
afa1db198b fix even more clang builds 2014-09-09 13:54:57 -07:00
Joel Taylor
374648deaa X11 build purity 2014-09-09 13:54:25 -07:00
Joel Taylor
3e8344d334 suitable clang stdenv 2014-09-09 13:54:24 -07:00
Vladimír Čunát
8da52a642a Merge branch 'staging' into v/modular 
Conflicts (easy):
	pkgs/development/interpreters/perl/5.10/setup-hook.sh
	pkgs/development/interpreters/perl/5.8/setup-hook.sh
	pkgs/development/libraries/gtk+/2.x.nix
 2014-08-31 12:23:18 +02:00
Vladimír Čunát
4c3e6a4675 xorg: go back to using the new nix syntax 
This reverts commit 86a372683a.
The original revert was just temporary.

Conflicts (auto-solved):
	pkgs/servers/x11/xorg/default.nix
 2014-08-31 12:20:34 +02:00
Vladimír Čunát
e51f73652d Merge recent master into staging 
Hydra: ?compare=1149952

Conflicts:
	nixos/doc/manual/configuration.xml (changed split file)
	nixos/modules/config/users-groups.nix (choosing filterNull instead of inline definition)
	pkgs/development/libraries/readline/readline6.3.nix (auto-solved)
 2014-08-30 10:04:02 +02:00
Vladimír Čunát
a70180ba73 mutiout: make it builtin 2014-08-30 08:27:43 +02:00
Vladimír Čunát
fb59f27a43 WIP: getting good 2014-08-27 01:14:09 +02:00
Vladimír Čunát
0f6ae6403e xorg: fix typo from the last xorg commit 
Thanks to @falsifian for noticing it.
 2014-08-24 09:55:22 +02:00
Vladimír Čunát
99e300c4f8 xorg: add xf86-video-qxl 2014-08-23 18:55:30 +02:00
Vladimír Čunát
8c8197dfb3 xorg: stop using the new nix syntax 
Partial revert of 5ea8497933.
 2014-08-23 16:15:28 +02:00
Vladimír Čunát
96cec2a7bd Merge 'staging' into multiple-outputs 
Conflicts:
	pkgs/applications/audio/flac/default.nix
	pkgs/build-support/gcc-wrapper/builder.sh
	pkgs/development/libraries/apr-util/default.nix
	pkgs/development/libraries/apr/default.nix
	pkgs/development/libraries/atk/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/gdk-pixbuf/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/glibc/2.17/builder.sh
	pkgs/development/libraries/glibc/2.17/locales.nix
	pkgs/development/libraries/libjpeg/default.nix
	pkgs/development/libraries/libogg/default.nix
	pkgs/development/libraries/libsamplerate/default.nix
	pkgs/development/libraries/libtiff/default.nix
	pkgs/development/libraries/libvorbis/default.nix
	pkgs/development/libraries/mesa/default.nix
	pkgs/development/libraries/pango/default.nix
	pkgs/development/web/nodejs/default.nix
	pkgs/os-specific/linux/pam/default.nix
	pkgs/os-specific/linux/systemd/default.nix
	pkgs/stdenv/generic/setup.sh
	pkgs/stdenv/linux/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-small.nix
 2014-08-23 16:04:53 +02:00
Vladimír Čunát
59e3e06076 xorg: update probably unused modules 2014-08-21 15:13:22 +02:00
Vladimír Čunát
acf8919844 xorg.xrandr: minor bugfix update 2014-08-21 15:13:21 +02:00
Vladimír Čunát
c31c79f0dd xorg.xcb (lib+proto): update (seems mainly bug fixes) 2014-08-21 15:13:21 +02:00
Charles Strahan
6f2bd70fd0 Remove old comment, and delete confusing LaunchDaemon 2014-08-18 11:36:34 -04:00
Charles Strahan
5ea8497933 get xorg/x11 working on Darwin 2014-08-12 20:40:57 -04:00
Vladimír Čunát
91b53aaebc xorg.libXext: minor update 2014-08-02 04:43:19 +02:00
Vladimír Čunát
f456abacb7 xorg.libXi: bugfix update 2014-07-20 08:38:06 +02:00
Vladimír Čunát
edec3719a6 xorg: update a few modules 2014-07-13 21:35:25 +02:00
Vladimír Čunát
dfd80a1b7e Merge recent master into x-updates 
Hydra eval: 1131611
 2014-06-26 22:05:15 +02:00
Vladimír Čunát
3f15312b44 xorg: add xkbprint 
Suggested by @KoviRobi on ML.
 2014-06-22 10:04:10 +02:00
Vladimír Čunát
c50f0e47e1 freetype: major update, including some CVE security 
- There's no fontconfig update yet, as I failed to debug it yet.
- Infinality patches are now taken from a different (maintained) source.
 2014-06-17 09:00:29 +02:00
Vladimír Čunát
ff327554e9 xorg: maintenance updates of several modules 2014-06-17 09:00:29 +02:00
Vladimír Čunát
bd96a4bb43 xorg: maintenance updates of a few modules 2014-05-26 22:45:50 +02:00
Vladimír Čunát
137eae0b55 Merge #2630: add and use fetchpatch 
fetchpatch is fetchurl that determinizes the patch.
Some parts of generated patches change from time to time, e.g. see #1983 and
http://comments.gmane.org/gmane.linux.distributions.nixos/12815
Using fetchpatch should prevent the hash from changing.

Conflicts (auto-solved):
	pkgs/development/libraries/haskell/gitit/default.nix
 2014-05-17 07:31:03 +02:00
Vladimír Čunát
832c661822 xorg.libXfont: security update, CVE-2014-{0209,0210,0211} 
For details see http://lists.x.org/archives/xorg-announce/2014-May/002431.html
 2014-05-16 18:33:24 +02:00
Vladimír Čunát
6da5d7922d xorg: minor update of xf86-input-{evdev,synaptics} 2014-05-06 18:43:01 +02:00
Vladimír Čunát
9e9f282309 xorg-server: go back to 1.14.6 due to intel problems 
Again, stable releases not compiling together :-/
 2014-04-19 23:42:54 +02:00
Vladimír Čunát
5d850ba9d3 xorg: revert fontsproto update, as it breaks libXfont 
This partially reverts commit 30ac332563.
https://groups.google.com/forum/#!msg/xorg-devel/SvgqiQnSN7c/f0wjRhauqvUJ

It's sad that the currently *released* versions don't even compile together,
and no dev reacts for four days so far...
 2014-04-19 22:15:32 +02:00
Vladimír Čunát
f66e5664e0 xorg-server: major update 1.14.5 -> 1.15.1 2014-04-19 14:31:14 +02:00
Vladimír Čunát
30ac332563 xorg: minor updates of three packages 2014-04-19 14:30:48 +02:00
Vladimír Čunát
44f4862041 xorg.xtrans: maintenance update 2014-04-01 10:53:34 +02:00
Vladimír Čunát
bd1abb36dd xorg: minor updates of xrandr and util-macros 2014-03-29 16:15:13 +01:00
Vladimír Čunát
9ddc57cbea xorg.xf86-video-vmware: minor update 
Patch no longer needed to build.
 2014-03-27 22:14:51 +01:00
Vladimír Čunát
576e9289dd Merge master into x-updates 2014-03-27 21:34:06 +01:00
Lluís Batlle i Rossell
fa5a583098 Bringing back the xkeyboard-config eo patch 2014-03-24 10:42:00 +01:00
Vladimír Čunát
11492176d5 xorg: add "intel-testing" video driver, currently 2.99.911 2014-03-23 22:10:56 +01:00
Vladimír Čunát
150102ce30 xorg.libFS: maintenance update 1.0.5 -> .6 2014-03-21 10:34:20 +01:00
Vladimír Čunát
eac9324034 xorg: fixup after the update 
All that built before update builds now again (and glamor-egl is new).
 2014-03-21 10:34:19 +01:00
Vladimír Čunát
23682d02d0 xorg: update, regenerate (new: glamor-egl) 
Updates caught by nixpkgs monitor.
 2014-03-21 10:34:19 +01:00
Vladimír Čunát
4f50a0917e xorg: add xf86-video-modesetting 2014-03-21 10:08:31 +01:00
Vladimír Čunát
88d490588d xorg: add some modules 
I was testing whether 10.1 mesa might solve the LLVM RTTI problems,
and it seems mesa will need these (and the problems aren't solved).
 2014-02-22 18:37:05 +01:00
Vladimír Čunát
5a8a3195a0 xorg.xcb-util-wm: minor update 0.4.0 -> .1 2014-02-22 17:40:01 +01:00
Vladimír Čunát
9a86ad2f7f xorg.xkeyboard-config: commit forgotten fixups 
Without these there was also a mysterious collision in nixos etc generation.
 2014-02-16 11:25:49 +01:00
Vladimír Čunát
546bd7738d xorg xkeyboard-config: update, unify with the other expression 2014-01-30 13:46:02 +01:00
Vladimír Čunát
b27477054f xorg xcb-util-wm: minor update 2014-01-30 09:12:51 +01:00
Vladimír Čunát
edb1e2996f xorg.xtrans: update to 1.3.3 
Another forgotten X lib; we had ~2 years without updating it.
 2014-01-28 12:11:35 +01:00
Vladimír Čunát
5fb366d1e5 xorg: move nouveau driver here, some updates of modules 
It seems that most of the modules is rarely used, but still.

Some of the updated modules don't build, just as they didn't before.
 2014-01-26 09:03:01 +01:00
Vladimír Čunát
7e0b78f7b2 Merge master into x-updates 
Conflicts (re-created on master, preserved):
	pkgs/development/compilers/llvm/3.3/more-memory-for-bugpoint.patch
 2014-01-23 22:52:18 +01:00
Vladimír Čunát
0a58b512cb Merge master into stdenv-updates 
Conflicts (simple):
	pkgs/development/compilers/gcc/4.8/default.nix
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/development/libraries/gmp/5.1.3.nix
	pkgs/development/libraries/gmp/5.1.x.nix
	pkgs/top-level/all-packages.nix
 2014-01-18 14:46:20 +01:00
Vladimír Čunát
fcb9e031f8 xorg.xf86-video-ati: update 7.2.0 -> 7.1.0 
Proposed by @kosmikus.
 2014-01-16 14:36:42 +01:00
Vladimír Čunát
a2c316288c Merge master into stdenv-updates 
Conflicts:
	pkgs/development/lisp-modules/stumpwm/default.nix (auto-solved)
	pkgs/top-level/all-packages.nix (trivial)
 2014-01-12 12:29:24 +01:00
Vladimír Čunát
91b7fa9169 Merge master into x-updates 2014-01-11 18:44:55 +01:00
Nixpkgs Monitor
e148a016f5 xlibs.xf86videointel: update from 2.21.9 to 2.21.15 2014-01-08 16:17:32 +01:00
Vladimír Čunát
e01af040ed xorg.libXfont: bugfix update, CVE-2013-6462 
This lib is deprecated and almost unused, but still...
 2014-01-07 17:51:22 +01:00
Mathijs Kwik
adffa870cf xf86-video-vmware: xatracker2 patch to build with mesa 10 2014-01-03 09:14:22 +01:00
Vladimír Čunát
f0419a0bfc xorg: update a few sub-packages 2013-12-30 22:12:22 +01:00
Vladimír Čunát
e740b565cf Merge master into stdenv-updates 
Conflicts (easy):
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/compilers/openjdk/default.nix
	pkgs/development/libraries/icu/default.nix
	pkgs/development/libraries/libssh/default.nix
	pkgs/development/libraries/libxslt/default.nix
	pkgs/development/tools/parsing/bison/3.x.nix
 2013-12-29 10:01:22 +01:00
Vladimír Čunát
4f8809a091 libXtst: forgotten security update 2013-12-23 18:24:24 +01:00
Vladimír Čunát
095949bdc8 xorg server: maintenance update 1.14.4 -> .5 
Also drop dri-path patch which wasn't needed for several months,
and now it no longer applied. I tested that drivers are still found.
 2013-12-14 23:17:15 +01:00
Peter Simons
c32bf83301 Merge remote-tracking branch 'origin/master' into stdenv-updates. 
Conflicts:
	pkgs/development/interpreters/perl/5.16/default.nix
	pkgs/tools/networking/curl/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-python.nix
	pkgs/top-level/release-small.nix
	pkgs/top-level/release.nix
 2013-12-04 18:33:52 +01:00
Vladimír Čunát
6e5c003f42 xorg xf86-video-nv: fix build via an upstream patch 2013-11-23 12:31:23 +01:00
Vladimír Čunát
68430cf3d7 Merge branch master into x-updates 
Conflicts (trivial, minor update on master, major here):
	pkgs/development/libraries/mesa/default.nix
 2013-11-16 20:32:44 +01:00
Vladimír Čunát
feb778507f xorg-server: remove now-upstreamed patch 
I'm sorry I completely forgot to test the previous commit.
Also remove some long unused patch.
 2013-11-06 20:07:35 +01:00
Vladimír Čunát
834af9c905 xorg-server: bugfix update 1.14.3 -> .4, including CVE 
CVE-2013-4396, otherwise a few fixes, see
http://lists.x.org/archives/xorg-announce/2013-November/002352.html
 2013-11-05 23:13:31 +01:00
Eelco Dolstra
a0e21fd1ca Mark more packages as broken 2013-11-04 21:11:00 +01:00
Mathijs Kwik
f4903d890e Merge branch 'master' into x-updates 2013-11-01 08:35:16 +01:00
Mathijs Kwik
db83d9a35b Merge branch 'master' into multiple-outputs 2013-11-01 08:29:09 +01:00
Peter Simons
6be8ad3392 Merge branch 'origin/master' into stdenv-updates. 
There was a minor conflict in 'stumpwm'. The package needs texinfo
version 4.x. At least is used to, I'm not sure whether it still does.
 2013-10-18 18:57:24 +02:00
Eelco Dolstra
aeb3169b71 xorg-server: Fix a 20 year old security bug 
CVE-2013-4396
 2013-10-16 11:58:08 +02:00