Merge commit 'refs/top-bases/experimental/php-koellner-phonetic' into experimental/php-koellner-phonetic

* commit 'refs/top-bases/experimental/php-koellner-phonetic': (1111 commits)
  r-packages.nix: added various new libraries
  R: added wrapper script that provides "R" and "Rscript" binaries that know about extra libraries
  all-packages.nix: strip trailing whitespace
  chromium: Update all channels to latest versions.
  chromium: Link against pulse instead of dlopen().
  haskell-ghc-mod: revert "wrap the newly added ghc-modi executable"
  HTTP-4000.2.13: patch Cabal file to declare FlexibleContexts extension to fix the build with ghc-head
  haskell-httpd-shed: jailbreak to fix build with latest version of 'network'
  haskell-vinyl: add version 0.3
  haskell-graphviz: jailbreak to fix build with fgl 5.x
  haskell-ghc-mod: wrap the newly added ghc-modi executable
  haskell-download-curl: jailbreak to fix build with recent versions of tagsoup
  haskell-HTTP-4000.2.13: disable test suite to fix the build
  HTTP-4000.2.13: jailbreak to fix build with latest version of conduit
  Remove obsolete Agda-executable package; the compiler is not part of 'Agda'.
  Add several new Haskell expressions
  qwt: add version 6.x (we already have 5.x)
  pam: upstream patch to fix CVE-2014-2583
  json-c: update to 0.12, fixing CVE-2013-{6370,6371}
  happy-1.19.3: patch code to build with ghc-head
  ...
Merge commit '787ec5e4440402ff57d9a367909aed7473664b3b' into experimental/php-koellner-phonetic

* commit '787ec5e4440402ff57d9a367909aed7473664b3b':
Merge commit '306e0b73c9563080ba0aa0417e8645a7f53dd03e' into experimental/php-koellner-phonetic

* commit '306e0b73c9563080ba0aa0417e8645a7f53dd03e': (1515 commits)
  fixup the previous: got renamed to sessionVariables
  nixos/opengl: add LD_LIBRARY_PATH to systemVariables instead
  scala: cosmetic fix for syntax highlighting in Emacs
  fixes #2926
  sweethome3d: remove '.' at end of description
  Adding SweetHome3D, TexturesLibraryEditor, FurnitureLibraryEditor
  xtrace:  fix build and update to 1.3.1
  e17.terminology:  0.4.0 -> 0.5.1
  Update haskell-hspec2 to version 0.3.4
  liboping: new package
  libmodbus: new package
  pyrtlsdr: new package
  Allow specifying allowUnfreePredicate instead of allowUnfree. The predicate will have access to the arguments of mkDerivation call. Should be an improvement for #2188
  Update Sauerbraten to a fresh revision 5000. Apparently fixes the build. Probably fixes #995.
  Add haskell-hspec-wai
  Update haskell-aeson-qq to version 0.7.1
  Ur/Web compiler: new release, 20140426 -> 20140531
  Update GlusterFS to 3.4.3
  Update Wine unstable version
  Update CL-Launch
  ...
Merge branch 'master' into refs/top-bases/experimental/php-koellner-phonetic

* master: (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)
  ...

Conflicts:
	pkgs/development/interpreters/php/5.3.nix
	pkgs/development/interpreters/php/5.4.nix
Merge commit 'refs/top-bases/experimental/php-koellner-phonetic' into experimental/php-koellner-phonetic

* commit 'refs/top-bases/experimental/php-koellner-phonetic': (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)
  ...
Merge remote-tracking branch 'refs/remotes/gh/top-bases/experimental/php-koellner-phonetic' into refs/top-bases/experimental/php-koellner-phonetic

* refs/remotes/gh/top-bases/experimental/php-koellner-phonetic: (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
  ...
Merge remote-tracking branch 'refs/remotes/gh/experimental/php-koellner-phonetic' into HEAD

* refs/remotes/gh/experimental/php-koellner-phonetic:
  implementation
  new tg branch experimental/php-koellner-phonetic
Merge commit '4101b55fb221e3b0dea61bbaab076c0535e64b02' into experimental/php-koellner-phonetic

* commit '4101b55fb221e3b0dea61bbaab076c0535e64b02': (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
  ...