Merge commit 'refs/top-bases/experimental/firebird' into experimental/firebird

* commit 'refs/top-bases/experimental/firebird': (304 commits)
  go 1.3: doesn't evaluate on freebsd
  python: zc.recipe.egg for buildout171 and 2
  gitignore: result-* and make absolute doc ignores
  lftp: remove unused 'xz' expression argument
  lftp: update 4.4.16 -> 4.5.2
  dejagnu: fix description (don't repeat package name)
  glusterfs: update to 3.5.0
  zbar: tweak description and add longDescription
  zfs, zfs.git: Update to 0.6.3
  spl, spl.git: Update to 0.6.3
  flashplayer: Update from 11.2.202.359 -> 11.2.202.378
  Making retroshare bootstrap the DHT fine.
  zeitgeist: fix description (don't repeat package name)
  zile: fix description (don't repeat package name)
  zip: add meta.description
  zlib: add description and license info
  zoom: add meta attributes
  zsh: improve description
  zynaddsubfx: fix description (capitalize first word)
  zziplib: fix description (don't repeat package name)
  ...
firebird group
Merge commit '09459fb9dbee39b46d0f9214ac30349e088f67cf' into experimental/firebird

* commit '09459fb9dbee39b46d0f9214ac30349e088f67cf': (673 commits)
  Add gimpPlugins.focusblur
  git: Update to 2.0.2
  haskell-gtk: re-generate after applying NixOS/cabal2nix#70
  added cv: Tool that shows the progress of coreutils programs
  Google Compute config: add a unit to wait for the metadata server to become available
  hhvm: remove bash input
  hhvm: Fix path to /bin/bash
  Re-generate Haskell packages with cabal2nix.
  KDE Connect 0.7 -> 0.7.2
  hhvm: 3.1.0 -> 3.2.0
  Added cgrep utility.
  Add prelink package
  haskell-git-annex: fix for darwin
  haskell-agda: 2.4.0.1 needs QuickCheck 2.7.5 specifically
  haskell-codex: jailbreak due to circular dependency
  Revert "titanium: Bump to 3.3.0"
  usb-modeswitch: Update to 2.2.0.
  parsers-0.12: don't use this version yet because it breaks trifecta
  aeson: don't use version 0.8 yet because it breaks too many packages at the moment
  haskell-parsers: add version 0.12
  ...

Conflicts:
	nixos/modules/misc/ids.nix