nixpkgs/pkgs/servers/x11/xorg
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
..
unichrome Fixing the url for the xorg video unichrome driver. 2009-11-06 19:26:00 +00:00
builder.sh * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
default.nix Version bumb of 'xf86-synaptics' module, which fixes a cpu-stealing bug when using syndaemon. 2012-02-05 00:43:54 +00:00
extra.list moved parts of extra.list back to tarballs-7.6.list 2011-12-31 15:37:51 +00:00
generate-expr-from-tarballs.pl moved parts of extra.list back to tarballs-7.6.list 2011-12-31 15:37:51 +00:00
imake.patch * Update the imake patch. 2010-07-19 10:18:06 +00:00
imake.sh * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
libpciaccess-apple.patch Get libpciaccess to compile on darwin 2011-08-29 18:58:59 +00:00
old.list * X.org 7.6. 2011-02-08 17:39:28 +00:00
overrides.nix * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
replacements.nix * composedArgsAndFun -> makeOverridable for consistency. 2010-07-29 08:21:21 +00:00
tarballs-7.6.list Version bumb of 'xf86-synaptics' module, which fixes a cpu-stealing bug when using syndaemon. 2012-02-05 00:43:54 +00:00
xorgserver-dri-path.patch Updating the xorg dri path patch for dri2. 2009-11-06 21:15:59 +00:00
xorgserver-xkbcomp-path.patch * Allow the path to xkbcomp to specified in an environment variable. 2007-03-29 22:57:56 +00:00
xorgserver.sh * Got rid of a lot of "postInstall=postInstall" and similar lines in 2009-04-23 13:31:10 +00:00