fix
Merge commit '342c5345844014ba16efda4a69bb47cd8ff5b7c7' into experimental/php

* commit '342c5345844014ba16efda4a69bb47cd8ff5b7c7': (317 commits)
  munin: 2.0.19 -> 2.0.20
  luajit: adopt, upgrade, optimize
  libseccomp: version 2.1.1
  lockdep: refactor into non-kernel package
  Revert "Turn on user-controlled wpa-cli on the livecd"
  Die tabs die
  Add a flag ‘config.allowBroken’
  Replace $HYDRA_DISALLOW_UNFREE with $NIXPKGS_ALLOW_UNFREE
  Disable allowUnfree by default
  stunnel: adopt, bump to version 5.01
  gst-plugins-bad: disable faac by default because it's unfree
  haskell-twitter-types: update to version 0.2.20140407
  haskell-twitter-conduit: update to version 0.0.2.1
  haskell-tasty: update to version 0.8.0.4
  haskell-http-client-multipart: update to version 0.3.0.0
  haskell-hakyll: update to version 4.5.1.0
  haskell-ghc-mod: update to version 4.0.2
  haskell-dyre: update to version 0.8.12
  haskell-Chart: update to version 1.2.2
  haskell-Chart-gtk: update to version 1.2.2
  ...