alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
64738 commits 217 branches 121 tags 4.5 GiB
Commit graph

373 commits

Author SHA1 Message Date
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
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 47d3d58ec6 Fix xwd build 2012-10-19 13:50:02 +04:00
Michael Raskin 0e930058ae Update TigerVNC to SVN checkout that at least builds.. 2012-10-18 20:49:22 +04:00
Eelco Dolstra 31212a0a95 Fix font-cursor-misc build 2012-10-15 13:14:12 -04:00
Peter Simons 87c5696996 pkgs/servers/x11/xorg/overrides.nix: correctly patch path to mkfontscale into mkfontdir wrapper script 2012-10-15 19:06:59 +02: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
Peter Simons 70334f04ee pkgs/servers/x11/xorg/overrides.nix: xinput needs libXrender to build 2012-10-14 20:28:00 +02: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 4a6a87eedc Fix builds depending on libXft 2012-09-27 12:38:48 -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 d5758c99a3 Merge remote-tracking branch 'origin/master' into x-updates 
Conflicts:
	pkgs/misc/maven/maven-1.0.nix
	pkgs/os-specific/linux/xf86-input-wacom/default.nix
 2012-09-26 14:51:51 -04:00
Eelco Dolstra f590586775 xorg-server: Enable the SECURITY extension 
This allows "ssh -X" to do the right thing.
 2012-09-18 17:10:36 -04:00
Shea Levy 5315a0bb6d xf86-input-keyboard: Needs pixman 2012-07-15 22:56:49 -04:00
Shea Levy 27339f2ad8 xf86-input-mouse: Needs pixman 2012-07-15 22:55:12 -04:00
Shea Levy 4f01e68ff8 xf86-input-synaptics: Needs mtdev and pixman 2012-07-15 22:53:43 -04:00
Shea Levy d382822803 xf86-video-ati: Needs pixman 2012-07-15 22:48:28 -04:00
Shea Levy ccceaba50a xf86-video-cirrus: Needs pixman 2012-07-15 22:47:27 -04:00
Shea Levy 08e7a18a2c xf86-video-nv: Needs pixman 2012-07-15 22:45:57 -04:00
Shea Levy c95e6d5dc4 xf86-video-vesa: Need pixman 2012-07-15 22:44:11 -04:00
Shea Levy a55bcacbe2 xorg-video-unichrome: Update git url, fix build with new xorg 2012-07-15 22:40:52 -04:00
Shea Levy f0b7c9813b xorg.ev: Needs libXrender 2012-07-15 03:36:48 -04:00
Shea Levy 65ac9694c7 xorg: evdev and fbdev need pixman 2012-07-14 16:26:22 -04:00
Shea Levy fdf6f17a1b x11: Some fonts need mkfontscale 
There may be others, these are just the ones that needed it for my configuration to build
 2012-07-14 16:16:31 -04:00
Shea Levy d6d6b623c9 xorgserver: Update xkbcomp-path patch 
_XkbDupString was migrated to Xstrdup
 2012-07-14 15:13:08 -04:00
Shea Levy 13c5b75b80 xorgserver: Add needed deps 2012-07-14 15:07:36 -04:00
Shea Levy bb469d5e25 xorgserver: Update dir path patch 2012-07-14 15:03:36 -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
Lluís Batlle i Rossell 6a838a4ba1 Making x11perf build. 
svn path=/nixpkgs/trunk/; revision=33651
 2012-04-06 18:33:51 +00:00
Lluís Batlle i Rossell b24bab3873 Getting a much newer version of the openchrome X driver 
svn path=/nixpkgs/trunk/; revision=33405
 2012-03-25 13:53:07 +00:00
Yury G. Kudryashov 215a07c1a9 svn merge ^/nixpkgs/trunk 
Merge conflicts:
* unzip (almost trivial)
* dvswitch (trivial)
* gmp (copied result of `git merge`)

The last item introduced gmp-5.0.3, thus full rebuild.
+ensureDir->mkdir -p in TeX packages was catched by git but not svn.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
 2012-02-06 23:03:12 +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
Yury G. Kudryashov 5b132f6e96 svn merge ^/nixpkgs/trunk 
Conflicts: cups, all-packages.nix (gcc45_debug)

svn path=/nixpkgs/branches/stdenv-updates/; revision=31863
 2012-01-26 15:27:03 +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
Yury G. Kudryashov 84c0185038 svn merge ^/nixpkgs/trunk, one simple conflict in jruby 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31721
 2012-01-19 21:31:51 +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
Eelco Dolstra c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
 2012-01-18 20:16:00 +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 2e31e7293a moved parts of extra.list back to tarballs-7.6.list 
also added an short description about them to generate-expr-from-tarballs.pl

svn path=/nixpkgs/trunk/; revision=31189
 2011-12-31 15:37:51 +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 1745900396 add xf86-video-intel-2.14.901 (and while at it 2.17.0) to extra.list 
svn path=/nixpkgs/trunk/; revision=31184
 2011-12-31 06:07:34 +00:00
