experimental/cmake-improvement

set CMAKE_LIBRARY_PATH, CMAKE_INCLUDE_PATH based on NIX_CFLAGS_COMPILE and
NIX_LDFLAGS so that cmake's find_library like functions find all the libraries
gcc knows about thanks to the gcc wrapper

This is particular useful with myEnvFun which then also sets those CMAKE_* env
variables.`

Because setup.sh has to change this causes many rebuilds - thus it should be
included in a stdenv-update like branch

Also cmake builds in parallel perfectly fine

update cmake to latest minor number, I didn't change the patches,
just reapplied them manually recordin a new patch
Merge remote-tracking branch 'origin/master' into stdenv-updates.
gcc: update from 4.8.0 to 4.8.1
glibc: Enable kernels down to 2.6.32 (required for RHEL 6).
glibc: add "/run/current-system/sw/bin" to the default search path returned by "getconf CS_PATH"
Merge pull request #586 from peti/fix-default-search-path-in-getconf

glibc: add "/run/current-system/sw/bin" to the default search path returned by "getconf CS_PATH"
groff: explicitly disable X11 support in configure to avoid impure builds

Without this flag, the configure script will find /usr/X11 on host system and
assume that it can build with X11 support.
Merge branch 'master' into stdenv-updates.

There were conflicts in pkgs/development/interpreters/ruby/ruby-19.nix,
which I resolved to the best of my knowledge. I'd appreciate if some of
the ruby gurus could have a look at the outcome of my merge, though.
Merge pull request #567 from MarcWeber/submit/cmake-improvement

experimental/cmake-improvement
Merge remote-tracking branch 'origin/master' into stdenv-updates.
Revert "Merge pull request #567 from MarcWeber/submit/cmake-improvement"

This reverts commit abc7591aaf3912d819401241d7d2339fb96441f3, reversing changes
made to 6b1ebeccf2c9d9e8f68d7e21a1e55b5d91577683, because they broke half the
packages in stdenv-updates: http://hydra.nixos.org/eval/927013 has further
details.
Merge branch 'master' into stdenv-updates

Conflicts (relatively simple):
	pkgs/development/interpreters/python/2.7/default.nix
	pkgs/development/libraries/dbus/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/glibc/2.17/common.nix
python: Remove --with-wctype-functions flag

This causes functions like string.upper() to misbehave on non-ASCII
characters.  Upstream also advises against it:

  http://bugs.python.org/issue9210
  http://bugs.python.org/issue11309
Re-Revert "Merge pull request #567 from MarcWeber/submit/cmake-improvement"

This reverts commit b08e12b37ae9470c9d8eb8438c21adb8ddbae19e.
Merge master into stdenv-updates (contains new X stuff)
cmake: consistent names, to satisfy comments on #567
builder: fail if patch is missing or fails to unpack
curl: update to version 7.31.0
release-small: fix bad attr dbus_all
diffutils: minor stable update 3.2 -> 3.3