3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

398 commits

Author SHA1 Message Date
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 30f31c9afc Merge 'master' into staging
(relatively simple conflicts)
2015-04-26 22:52:08 +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