Commit graph

564 commits

Author SHA1 Message Date
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
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
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
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 0bc5228fd2 xorg.xf86-video-intel: maintenance update 2014-12-25 10:06:49 +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
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
Vladimír Čunát dcd2590c98 xorg-server: major bump 1.14.* -> 1.16.1 (incl. deps) 2014-11-05 07:55:25 +01:00
Vladimír Čunát 9877fdb39d xorg: updates some modules; mostly minor changes 2014-10-19 20:10:19 +02: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 fb59f27a43 WIP: getting good 2014-08-27 01:14:09 +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 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 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 150102ce30 xorg.libFS: maintenance update 1.0.5 -> .6 2014-03-21 10:34:20 +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 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 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 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
Vladimír Čunát f0419a0bfc xorg: update a few sub-packages 2013-12-30 22:12: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
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
Vladimír Čunát 5bcdc3efd2 xorg server: major update 1.13.4 -> 1.14.3
- The 1.13 branch gets no updates since April,
  so I thought it's a good time to switch.
- Some xorg modules needed to be updated to build,
  but some don't have the update (probably all very obscure).
- Maybe it would be good to update the intel driver (or some others),
  I don't know.
2013-10-05 22:17:01 +02:00
Mathijs Kwik 1a55c4b89f Merge remote-tracking branch 'official/master' into multiple-outputs
Conflicts:
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/libpng/default.nix
	pkgs/development/libraries/pango/default.nix
	pkgs/tools/typesetting/tex/texlive/default.nix
	pkgs/top-level/all-packages.nix
2013-09-11 10:53:31 +02:00
Eelco Dolstra 7c8518c194 Cleanup 2013-08-23 10:02:07 +02:00
Vladimír Čunát daf9c75ef4 xorg: bugfix updates of some libs
Now using stable release of libXi, instead of the git version we had due
to security stuff.
2013-08-03 15:38:46 +02:00
Eelco Dolstra cab211de88 xorg: Split some more packages 2013-06-26 14:27:12 +02:00
Eelco Dolstra 552fd3d599 Merge remote-tracking branch 'origin/master' into multiple-outputs
Conflicts:
	pkgs/development/libraries/atk/default.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/gmime/default.nix
	pkgs/development/libraries/pango/default.nix
	pkgs/servers/x11/xorg/default.nix
	pkgs/top-level/all-packages.nix
2013-06-25 18:42:56 +02:00
Eelco Dolstra 935a054de9 libXrender, libXvMC: Update 2013-06-14 14:53:36 +02:00
Eelco Dolstra 32d02132c2 libxcb: Put docs/manpages in separate outputs 2013-06-11 13:26:27 +02:00
Eelco Dolstra 99b88cfb53 Merge remote-tracking branch 'origin/master' into multiple-outputs
Conflicts:
	pkgs/development/libraries/acl/default.nix
	pkgs/development/libraries/atk/2.6.x.nix
	pkgs/development/libraries/attr/default.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/glib/2.34.x.nix
	pkgs/development/libraries/gtk+/2.24.x.nix
	pkgs/development/libraries/libtiff/default.nix
	pkgs/development/libraries/openssl/default.nix
	pkgs/development/libraries/pango/1.30.x.nix
	pkgs/misc/cups/default.nix
	pkgs/os-specific/linux/util-linux/default.nix
	pkgs/servers/x11/xorg/builder.sh
	pkgs/servers/x11/xorg/default.nix
	pkgs/top-level/all-packages.nix
2013-06-09 00:41:27 +02:00
Vladimír Čunát ba6c764a51 xorg: intel driver bugfix update 2013-06-08 15:40:39 +00:00
Vladimír Čunát 619b024600 X security updates
http://www.x.org/wiki/Development/Security/Advisory-2013-05-23

