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
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
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
overrides.nix * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
replacements.nix
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
xorgserver-xkbcomp-path.patch
xorgserver.sh