Florian Friesdorf 2a2ceace7f generate-expr-from-tarballs.pl support multiple versions 
svn path=/nixpkgs/trunk/; revision=31183
 2011-12-31 06:07:32 +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 cebb40f533 adjusted oder of *.list in generate-expr-from-tarballs.pl example 
svn path=/nixpkgs/trunk/; revision=31181
 2011-12-31 06:07:26 +00:00
Florian Friesdorf e45921800c adjusted example generate-expr-from-tarballs.pl call to 7.6 
svn path=/nixpkgs/trunk/; revision=31180
 2011-12-31 06:07:23 +00:00
Florian Friesdorf 0bb20084b5 xorg: alphabetical extra.list 
svn path=/nixpkgs/trunk/; revision=31179
 2011-12-31 06:07:21 +00:00
Florian Friesdorf c9b2b8a182 xcb-util(-*)-0.3.8 and xlsclients-1.1.2 in extra.list 
svn path=/nixpkgs/trunk/; revision=31178
 2011-12-31 06:07:18 +00:00
Florian Friesdorf e1556e64d7 xorg: moved individuals from tarballs-7.6 to extra.list and regen tarballs-7.6 
svn path=/nixpkgs/trunk/; revision=31177
 2011-12-31 06:07:15 +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
Alexander Tsamutali 0ed57e3f64 servers/x11/xorg/overrides.nix: 
Added xproto to propagatedBuildInputs of libXext, because for ex.
  shape.h includes Xfuncproto.h.

svn path=/nixpkgs/trunk/; revision=29505
 2011-09-26 22:24:22 +00:00
Shea Levy 8a3f40a088 Get libpciaccess to compile on darwin 
The added patch uses the correct byte-conversion functions on Apple systems. The library compiles on darwin but is not yet tested.

svn path=/nixpkgs/trunk/; revision=28881
 2011-08-29 18:58:59 +00:00
Eelco Dolstra 626b7cd9f4 * Fix the xvinfo build. 
svn path=/nixpkgs/branches/kde-4.7/; revision=27955
 2011-07-26 00:04:46 +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
Michael Raskin ee75c32a3b More needed propagations noted for future big update 
svn path=/nixpkgs/trunk/; revision=26409
 2011-03-18 05:32:14 +00:00
Michael Raskin 92a26c823c Comment about incomplete set of propagatedBuildInputs 
svn path=/nixpkgs/trunk/; revision=26406
 2011-03-17 22:00:22 +00:00
Michael Raskin 1d99933141 Fix xbacklight 
svn path=/nixpkgs/trunk/; revision=26402
 2011-03-17 18:46:25 +00:00
Michael Raskin 3fa36ea4a1 Fix TWM build 
svn path=/nixpkgs/trunk/; revision=26399
 2011-03-17 15:51:13 +00:00
Eelco Dolstra 6ba53ec09a * Fix xf86-input-synaptics and xf86-input-keyboard. 
* Enable parallel building for all X.org packages.

svn path=/nixpkgs/branches/x-updates/; revision=25982
 2011-02-15 15:54:57 +00:00
Eelco Dolstra a5aa96c3a3 * xorgserver: propagate dri2proto. 
svn path=/nixpkgs/branches/x-updates/; revision=25980
 2011-02-15 14:34:26 +00:00
Eelco Dolstra 1566609a1a * libXft: propagate libXrender. 
svn path=/nixpkgs/branches/x-updates/; revision=25950
 2011-02-14 10:14:34 +00:00
Eelco Dolstra 47aa6890d2 * libXaw: propagates libXmu. 
svn path=/nixpkgs/branches/x-updates/; revision=25948
 2011-02-14 10:04:37 +00:00
Eelco Dolstra 0f0d3f9543 * Fix xorg-server. 
svn path=/nixpkgs/branches/x-updates/; revision=25907
 2011-02-11 15:54:01 +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 8ca86a8114 * Remove libX11 docs. 
svn path=/nixpkgs/branches/x-updates/; revision=25855
 2011-02-09 15:17:15 +00:00
Eelco Dolstra 6a59d1a98f * Latest Glib, ATK, Pango and GTK+. 
* Added gdk-pixbuf, which has been revived and is required by GTK+.
* Don't install the documentation of aforementioned packages.  This
  cuts 56 MiB off the closure of GTK+-based packages.  It wasn't
  really useful anyway because it's not installed in a way that allows
  users to find it easily on NixOS.  And if you want it, it's faster
  to Google it.

svn path=/nixpkgs/branches/x-updates/; revision=25853
 2011-02-09 15:09:29 +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 ba498d4a43 * composedArgsAndFun -> makeOverridable for consistency. 
* Rename a few single-version packages to "default.nix".

svn path=/nixpkgs/trunk/; revision=22803
 2010-07-29 08:21:21 +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 5ebeb68c72 * Update the imake patch. 
svn path=/nixpkgs/branches/x-updates/; revision=22660
 2010-07-19 10:18:06 +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
Eelco Dolstra 26164c05c5 * lndir: work properly on directories with st_nlink set to 1 (such as 
on btrfs).  (From David Brown.)