Three libs not released yet and without commit activity for around two
weeks, so I took the current master heads.
2013-06-05 21:24:19 +02:00
Vladimír Čunát 466ce40f0f xorg.xf86videointel: regression-fix update
http://lists.freedesktop.org/archives/intel-gfx/2013-May/028277.html
2013-05-27 20:43:02 +02:00
Vladimír Čunát e7b61ea77d xorg.xf86videointel: fix bad hash (from #556) 2013-05-27 12:24:04 +02:00
Jack Cummings fc8f474a9c fix url and hash for intel x driver 2013-05-24 11:56:48 -07:00
Jack Cummings 800c467592 xf86-video-intel-2.21.7 2013-05-24 09:50:49 -07:00
Jack Cummings 253ee6f6a3 update to 2013Q1 Intel Graphics Stack Release
This changeset updates to all of the versions in
https://01.org/linuxgraphics/downloads/2013/2013q1-intel-graphics-stack-release
(but does not regression from newer version).

I tried generating 'servers/x11/xorg/default.nix' with the perl script,
but unrelated packges changed, so I just manually updated the file.
2013-05-23 16:25:21 -07:00
Vladimír Čunát ec3965d8d0 Revert Merge x-updates into master due to mesa bloat
See #490 discussion.

This reverts commit 1278859d31, reversing
changes made to 0c020c98f9.

Conflicts:
	pkgs/desktops/xfce/core/xfce4-session.nix (take master)
	pkgs/lib/misc.nix (auto)
2013-05-09 14:03:35 +02:00
Vladimír Čunát c859a46712 xorg: update xorgserver to 1.13.4, and more
- update some modules to work with the newer server
- fix many other modules via overrides
- huge cleanup in overrides via better propagation
  and pixman include flattening
- URLs of XCB stuff have been moved
2013-04-18 21:33:17 +02:00
Vladimír Čunát 7716b78fc7 pixman: use pixman_cairo for xorg, flatten its includes 2013-04-18 21:31:56 +02:00
Shea Levy fc3994074e Merge branch 'fixVmwareFix' of git://github.com/Davorak/nixpkgs
The original fix modified a generated file instead of the
manually-maintained overrides file. Checked by inspection.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-08 18:19:02 -05:00
Sander van der Burg 31c198a40e xf86-video-intel: bump to 2.20.19 2013-03-05 10:18:05 +01:00
Patrick Wheeler 8cdfd46d96 Fix xf86vmware fix
Moved xf86vmware fix into the overrides.nix file where and not in the
generated default.nix.
2013-03-02 01:08:33 +01:00
Patrick John Wheeler d5ec021cdb Making xlibs.xf86videovmware build 2013-02-27 06:44:41 +01:00
James Cook 01d749f0aa Rolled back xf86-video-ati to 6.14.4.
6.14.6 requires a newer version of libdrm, which in turn requires a newer
version of mesa.  I cheated and edited the generated default.nix file instead of
re-generating it, since generate-expr-from-tarballs.pl complained of a collision
between two tarballs providing different versions of xorg-server.
2012-10-26 14:03:07 +02:00
Michael Raskin 0e930058ae Update TigerVNC to SVN checkout that at least builds.. 2012-10-18 20:49:22 +04:00
Eelco Dolstra 80fa05f1f5 xf86-video-intel: Update to 2.20.10 2012-10-15 12:09:28 -04:00
Eelco Dolstra 3b968053d4 Fix font-schumacher-misc build
http://hydra.nixos.org/build/3157818
2012-10-15 11:52:11 -04:00
Eelco Dolstra 90d9f8ec18 Update xcb-proto and libxcb 2012-10-08 15:15:05 -04:00
Eelco Dolstra 281fa6f85a Revert "xorg-server: Boldly update to 1.13.0"
This reverts commit 2f2426a02f89458451de0570ee6f0bf1442a3619.

xf86-video-intel requires a newer version of libdrm, which in turn
breaks mesa.  So stick to 1.12.4 until this gets sorted out.
2012-09-28 17:44:38 -04:00
Eelco Dolstra 1b807c2acd xorg-server: Boldly update to 1.13.0 2012-09-28 17:44:38 -04:00
Eelco Dolstra 2fed9dfbc5 Some X.org updates (include xorg-server to 1.12.4) 2012-09-26 16:11:26 -04:00
Eelco Dolstra 61129e1ee9 Split some GTK/X11-related packages
The closure of the Pan newsreader is now down from 344 MiB to 195 MiB.
2012-08-26 22:53:19 -04:00
Shea Levy 71e0a3fb93 x.org: Update to 7.7 2012-07-14 14:33:58 -04:00
Eelco Dolstra 932d5bee54 * X.org 7.7 RC1. Note that xorg-server doesn't build yet.
svn path=/nixpkgs/branches/x-updates/; revision=34147
2012-05-16 22:06:27 +00:00
Arie Middelkoop b4d5957ac4 Version bumb of 'xf86-synaptics' module, which fixes a cpu-stealing bug when using syndaemon.
svn path=/nixpkgs/trunk/; revision=32035
2012-02-05 00:43:54 +00:00
Peter Simons 8045c6ebe2 dri-proto: upgraded to version 2.6 so that we can use intel 2.17 driver
svn path=/nixpkgs/trunk/; revision=31773
2012-01-21 18:47:40 +00:00
Peter Simons 5ebdf058cc intel X driver: upgraded to fix display glitches on newer chips
at least 2 nixos users were affected by a graphics bug that got fixed
in 2.15.
Officially 2.15 was meant for a newer xorg server, libdrm, mesa and all, but
I've been running with this for over a month with no issues (used
compositing desktop, opengl and hd video).

