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

* experimental/opencascade:
  attempt to package pythonocc - whatever I do - some problems appear - waiting for reply of pythonocc maintainer
Merge commit 'refs/top-bases/experimental/marc' into experimental/marc

* commit 'refs/top-bases/experimental/marc':
  attempt to package pythonocc - whatever I do - some problems appear - waiting for reply of pythonocc maintainer
Merge remote-tracking branch 'refs/remotes/gh/top-bases/experimental/marc' into refs/top-bases/experimental/marc

* refs/remotes/gh/top-bases/experimental/marc:
Merge remote-tracking branch 'refs/remotes/gh/experimental/marc' into HEAD

* refs/remotes/gh/experimental/marc: (111 commits)
  New TopGit dependency: experimental/clawsmail
  myhasktags update
  fix tigervnc ctrl-* keys, eg ctrl-c ctrl-v ctrl-d by applying patch to fltk
  fix, why did this happen ?
  adding whatsapp plugin
  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 (?)
  Revert "nscd: Fix LD_LIBRARY_PATH"
  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
  ...
Merge commit '70f3efd634f25b56efadca2db2fe00da0d694b8e' into experimental/marc

* commit '70f3efd634f25b56efadca2db2fe00da0d694b8e':
rename new cups to cuspd_1_7 so that old implementation can be kept
Merge branch 'experimental/cups-1.6-and-1.7' into refs/top-bases/experimental/marc

* experimental/cups-1.6-and-1.7:
  rename new cups to cuspd_1_7 so that old implementation can be kept
Merge commit 'refs/top-bases/experimental/marc' into experimental/marc

* commit 'refs/top-bases/experimental/marc':
  rename new cups to cuspd_1_7 so that old implementation can be kept
fix
Merge branch 'experimental/cups-1.6-and-1.7' into refs/top-bases/experimental/marc

* experimental/cups-1.6-and-1.7:
  fix
Merge commit 'refs/top-bases/experimental/marc' into experimental/marc

* commit 'refs/top-bases/experimental/marc':
  fix
fix
Merge branch 'experimental/cups-1.6-and-1.7' into refs/top-bases/experimental/marc

* experimental/cups-1.6-and-1.7:
  fix
Merge commit 'refs/top-bases/experimental/marc' into experimental/marc

* commit 'refs/top-bases/experimental/marc':
  fix
fix
Merge branch 'experimental/cups-1.6-and-1.7' into refs/top-bases/experimental/marc

* experimental/cups-1.6-and-1.7:
  fix
Merge commit 'refs/top-bases/experimental/marc' into experimental/marc

* commit 'refs/top-bases/experimental/marc':
  fix
fix
Merge branch 'experimental/cups-1.6-and-1.7' into refs/top-bases/experimental/marc

* experimental/cups-1.6-and-1.7:
  fix
Merge commit 'refs/top-bases/experimental/marc' into experimental/marc

* commit 'refs/top-bases/experimental/marc':
  fix