svn path=/nixpkgs/trunk/; revision=22619
 2010-07-16 22:04:56 +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
Eelco Dolstra 04f73b29d6 * Force a rebuild of the X server, because the current build got 
corrupted in a crash.

svn path=/nixpkgs/trunk/; revision=20497
 2010-03-09 15:35:46 +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
Lluís Batlle i Rossell d47aead668 Setting the difference buildInputs/buildNativeInputs in some gtk related packages. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19620
 2010-01-22 18:49:16 +00:00
Lluís Batlle i Rossell 9183f21f7e Merging from trunk. 
I fixed conflicts regarding the renaming 'kernel' -> 'linux' in all-packages.
Also a small conflict in all-packages about making openssl overridable.
And I some linux 2.6.31-zen kernel files also marked in conflict.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19438
 2010-01-14 14:49:31 +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
Lluís Batlle i Rossell 89fe676bb3 Updating from trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=18878
 2009-12-10 14:48:45 +00:00
Peter Simons d21a4d14fc pkgs/servers/x11/xorg/overrides.nix: dropped override for libXaw on Darwin 
With the latest version of libXaw, those patches aren't necessary
anymore; the build has been fixed upstream.

svn path=/nixpkgs/trunk/; revision=18856
 2009-12-09 15:56:20 +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
Lluís Batlle i Rossell a3403e6828 Finishing the update from trunk, having resolved the eclipse related directory 
renaming.
I think directory renaming breaks the usual merges... because it leaves the
'to be removed' directory in the working directory still. A manual 'rm' of the
'to be removed' directory fixed the commit.

svn merge  ^/nixpkgs/trunk


svn path=/nixpkgs/branches/stdenv-updates/; revision=18661
 2009-11-26 21:46:08 +00:00
Lluís Batlle i Rossell b4e31ce1bf fixing the name in the openchrome expression. 
svn path=/nixpkgs/trunk/; revision=18573
 2009-11-23 21:40:26 +00:00
Lluís Batlle i Rossell d8aa5b5db1 Fixing stdenv's chain of propagated-build-inputs (2nd level propagated build 
inputs did not get in)
Updating the xorg builder script to support cross building (in fact, support
for propagating the required build inputs).


svn path=/nixpkgs/branches/stdenv-updates/; revision=18569
 2009-11-23 19:45:18 +00:00
Lluís Batlle i Rossell 585ba8c27f Big fixes in the cross build: 
- Before this changes, cflags and ldflags for the native and the cross compiler
  got mixed. Not all the gcc-wrapper/gcc-cross-wrapper variables are
  independant now, but enough, I think.
- Fixed the generic stdenv expression, which did a big mess on buildInputs and
  buildNativeInputs. Now it distinguishes when there is a stdenvCross or not.
  Maybe we should have a single stdenv and forget about the stdenvCross
  adapter - this could end in a stdenv a bit complex, but simpler than the
  generic stdenv + adapter.
- Added basic support in pkgconfig for cross-builds: a single PKG_CONFIG_PATH
  now works for both the cross and the native compilers, but I think this
  should work well for most cases I can think of.
- I tried to fix the guile expression to cross-biuld; guile is built, but not
  its manual, so the derivation still fails. Guile requires patching to
  cross-build, as far as I understnad.
- Made the glibcCross build to be done through the usage of a
  gcc-cross-wrapper over the gcc-cross-stage-static, instead of using it
  directly.
- Trying to make physfs (a neverball dependency) cross build.
- Updated the gcc expression to support building a cross compiler without getting
  derivation variables mixed with those of the stdenvCross.

svn path=/nixpkgs/branches/stdenv-updates/; revision=18534
 2009-11-22 19:51:45 +00:00
Lluís Batlle i Rossell d0d2c6e3fe Overriding some xorg expressions for them to cross-build. Now SDL cross-builds clean. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=18501
 2009-11-21 14:49:25 +00:00
Lluís Batlle i Rossell ca5d91aa60 Made more libraries cross compile. fontconfig, libxcb, bzip2, libdrm, zlib... 
I was trying to cross compile SDL. Many dependencies work, but I ended seeing
libX11 not ready for cross compilation. Other xorg libraries cross-compile
well. libX11 may need a small patch. The problem is the usual "configure test
cannot be run in cross compilation", so the configure script halts.

I made the pkgconfig expression always return buildDrv, as I think it rarely
will be needed as buildInput. So to avoid rewriting all its mentions to use
it as buildNativeInput, I prefered this small change.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18500
 2009-11-21 10:44:22 +00:00
Lluís Batlle i Rossell 3136303d63 Fixing the libxcb native build: missing dependency. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=18499
 2009-11-21 10:11:44 +00:00
Lluís Batlle i Rossell 4acd0bdb8c Making xorgserver build also Xnest. 
svn path=/nixpkgs/trunk/; revision=18395
 2009-11-17 16:46:51 +00:00
Lluís Batlle i Rossell c28701c3d9 Fixing the xdriinfo build. 
svn path=/nixpkgs/trunk/; revision=18287
 2009-11-08 11:34:17 +00:00