I know 2.17 is in the repo, but it doesn't builde (missing deps I
think).

svn path=/nixpkgs/trunk/; revision=31661
2012-01-18 20:38:30 +00:00
Peter Simons fedda96bee xf86-video-ati: updated to version 6.14.3
svn path=/nixpkgs/trunk/; revision=31471
2012-01-10 20:12:25 +00:00
Florian Friesdorf d2e8c37e41 default.nix now fully generated again
with additional xf86-video-intel-2.17.0 and what looks like a fixed
xf86-video-intel-2.14.901.

svn path=/nixpkgs/trunk/; revision=31185
2011-12-31 06:07:37 +00:00
Florian Friesdorf f6090f6bba reproduced my previous manual changes through generation of default.nix
svn path=/nixpkgs/trunk/; revision=31182
2011-12-31 06:07:28 +00:00
Florian Friesdorf 44ef26c896 xlsclients-1.1.2
svn path=/nixpkgs/trunk/; revision=31176
2011-12-31 04:30:46 +00:00
Florian Friesdorf 251d42d03f xcb-util-0.3.8 (+image|keysyms|renderutil|wm)
this might break things but makes awesome-3.4.11 happy

svn path=/nixpkgs/trunk/; revision=31171
2011-12-31 04:05:50 +00:00
Peter Simons 1b53d1f22d xorg: updated xf86-video-ati to version 6.14.2
svn path=/nixpkgs/trunk/; revision=27776
2011-07-14 12:22:49 +00:00
Michael Raskin 04d5aed6d0 Add intel driver prerelease
svn path=/nixpkgs/trunk/; revision=26418
2011-03-18 09:10:53 +00:00
Eelco Dolstra 5382f8e934 * xorg-server updated to 1.9.5.
svn path=/nixpkgs/trunk/; revision=26417
2011-03-18 09:07:46 +00:00
Eelco Dolstra 337e26fea0 * xkbcomp 1.2.1.
svn path=/nixpkgs/branches/x-updates/; revision=25906
2011-02-11 15:32:08 +00:00
Eelco Dolstra 0b8efb0cbb * X.org 7.6.
svn path=/nixpkgs/branches/x-updates/; revision=25818
2011-02-08 17:39:28 +00:00
Michael Raskin e59ddf7bcb Update Cairo, Pixman; update FF4beta - still broken, cannot pass fresh cairo correctly to it yet
svn path=/nixpkgs/trunk/; revision=24714
2010-11-16 21:05:54 +00:00
Michael Raskin fada13658f Fix xf86inputsynaptics
svn path=/nixpkgs/trunk/; revision=24274
2010-10-14 10:51:52 +00:00
Michael Raskin 8a191cddd8 Fix include paths for xf86inputsynaptics
svn path=/nixpkgs/trunk/; revision=24259
2010-10-13 11:43:59 +00:00
Eelco Dolstra 4788fc9298 * Some X.org updates.
svn path=/nixpkgs/trunk/; revision=24252
2010-10-12 21:52:57 +00:00
Eelco Dolstra f3677bef0d * Synaptics driver 1.2.2.
svn path=/nixpkgs/trunk/; revision=23091
2010-08-10 14:06:03 +00:00
Eelco Dolstra e6ff6558d6 * xrandr 1.3.3.
svn path=/nixpkgs/branches/x-updates/; revision=22727
2010-07-25 09:14:12 +00:00
Eelco Dolstra df7091a4a1 * libpciaccess 0.12.0.
svn path=/nixpkgs/branches/x-updates/; revision=22684
2010-07-21 11:29:26 +00:00
Eelco Dolstra 78a5abdf85 * Updated the X.org server to 1.8.2. Note that it no longer depends
on HAL but instead uses udev to autoconfigure input devices.  We'll
  have to update the NixOS X server module accordingly, I guess.  See
  https://fedoraproject.org/wiki/Input_device_configuration.
* Updated Mesa to 7.8.2.

