dbus_daemon is referenced by nixos
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/experimental/x-updates' into HEAD

* refs/remotes/gh/experimental/x-updates: (197 commits)
  non-linux attempts to fix: libbonobo and libjpeg
  gnome_vfs: fix build by disabling fatality of deprecations
  vala: attempt to fix build for FreeBSD
  libgsf: attempt to fix build on FreeBSD
  chromium: Update all channels to latest versions.
  virtualbox+guest: Update to new upstream v4.2.12.
  pythonPackages.ipythonLight: no qt/numpy dependency
  on the way to #463: make pythonPackages self-referential
  python-py and python-tox, the latter still broken
  Adding fish (blowfish over irc) for irssi.
  silc-client: the irssi plugin segfaults on join, with current irssi.
  git-annex: update to version 4.20130405
  haskell-cabal-dev: update to version 0.9.2
  haskell-github: update to version 0.6.0
  silc_client: more url problems
  silc_client: error in url
  silc_client: Missing file
  Adding silc-client as irssi plugin
  silc-server: Nicer fetchurl src.
  Adding silc-server.
  ...
Merge branch 'experimental/marc' into refs/top-bases/experimental/x-updates

* experimental/marc:
  patch by Jaka Hudoklin
Merge commit '50760de94b9ce3bda711243493dd59067a5cad80' into experimental/x-updates

* commit '50760de94b9ce3bda711243493dd59067a5cad80': (42 commits)
  non-linux attempts to fix: libbonobo and libjpeg
  gnome_vfs: fix build by disabling fatality of deprecations
  vala: attempt to fix build for FreeBSD
  libgsf: attempt to fix build on FreeBSD
  chromium: Update all channels to latest versions.
  virtualbox+guest: Update to new upstream v4.2.12.
  pythonPackages.ipythonLight: no qt/numpy dependency
  on the way to #463: make pythonPackages self-referential
  python-py and python-tox, the latter still broken
  patch by Jaka Hudoklin
  Adding fish (blowfish over irc) for irssi.
  silc-client: the irssi plugin segfaults on join, with current irssi.
  git-annex: update to version 4.20130405
  haskell-cabal-dev: update to version 0.9.2
  haskell-github: update to version 0.6.0
  silc_client: more url problems
  silc_client: error in url
  silc_client: Missing file
  Adding silc-client as irssi plugin
  silc-server: Nicer fetchurl src.
  ...
Merge remote-tracking branch 'refs/remotes/gh/top-bases/experimental/x-updates' into refs/top-bases/experimental/x-updates

* refs/remotes/gh/top-bases/experimental/x-updates: (377 commits)
  keep tigervnc building
  new tg branch tmp/x-updates-fixes
  tarball: move assertion in systemd
  remove old references to xorgserver_1_13_0
  Add limnoria, a well maintained fork of Supybot, an IRC bot
  improve documentation
  qt4: parallel-build impurity fix
  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
  ...
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
  ...
Merge branch 'experimental/marc' into refs/top-bases/experimental/x-updates

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

* refs/remotes/gh/experimental/x-updates:
  New TopGit dependency: tmp/x-updates-fixes
  adding nip2 and vipsg
  adding smart-deblur
  adding lprof
  without mesa compilation fails with fgl_glxgears.c:66:19: fatal error: GL/gl.h: No such file or directory
  wacom driver updates
  new tg branch experimental/x-updates
Merge commit 'd5a5238206a9a50c13b45412c347fa9d5cb7be4e' into experimental/x-updates

* commit 'd5a5238206a9a50c13b45412c347fa9d5cb7be4e': (187 commits)
  New TopGit dependency: tmp/x-updates-fixes
  keep tigervnc building
  new tg branch tmp/x-updates-fixes
  tarball: move assertion in systemd
  remove old references to xorgserver_1_13_0
  Add limnoria, a well maintained fork of Supybot, an IRC bot
  improve documentation
  qt4: parallel-build impurity fix
  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
  ...