Merge remote-tracking branch 'refs/remotes/gh/experimental/multiple-versions-in-one-file' into HEAD

* refs/remotes/gh/experimental/multiple-versions-in-one-file:
  improve documentation
  set name by default
  comments
  documentation
  new tg branch experimental/multiple-versions-in-one-file
follow upstream, must not use mkMerge on environment because environment.check is read now
Merge branch 'master' into refs/top-bases/experimental/php

* master: (272 commits)
  sup: fix chroot build
  sup: update to latest version, use better version number
  sup: use specific version of mime types
  valgrind: Update to 3.9.0
  ess-mode: update to version 13.09
  nagios-plugins: fix download URL (no longer available from sourceforge)
  Revert android build tools update
  Update android sdks
  libvirt: Update to 1.2.0
  Re-generate cuda-related expressions with recent version of cabal2nix.
  haskell-codec-image-devil: re-generate with cabal2nix
  haskell-scientific: re-generate with cabal2nix
  haskell-HDBC-odbc: re-generate with cabal2nix
  Re-instate the "hydraPlatforms = []" setting accidentally overwritten earlier.
  Updates ruby 1.8.7 to the latest patch-level. WARNING: unsupported
  Updates ruby 2.0.0 to patch-level 353. Fixes CVE-2013-4164
  Updates ruby 1.9.3 to patch-level 484. Fixes CVE-2013-4164
  Use the recommended http://cache.ruby-lang.org host to get the ruby archives
  Fixes ruby 2.0.0 compilation on Darwin.
  Adding libnl 3.2.19 to use instead of the latest with ntrack
  ...
Merge commit 'refs/top-bases/experimental/php' into experimental/php

* commit 'refs/top-bases/experimental/php': (272 commits)
  sup: fix chroot build
  sup: update to latest version, use better version number
  sup: use specific version of mime types
  valgrind: Update to 3.9.0
  ess-mode: update to version 13.09
  nagios-plugins: fix download URL (no longer available from sourceforge)
  Revert android build tools update
  Update android sdks
  libvirt: Update to 1.2.0
  Re-generate cuda-related expressions with recent version of cabal2nix.
  haskell-codec-image-devil: re-generate with cabal2nix
  haskell-scientific: re-generate with cabal2nix
  haskell-HDBC-odbc: re-generate with cabal2nix
  Re-instate the "hydraPlatforms = []" setting accidentally overwritten earlier.
  Updates ruby 1.8.7 to the latest patch-level. WARNING: unsupported
  Updates ruby 2.0.0 to patch-level 353. Fixes CVE-2013-4164
  Updates ruby 1.9.3 to patch-level 484. Fixes CVE-2013-4164
  Use the recommended http://cache.ruby-lang.org host to get the ruby archives
  Fixes ruby 2.0.0 compilation on Darwin.
  Adding libnl 3.2.19 to use instead of the latest with ntrack
  ...
Merge commit 'refs/top-bases/experimental/multiple-versions-in-one-file' into experimental/multiple-versions-in-one-file

* commit 'refs/top-bases/experimental/multiple-versions-in-one-file': (272 commits)
  sup: fix chroot build
  sup: update to latest version, use better version number
  sup: use specific version of mime types
  valgrind: Update to 3.9.0
  ess-mode: update to version 13.09
  nagios-plugins: fix download URL (no longer available from sourceforge)
  Revert android build tools update
  Update android sdks
  libvirt: Update to 1.2.0
  Re-generate cuda-related expressions with recent version of cabal2nix.
  haskell-codec-image-devil: re-generate with cabal2nix
  haskell-scientific: re-generate with cabal2nix
  haskell-HDBC-odbc: re-generate with cabal2nix
  Re-instate the "hydraPlatforms = []" setting accidentally overwritten earlier.
  Updates ruby 1.8.7 to the latest patch-level. WARNING: unsupported
  Updates ruby 2.0.0 to patch-level 353. Fixes CVE-2013-4164
  Updates ruby 1.9.3 to patch-level 484. Fixes CVE-2013-4164
  Use the recommended http://cache.ruby-lang.org host to get the ruby archives
  Fixes ruby 2.0.0 compilation on Darwin.
  Adding libnl 3.2.19 to use instead of the latest with ntrack
  ...
Merge branch 'experimental/multiple-versions-in-one-file' into refs/top-bases/experimental/php

* experimental/multiple-versions-in-one-file:
Merge remote-tracking branch 'refs/remotes/gh/experimental/php' into HEAD

* refs/remotes/gh/experimental/php: (57 commits)
  follow upstream, must not use mkMerge on environment because environment.check is read now
  only depend on master
  php sort options alphabetically, follow upstream updates
  improve message
  koellner phonetic will be an extra topic branch
  merge nixos code
  php sendmail path patch
  use true_version, change url
  use .x - never forgett to update those numbers again
  updating php
  interactive fix
  fix2
  fixes
  adding koellner-phoenetik extension
  use --with-jpeg-dir otherwise PHP cannot create jpegs from string
  use gd shared always
  forgott to change hash
  follow upstream gd change
  improve documentation
  fix
  ...
Merge branch 'experimental/php' into refs/top-bases/experimental/php-koellner-phonetic

* experimental/php:
  follow upstream, must not use mkMerge on environment because environment.check is read now
Merge remote-tracking branch 'refs/remotes/gh/experimental/php-koellner-phonetic' into HEAD

* refs/remotes/gh/experimental/php-koellner-phonetic:
  implementation
  new tg branch experimental/php-koellner-phonetic