svn path=/nixpkgs/branches/x-updates/; revision=22681
2010-07-20 19:24:21 +00:00
Eelco Dolstra cb11b171d1 svn path=/nixpkgs/branches/x-updates/; revision=22671 2010-07-20 07:58:36 +00:00
Eelco Dolstra 0d225fb86a * Support *.pc.in files that are not in the top directory of the package.
svn path=/nixpkgs/branches/x-updates/; revision=22659
2010-07-19 08:59:05 +00:00
Eelco Dolstra 662600c241 * Updated various X.org packages, including libX11.
svn path=/nixpkgs/branches/x-updates/; revision=22632
2010-07-18 21:51:13 +00:00
Lluís Batlle i Rossell 93d2b4b7bf Updating the intel x11 video drivers.
(I know I modified an automatically generated file, but I don't imagine
well the consequences of this)

svn path=/nixpkgs/trunk/; revision=21248
2010-04-22 20:12:26 +00:00
Lluís Batlle i Rossell 8807722e17 Adding xdm
svn path=/nixpkgs/trunk/; revision=20947
2010-04-05 14:09:22 +00:00
Marc Weber f57a5d2273 libXi: build man pages
svn path=/nixpkgs/trunk/; revision=20089
2010-02-18 01:49:53 +00:00
Eelco Dolstra b1fb08569f * X.org server updated to 1.7.5.
svn path=/nixpkgs/trunk/; revision=20050
2010-02-16 13:34:30 +00:00
Eelco Dolstra 78718b5a3d * xorg-server updated to 1.7.4, along with some other X.org packages.
svn path=/nixpkgs/trunk/; revision=19387
2010-01-13 11:51:45 +00:00
Eelco Dolstra 3535899507 * Added xinit.
svn path=/nixpkgs/trunk/; revision=19236
2010-01-05 14:49:23 +00:00
Eelco Dolstra bf7a38f3ff * X.org server 1.7.3.
svn path=/nixpkgs/trunk/; revision=18792
2009-12-03 15:51:40 +00:00
Eelco Dolstra 390548d708 * Fix the font packages. They need a --with-fontrootdir flag now.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18043
2009-10-30 08:20:03 +00:00
Eelco Dolstra 05ff927d83 * Bring back libXxf86misc and xf86miscproto. These were removed from
X.org, but some packages still need them.

svn path=/nixpkgs/branches/xorg-7.5/; revision=18038
2009-10-29 18:25:53 +00:00
Eelco Dolstra 28d718aceb * X.org 7.5.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18034
2009-10-29 17:56:10 +00:00
Peter Simons b9b57c6149 Move libXaw fix from default.nix to overrides.nix.
svn path=/nixpkgs/trunk/; revision=17620
2009-10-02 18:03:23 +00:00
Peter Simons 1570ccf3cf libXaw: fixed broken installation in MacOS X
See comments in file for further details.

