Commit graph

280 commits

Author SHA1 Message Date
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
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
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
Vladimír Čunát
74488e2b58 Merge branch 'x-updates' into stdenv-updates
Conflicts (simple):
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/mesa/default.nix
2013-09-02 15:44:57 +02:00
Vladimír Čunát
646eaa23a1 xorg.xmodmap: fix build via a Gentoo patch 2013-08-29 15:19:06 +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
Vladimír Čunát
625f40151b Merge branch 'master' into x-updates
Conflicts (a little tricky, I did some cleanup of interacting changes):
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/libraries/libpng/default.nix
	pkgs/tools/package-management/nixops/default.nix
	pkgs/top-level/all-packages.nix
2013-08-02 18:30:53 +02:00
James Cook
b5553b7cec luit: fix build with newer gcc (close #734) 2013-07-27 19:56:22 +02:00
James Cook
d8dd23e285 luit: configure --disable-selective-werror
Compiling luit failed with "implicit declaration of function
'posix_openpt'".  Following suggestion at
https://bugs.freedesktop.org/show_bug.cgi?id=47792 to fix it.
2013-07-27 19:56:19 +02:00
Bjørn Forsman
8e3a92e306 libxcb: enable XKB extension
SDDM, a display manager that I'm trying to package, depends on this.
2013-07-16 19:25:43 +02:00
Vladimír Čunát
45f7b9c319 virtualbox: make guest additions use driver according to xserver version 2013-06-23 14:16:21 +02:00
Eelco Dolstra
935a054de9 libXrender, libXvMC: Update 2013-06-14 14:53:36 +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
Vladimír Čunát
ce456ab779 Merge pull request #556 from jcumming/x-updates.130523
update Intel Graphics Stack Release
2013-05-27 02:33:48 -07: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
e3ff0f116f vmware driver: depend on mesa_drivers to find libxatracker 2013-05-23 22:52:46 +02:00
Vladimír Čunát
0b416310fc xorg-server: clear the bogus font paths 2013-04-25 16:57:36 +02:00
Vladimír Čunát
bde20f3e88 Merge branch 'master' into x-updates
Conflicts (just taken x-updates):
	pkgs/servers/x11/xorg/overrides.nix
2013-04-24 06:29:09 +00:00
Evgeny Egorochkin
5084f47e47 Add a working mirror for xcb-util-renderutil 2013-04-21 05:31:31 +03: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
Vladimír Čunát
a40e825474 xorg-server: fix CVE-1940
http://lists.x.org/archives/xorg-devel/2013-April/036014.html
It's a low-priority issue, but it should cause almost no rebuilds.
2013-04-18 12:50:26 +02:00
Jaka Hudoklin
83afbf45ca Add xf86videodummy and xf86inputvoid to xorg overrides (pixman fix) 2013-03-30 11:52:44 +01: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
Eelco Dolstra
674c51af3c Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-03-07 19:33:52 +01:00
Sander van der Burg
31c198a40e xf86-video-intel: bump to 2.20.19 2013-03-05 10:18:05 +01:00
Vladimír Čunát
26af997d41 Merge branch 'master' into stdenv-updates
Conflicts (simple):
	pkgs/applications/networking/browsers/chromium/default.nix
	pkgs/development/libraries/libsoup/default.nix
	pkgs/os-specific/linux/kernel/manual-config.nix
	pkgs/os-specific/linux/qemu-kvm/default.nix
2013-03-02 10:41:53 +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
Eelco Dolstra
ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
aszlig
bf3d3dd19b
xinit: Fix logpath and dependencies for startx.
It seems that (almost?) all NixOS users start X using the services module,
because startx seems to be broken for quite some while. And it hit me while
getting to NixOS for the first time as well, so I then decided to just use the
service module.

As I'm working with multiple X servers, writing wrappers in ~/nixpkgs/config.nix
became tedious and so I decided to fix it, hopefully without breaking anything.

The fix consists of:

 * Provide a default location for the Xorg log (~/.xorg.log - hope that's okay)
 * Expose xauth through xinit to ensure purity and "unexpected behaviour", also
   known as "simply not working", because xauth isn't in the user's environment.
 * Actually provide the X binary so it doesn't have to be passed to startx every
   time.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-12-12 12:36:19 +01:00
Eelco Dolstra
72684fb42f Remove support for the obsolete powerpc-darwin and i686-darwin platforms 2012-11-29 14:10:49 +01:00
Eelco Dolstra
5553546c21 Remove a bunch of unreferenced files
Plus a small number of obsolete packages (like old versions of qemu).
2012-11-29 13:43:37 +01:00
Lluís Batlle i Rossell
38153d9105 xf86 video openchrome: fixing the build, changing overrides. 2012-11-18 22:19:00 +01:00
Alexander Foremny
58d68427c6 Fix xf86-video-sis 2012-11-18 20:16:54 +01:00