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

* experimental/ati:
  patch by Jaka Hudoklin
Merge remote-tracking branch 'refs/remotes/gh/experimental/marc' into HEAD

* refs/remotes/gh/experimental/marc: (66 commits)
  New TopGit dependency: experimental/ati
  tgDel: removing dependency refs/heads/experimental/marc. Probably this topic was merged upstream (?)
  New TopGit dependency: experimental/vim-plugins
  update dvb-apps
  add deepOverride code from master
  disable zprofileHack by default - I don't need it due to my multiple-shells patch for nixos
  these lines belong there
  merge failure
  always merge functions "merge" and "check" if type defines them
  improve wording:
  refactor: introduce isType reducing redundancy (trivial change)
  New TopGit dependency: experimental/imap-sync-update
  for whatever reason -DKBD* was ignored. systmed has --with-kbd-* options which work
  update zsh 5.0.0, make zprofile hack optional, sh and posix compatibility have been improved also it ships with sytemd completion
  update ati, make compile with 3.7 (gentoo patches)
  haxe-latest
  New TopGit dependency: experimental/ruby
  fix sort in lists.nix
  merge failure
  source of gupnp-igd is gone, too, use ubuntu source (launchpad) - same hash
  ...
Merge remote-tracking branch 'refs/remotes/gh/top-bases/experimental/marc' into refs/top-bases/experimental/marc

* refs/remotes/gh/top-bases/experimental/marc: (201 commits)
  improve documentation
  curl: Update to 7.30.0
  Revert "experimental/shadow"
  xxdiff: update to current HEAD of the source repository
  hatari: fix pthread_cancel+gcc_s thing, and some spacing
  Auto-update some packages; no early build failures (SBCL and Wine not yet fully built)
  Distrho: fix build: pin premake to version 3
  python-deform: unittest2 needed on python 26
  Revert "let hydra also build python26Packages"
  Add hatari Atari St emulator.
  magit: fix download url
  Fix indention, remove maintainers.
  php: Add 5.4
  libextractor: make gtk support work again
  Adding doodle.
  munge 0.5.10: New package, a credentials handler for clusters
  git: Properly use symlinks instead of hard links
  Revert "git: fix build on FreeBSD"
  haskell-hashable: update to version 1.2.x
  pkgs/top-level/release-haskell.nix: cosmetic
  ...
Merge remote-tracking branch 'refs/remotes/gh/experimental/marc' into HEAD

* refs/remotes/gh/experimental/marc: (66 commits)
  New TopGit dependency: experimental/ati
  tgDel: removing dependency refs/heads/experimental/marc. Probably this topic was merged upstream (?)
  New TopGit dependency: experimental/vim-plugins
  update dvb-apps
  add deepOverride code from master
  disable zprofileHack by default - I don't need it due to my multiple-shells patch for nixos
  these lines belong there
  merge failure
  always merge functions "merge" and "check" if type defines them
  improve wording:
  refactor: introduce isType reducing redundancy (trivial change)
  New TopGit dependency: experimental/imap-sync-update
  for whatever reason -DKBD* was ignored. systmed has --with-kbd-* options which work
  update zsh 5.0.0, make zprofile hack optional, sh and posix compatibility have been improved also it ships with sytemd completion
  update ati, make compile with 3.7 (gentoo patches)
  haxe-latest
  New TopGit dependency: experimental/ruby
  fix sort in lists.nix
  merge failure
  source of gupnp-igd is gone, too, use ubuntu source (launchpad) - same hash
  ...
Merge commit '3fcfd45efa687acfee2b46a0ca64120bb8b74e72' into experimental/marc

* commit '3fcfd45efa687acfee2b46a0ca64120bb8b74e72': (201 commits)
  improve documentation
  curl: Update to 7.30.0
  Revert "experimental/shadow"
  xxdiff: update to current HEAD of the source repository
  hatari: fix pthread_cancel+gcc_s thing, and some spacing
  Auto-update some packages; no early build failures (SBCL and Wine not yet fully built)
  Distrho: fix build: pin premake to version 3
  python-deform: unittest2 needed on python 26
  Revert "let hydra also build python26Packages"
  Add hatari Atari St emulator.
  magit: fix download url
  Fix indention, remove maintainers.
  php: Add 5.4
  libextractor: make gtk support work again
  Adding doodle.
  munge 0.5.10: New package, a credentials handler for clusters
  git: Properly use symlinks instead of hard links
  Revert "git: fix build on FreeBSD"
  haskell-hashable: update to version 1.2.x
  pkgs/top-level/release-haskell.nix: cosmetic
  ...