svn path=/nixpkgs/trunk/; revision=17609
2009-10-02 13:57:21 +00:00
Eelco Dolstra 317fd0edd5 * Revert the manual changes to default.nix
* Build libSM with the system libuuid on Darwin (in such a way that we
  don't get a rebuild on all other platforms).

svn path=/nixpkgs/trunk/; revision=17606
2009-10-02 13:06:35 +00:00
Peter Simons f2c6df33ba pkgs/servers/x11/xorg/default.nix: strip trailing white-space
svn path=/nixpkgs/trunk/; revision=17601
2009-10-02 12:45:04 +00:00
Peter Simons abe32ecf99 libSM: use native libuuid when building on MacOS X
On Linux, <uuid/uuid.h> and related functions are provided by the util-linux-ng
package, which doesn't build on other operating systems, such as MacOS X. That
platform provides libuuid as part of the system. Hence, to build libSM on
MacOS, we define (empty) variables LIBUUID_CFLAGS and LIBUUID_CFLAGS. Those
settings disable ./configure's attempt to detect libuuid with pkgconfig --
which would fail.

svn path=/nixpkgs/trunk/; revision=17600
2009-10-02 12:44:59 +00:00
Eelco Dolstra 645c91708f * Updated some drivers.
svn path=/nixpkgs/trunk/; revision=16002
2009-06-18 17:20:01 +00:00
Eelco Dolstra 85978b1efa * e2fsprogs updated to 1.41.6. Also keep the previous version around
so that we don't have to rebuild everything that depends on libuuid
  (such as all X programs).

svn path=/nixpkgs/trunk/; revision=15964
2009-06-15 16:45:48 +00:00
Lluís Batlle i Rossell 7e53d1062f Adding mesa to compile the openchrome driver.
svn path=/nixpkgs/trunk/; revision=15386
2009-04-28 22:15:44 +00:00
Eelco Dolstra c718ec217b * X.org generator: specify overrides in a Nix expression rather than
in the generator script.  This makes it easier to change the X.org
  packages.
* Added xfs, twm.

svn path=/nixpkgs/trunk/; revision=15375
2009-04-28 13:58:35 +00:00
Lluís Batlle i Rossell 44f19bc1b4 Making the latest xorg cope well with xkbcomp.
svn path=/nixpkgs/trunk/; revision=15347
2009-04-28 08:05:28 +00:00
Eelco Dolstra 5f9014cc7f * Updated evdev to the latest version. Otherwise, the arrow keys and
others break under KDE and Gnome unless you set the keyboard type to
  evdev (e.g. in the KDE System Settings).  See
  
    http://wiki.archlinux.org/index.php/Xorg_input_hotplugging#Using_the_evdev_driver_kills_my_arrow_keys.2C_printscreen_is_triggered_instead

  TODO: update this in the X.org generator.

svn path=/nixpkgs/trunk/; revision=15343
2009-04-27 23:06:02 +00:00
Marc Weber 3c05ea1a4b readding and updating xorg.xfs. It's required to run tightvnc
1.0.8 is latest version

svn path=/nixpkgs/trunk/; revision=15329
2009-04-27 01:44:30 +00:00
Eelco Dolstra 0296fabb9e * Added dri2proto to the list of tarballs and reran
the generator.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15201
2009-04-20 21:59:42 +00:00
Lluís Batlle i Rossell 15f1feb702 Fixing mesa and xorgserver
svn path=/nixpkgs/branches/stdenv-updates/; revision=15199
2009-04-20 18:46:32 +00:00
Eelco Dolstra 8f12b8abf9 * Fixed libXext; it needs newer headers.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15197
2009-04-20 18:09:37 +00:00
Eelco Dolstra 077b0157a0 * Updated the generator to handle some missing dependencies.
Also updated some X.org packages (notably xorg-server)
  as well as freetype.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15191
2009-04-20 16:02:50 +00:00
Eelco Dolstra 406cacbb87 * printproto has a dependency on libXau which our generator
doesn't see for some reason.  Will have to fix the 
  generator.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15187
2009-04-20 14:37:05 +00:00
Eelco Dolstra c584bb878a * Sync with trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=13903
2009-01-29 16:33:02 +00:00
Ludovic Courtès 05e01abc75 Xorg Pixman 0.13.2.
svn path=/nixpkgs/trunk/; revision=13834
2009-01-24 21:29:57 +00:00
Eelco Dolstra c1579d2e78 * stdenv branch: synced with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=13785
2009-01-16 10:59:27 +00:00
Peter Simons 6fb297513a Committing Lluís Batlle's submissions from mailing list posting
<45219fb00901110456i6f21db35tbd1894eaea2146ff@mail.gmail.com>:

 * nixpkgs-ccrypt-1.7-new.patch
 * nixpkgs-cmake-add-ccmake.patch
 * nixpkgs-cpufrequtils-005-new.patch
 * nixpkgs-dwm-5.1-fix.patch
 * nixpkgs-freeimage-3.11.0-new.patch
 * nixpkgs-proxychains-3.1-new.patch
 * nixpkgs-psi-to-0.12.patch
 * nixpkgs-skype-to-2.0.0.72.patch
 * nixpkgs-truecrypt-6.1a-fix.patch
 * nixpkgs-vxl-1.11.0-new.patch
 * nixpkgs-xkb-popular-esperanto-symbols.patch
 * nixpkgs-xorg-via-video-fix.patch

svn path=/nixpkgs/trunk/; revision=13751
2009-01-12 21:12:07 +00:00
Michael Raskin b38742e0c2 Adding a more stable X.org ati driver version (more stable for dualview)
svn path=/nixpkgs/trunk/; revision=13108
2008-10-24 05:13:23 +00:00
Eelco Dolstra c9c2045610 * Cairo: build with XCB support.
* Fixed libXp.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13069
2008-10-14 14:46:56 +00:00
Eelco Dolstra dbc0d399bf * Add some more packages that have been apparently deprecated from X.org.
svn path=/nixpkgs/branches/stdenv-updates/; revision=13043
2008-10-10 08:55:45 +00:00
Eelco Dolstra 0e68610feb * libXp has been removed from X.org 7.4 but some packages still need it.
svn path=/nixpkgs/branches/stdenv-updates/; revision=13032
2008-10-09 16:24:51 +00:00
Eelco Dolstra 5eef7df51d * intltool: deleted redundant copy (it's already in the Gnome Nix
expressions).
* Fixed xkbcomp: it no longer found the keyboard definitions since it
  disregards the -R option passed by the X server (it chdirs to the -R
  path, but "." has been removed from the xkbcomp search path in
  xkbcomp 1.0.5).  Build it with /etc/X11/xkb as its default
  location.  This is less pure but it does allow for updating
  xkeyboard-config in a running server.
* xkeyboard-config: updated to 1.4.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13018
2008-10-09 12:12:58 +00:00
Eelco Dolstra 9fa8276ae5 * X.org 7.4.
svn path=/nixpkgs/branches/stdenv-updates/; revision=13006
2008-10-08 17:02:48 +00:00
Michael Raskin e1f4d60dca Added fresh radeonhd to X.org expression.
svn path=/nixpkgs/trunk/; revision=12205
2008-06-28 07:10:51 +00:00
Michael Raskin c750b3e602 Added dependencies to build ATi driver..
svn path=/nixpkgs/trunk/; revision=12113
2008-06-16 06:27:21 +00:00
Michael Raskin 7c840c0f0f Fixing evdev X11 input driver build
svn path=/nixpkgs/trunk/; revision=12103
2008-06-15 16:55:27 +00:00
Michael Raskin f7ccbf7c80 Update X.org server: security fix
svn path=/nixpkgs/trunk/; revision=12082
2008-06-13 17:24:14 +00:00
Eelco Dolstra fc5eebdf8b * Merged the stdenv branch
(https://svn.nixos.org/repos/nix/nixpkgs/branches/stdenv-updates
  -r10966:12061).

svn path=/nixpkgs/trunk/; revision=12073
2008-06-13 11:46:39 +00:00
Eelco Dolstra 319feed942 * Latest Cairo / GTK.
svn path=/nixpkgs/branches/stdenv-updates/; revision=11692
2008-04-23 10:48:10 +00:00
Michael Raskin 6f35c8fdf8 Added option for newer ATi drivers in X.org
svn path=/nixpkgs/trunk/; revision=11558
2008-04-11 09:24:16 +00:00
Yury G. Kudryashov c0496c0413 X.Org: added dbus, hal; removed unused gettext
svn path=/nixpkgs/branches/stdenv-updates/; revision=10467
2008-02-02 20:42:55 +00:00
Yury G. Kudryashov a7703662a4 Merged with trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=10145
2008-01-15 00:55:21 +00:00
Yury G. Kudryashov e43ce8f723 xorg: deault.nix and generate-expr-from-tarballs.pl synced
svn path=/nixpkgs/branches/stdenv-updates/; revision=9761
2007-11-19 22:29:08 +00:00
Michael Raskin f38d6d0f15 Fixed a LED bug; patch taken from bugs.freedesktop.org
svn path=/nixpkgs/trunk/; revision=9622
2007-11-10 17:32:55 +00:00
Michael Raskin 43b208bbb9 Fixed synaptics; Added GOCR (not that it is a good OCR); reverted MarcWeber's update to setup-new-2.sh (he has no time to use it in nearest future; later I hope it will be irrelevant)
svn path=/nixpkgs/trunk/; revision=9613
2007-11-09 13:54:02 +00:00
Eelco Dolstra 806ff74e5a * Add the i810 driver back in (don't know yet if it still works).
svn path=/nixpkgs/trunk/; revision=9594
2007-11-06 11:49:13 +00:00
Eelco Dolstra b7f1b56b18 * X11R7.3.
svn path=/nixpkgs/trunk/; revision=9592
2007-11-05 23:59:55 +00:00
Michael Raskin c12137d608 Added some symlinks to make xkbrules work in xorg.conf for switching keymaps.
svn path=/nixpkgs/trunk/; revision=9031
2007-08-02 21:30:33 +00:00
Yury G. Kudryashov 40657fbece * ncurses: added symlinks for bynary packages linked against libncurses. Tested
with ghc. I will add 'unicode' option next check in (for cygwin).
* pidgin:  Got rid of builder.sh, added ncurses to the dependencies, so it builds
           finch.
* xorg:    Added glproto and mesaHeaders to xf86videosis dependencies. Now it
           compiles.
* pwgen:   Added.
* device-mapper: Version bump. Added 'static' option for use in initrd.
* lvm2:          Version bump. Added 'static' option for use in initrd.

svn path=/nixpkgs/trunk/; revision=8923
2007-06-28 09:53:12 +00:00
Michael Raskin 42f841bcab Added some descriptions.
svn path=/nixpkgs/trunk/; revision=8920
2007-06-26 11:49:45 +00:00
Eelco Dolstra 50cc2acd23 * xorg-server 1.3.0, xf86-video-intel 2.0.0.
svn path=/nixpkgs/trunk/; revision=8616
2007-04-26 18:36:01 +00:00
Eelco Dolstra 1971bb6829 * X.org server 1.2.99.905.
svn path=/nixpkgs/trunk/; revision=8595
2007-04-18 15:46:58 +00:00
Eelco Dolstra a29dbccc0f * Added the latest Intel video driver.
svn path=/nixpkgs/trunk/; revision=8594
2007-04-18 14:55:43 +00:00
Eelco Dolstra c214c7525d * setxkbmap: add a symlink to xkeyboard-config so that it can find the
rules files.  Maybe this should be done through an environment variable.

svn path=/nixpkgs/trunk/; revision=8496
2007-03-29 23:02:07 +00:00
Eelco Dolstra fc483e0d57 * Allow the path to xkbcomp to specified in an environment variable.
The X server by default looks for it under its own prefix, which
  isn't right.  Not being able to run xkbcomp causes the Xkb keyboard
  extension to fail (which incidentally is also the reason why
  Ctrl-Alt-Fn didn't work).

svn path=/nixpkgs/trunk/; revision=8494
2007-03-29 22:57:56 +00:00
Martin Bravenboer fb6d590e50 xorg libxcb: patch to disable assert that stops Java GUI apps from
working (the actual bug is in Java).


svn path=/nixpkgs/trunk/; revision=8189
2007-03-05 18:28:49 +00:00
Eelco Dolstra f6b15579b8 svn path=/nixpkgs/trunk/; revision=8065 2007-02-27 00:07:07 +00:00
Eelco Dolstra 8db3dbaf1a * Patched the X server to get the path of the DRI driver from the
environment, rather than relative to the X server's prefix.

svn path=/nixpkgs/trunk/; revision=8064
2007-02-26 23:50:03 +00:00
Eelco Dolstra 556cc5ed2f * Doh.
svn path=/nixpkgs/trunk/; revision=8063
2007-02-26 23:37:41 +00:00
Eelco Dolstra ba443448e8 * Build the i810 driver. Only depend on the Mesa headers, not all of Mesa.
svn path=/nixpkgs/trunk/; revision=8060
2007-02-26 23:10:25 +00:00
Eelco Dolstra 9f173879e3 * Don't call fc-cache (it tries to write in fontconfig's prefix).
svn path=/nixpkgs/trunk/; revision=8056
2007-02-26 21:04:36 +00:00
Eelco Dolstra 24399a3f49 * Dependencies on fontconfig.
svn path=/nixpkgs/trunk/; revision=8055
2007-02-26 20:46:56 +00:00
Eelco Dolstra cd10e285d2 * Pass the Mesa source tree.
svn path=/nixpkgs/trunk/; revision=8052
2007-02-26 17:05:27 +00:00
Eelco Dolstra 3e19819c28 * X11R7.2 and associated updates.
svn path=/nixpkgs/trunk/; revision=8049
2007-02-26 16:32:27 +00:00
Eelco Dolstra 9a457db61d * Some font hackery.
svn path=/nixpkgs/trunk/; revision=8042
2007-02-25 15:54:15 +00:00
Eelco Dolstra b3b1daf131 * Add Bitstream Vera.
svn path=/nixpkgs/trunk/; revision=7751
2007-01-22 17:11:08 +00:00
Eelco Dolstra aa0918867b * Get some TTF fonts to work. Must merge with the generator.
svn path=/nixpkgs/trunk/; revision=7708
2007-01-17 17:18:14 +00:00
Eelco Dolstra 157b6cd18d * Missing dependencies. Will merge into the generator later.
svn path=/nixpkgs/trunk/; revision=7166
2006-11-28 22:28:27 +00:00
Eelco Dolstra ad897a7c96 * Update more URLs.
svn path=/nixpkgs/trunk/; revision=6713
2006-10-12 14:53:45 +00:00
Eelco Dolstra 1442e8ec22 * Copy a bunch of files to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=6711
2006-10-12 13:50:54 +00:00
Eelco Dolstra 4c7b042e32 * Doh!
svn path=/nixpkgs/trunk/; revision=5521
2006-06-24 20:44:19 +00:00
Eelco Dolstra 829d0d96ca * X11R7.1 (I hope - the release is incomplete...).
svn path=/nixpkgs/trunk/; revision=5520
2006-06-24 20:31:10 +00:00
Martin Bravenboer 179e41fe9d Fix
svn path=/nixpkgs/trunk/; revision=5294
2006-05-11 08:28:03 +00:00
Eelco Dolstra 3389f4bc36 * Copy lots of files to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=4623
2006-01-30 16:04:03 +00:00
Eelco Dolstra 79b3528567 * OpenGL dependency in the i810 driver.
svn path=/nixpkgs/trunk/; revision=4571
2006-01-17 14:11:43 +00:00
Eelco Dolstra 57adf342b4 * Detect even more dependencies.
svn path=/nixpkgs/trunk/; revision=4568
2006-01-17 12:41:27 +00:00
Eelco Dolstra 43a679bab7 * More dependencies.
svn path=/nixpkgs/trunk/; revision=4562
2006-01-16 15:07:03 +00:00
Eelco Dolstra b243aa0f12 * Even more zlib dependencies.
svn path=/nixpkgs/trunk/; revision=4558
2006-01-16 12:59:09 +00:00
Eelco Dolstra 830331445d * Some libraries need zlib.
svn path=/nixpkgs/trunk/; revision=4557
2006-01-16 12:46:20 +00:00
Eelco Dolstra 7dba8848ed * Fix a horrible in imake: its results depend on whether a C compiler
exists in one of a fixed set of paths (e.g., /usr/bin/cc).  For
  instance, on a system without /usr/bin/cc the variable DependCmd
  would evaluate to "makedepend", and on a system with it, to
  "gccmakedep".

  Solution: just use "gcc" always.  Also disabled some shitty code to
  detect the current Linux distribution (by probing for files like
  /etc/SuSE-release). 

svn path=/nixpkgs/trunk/; revision=4534
2006-01-11 00:21:52 +00:00
Eelco Dolstra 94517a614e * Export the input attributes.
svn path=/nixpkgs/trunk/; revision=4533
2006-01-09 21:39:47 +00:00
Eelco Dolstra 2346c0061b * Get imake to build again (xmkmf is gone).
svn path=/nixpkgs/trunk/; revision=4530
2006-01-09 19:34:26 +00:00
Eelco Dolstra ceb9b654ed * Discover dependencies on libXaw.
* Handle commas in *.pc files.

svn path=/nixpkgs/trunk/; revision=4525
2006-01-09 12:49:21 +00:00
Eelco Dolstra ebc93faa32 * Automatically propagate pkgconfig "Requires" fields so I don't have
to figure out the propagatedBuildInputs.

svn path=/nixpkgs/trunk/; revision=4521
2006-01-08 22:09:44 +00:00
Eelco Dolstra c45d0521bd * Produce the right name attribute.
svn path=/nixpkgs/trunk/; revision=4520
2006-01-08 21:19:56 +00:00
Eelco Dolstra 20d0e31cd0 * Start update to X11R7.0.
svn path=/nixpkgs/trunk/; revision=4519
2006-01-08 20:32:34 +00:00
Eelco Dolstra ea95a0509e * Start the switch to the new X libraries. It's still conditional:
set `useOldXLibs' to `false' in all-packages-generic.nix to use
  them.
* Added Xaw3d.
* Added Xaw3d support to Emacs.

svn path=/nixpkgs/trunk/; revision=4263
2005-11-12 17:05:51 +00:00
Eelco Dolstra e0a8574dc8 * Get the VESA driver to build.
svn path=/nixpkgs/trunk/; revision=4200
2005-11-03 14:10:57 +00:00
Eelco Dolstra 3f2c3a6066 * More fixes to get a basic X server running (keyboard, mouse, i810
graphics).

svn path=/nixpkgs/trunk/; revision=4198
2005-11-02 21:49:08 +00:00
Eelco Dolstra a21e96548a * Add missing dependencies to the modular X components. This is a
quick hack; the actual packages should be fixed instead.

svn path=/nixpkgs/trunk/; revision=4197
2005-11-02 20:59:25 +00:00
Eelco Dolstra 4e50d07bdf * Added the generated Nix expression for the modular X.org tree. It
contains derivations for the 279 packages in that tree.  (Biggest
  Nix expression ever!)

svn path=/nixpkgs/trunk/; revision=4193
2005-11-02 15:47:56 +00:00