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/marc

* experimental/php:
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
Merge branch 'experimental/php-koellner-phonetic' into refs/top-bases/experimental/marc

* experimental/php-koellner-phonetic:
Merge remote-tracking branch 'refs/remotes/gh/experimental/marc' into HEAD

* refs/remotes/gh/experimental/marc: (102 commits)
  tgDel: removing dependency refs/heads/experimental/marc. Probably this topic was merged upstream (?)
  tgDel: removing dependency refs/heads/experimental/marc. Probably this topic was merged upstream (?)
  tgDel: removing dependency refs/heads/experimental/marc. Probably this topic was merged upstream (?)
  xsbt is outdated
  merge failure
  depend on cups update
  opt-out cups update:
  Fix .deepOverride on poppler, glib by moving the default derivation into callPackage call
  nix
  New TopGit dependency: experimental/php-koellner-phonetic
  New TopGit dependency: marc-nixos/postfix
  New TopGit dependency: marc-nixos/minimal-install-archive
  New TopGit dependency: marc-nixos/virtualbox-server
  New TopGit dependency: marc-nixos/multi-shell-support
  New TopGit dependency: experimental/vsftpd
  fix vim plugins merge failure
  New TopGit dependency: experimental/fonts
  ati update - not that much testing done, but it runs and compiles with 3.10.5
  dropping my dhex version
  New TopGit dependency: experimental/firebird
  ...