Merge branch 'experimental/php' into refs/top-bases/experimental/marc

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

* refs/remotes/gh/experimental/marc: (93 commits)
  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
  merge fix
  New TopGit dependency: experimental/ocaml
  vim fixes
  ruby fix
  fix eclipses
  ocaml adding deriving
  fix
  calligra git
  New TopGit dependency: experimental/inkscape
  ...
Merge commit 'refs/top-bases/experimental/php-koellner-phonetic' into experimental/php-koellner-phonetic

* commit 'refs/top-bases/experimental/php-koellner-phonetic':
  improve message
Merge commit 'refs/top-bases/experimental/marc' into experimental/marc

* commit 'refs/top-bases/experimental/marc':
Merge branch 'experimental/php-koellner-phonetic' into refs/top-bases/experimental/marc

* experimental/php-koellner-phonetic:
nix
nix
Fix .deepOverride on poppler, glib by moving the default derivation into callPackage call
opt-out cups update:

The new cupsd-1.6.nix file is default, you can still uncomment the old
one.
Both module have a new option "cupsPackages" which is the way to
specifiy which
cups/ghostscript versions to use.

1.6.4+ comes with some changes:
- default filter chain is PDF, gs is only used for gs printers
- some stuff has been moved into cupsFilters and is maintained by
  openprinting now
- cups has 2 configuration files now
- some more less important changes such as compressing print files sent
  over
  the network and whatnot (I didn't test them)

Issues:
- printing test pages does not work yet

fixes:
- printing on canon-bjc like printers using gutentprint drivers.
  1.5.4 only prints 30% of page for whatever reason.

new packages: ijs, qpdf
ghostscript: get back the update which got reverted while keeping the
old version
new tg branch experimental/cups-1.6-and-1.7
Fix .deepOverride on poppler, glib by moving the default derivation into callPackage call
opt-out cups update:

The new cupsd-1.6.nix file is default, you can still uncomment the old
one.
Both module have a new option "cupsPackages" which is the way to
specifiy which
cups/ghostscript versions to use.

1.6.4+ comes with some changes:
- default filter chain is PDF, gs is only used for gs printers
- some stuff has been moved into cupsFilters and is maintained by
  openprinting now
- cups has 2 configuration files now
- some more less important changes such as compressing print files sent
  over
  the network and whatnot (I didn't test them)

Issues:
- printing test pages does not work yet

fixes:
- printing on canon-bjc like printers using gutentprint drivers.
  1.5.4 only prints 30% of page for whatever reason.

new packages: ijs, qpdf
ghostscript: get back the update which got reverted while keeping the
old version
comment
that code is no longer requirerd, drop example
Merge commit 'refs/top-bases/experimental/cups-1.6-and-1.7' into experimental/cups-1.6-and-1.7

* commit 'refs/top-bases/experimental/cups-1.6-and-1.7':
  that code is no longer requirerd, drop example
cupsd-1.6.nix file
syslog again
Merge branch 'experimental/gutenprint' into refs/top-bases/experimental/marc

* experimental/gutenprint:
  that code is no longer requirerd, drop example
Merge branch 'experimental/nix' into refs/top-bases/experimental/marc

* experimental/nix:
  nix
Merge commit 'refs/top-bases/experimental/marc' into experimental/marc

* commit 'refs/top-bases/experimental/marc':
  that code is no longer requirerd, drop example
  nix