Merge pull request #5019 from Fuuzetsu/updates

Updates (orphans)
properly package pyopenssl
protobuf: Clean up and update to version 2.6.1.

The upstream URL has changed as well as the download URL. I'm using the
archive from GitHub directly now, because version 2.6.1 hasn't been
uploaded to Google Code yet.

Changed the meta.license attribute to BSD3, because I haven't actually
found anything regarding "mBSD" on the web, so I'm guessing it should
mean "modified BSD". After digging up a bit more, there seems to be
overall consensus on BSD3/"new BSD" license, because it's BSD3 with
copyright of Google Inc. on the license.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Add meta.branch to a bunch of packages

Gives better results in the monitor
scala: lib.licenses instead of a string
systemd: Enable networking features
fix eval
emacsPackages.js2-mode updated to latest release.
Merge pull request #5057 from aycanirican/update-emacsPackages-js2-mode

emacsPackages.js2-mode updated to latest release.
libcurl: Honor $SSL_CERT_FILE
nixos/ids: Add systemd networking ids
nixos/ids: Fix systemd ids
new package: pond
Merge pull request #4372 from drvirgilio/pond

new package: pond
agda-pretty: mark as broken

Broken by updating the stdlib to 0.9. For now I let the author know.
Revert "zmq: initial package"

This reverts commit b9c7f8dba1cf5a21166bac8c7a68e98067d18717.

Conflicts:
	pkgs/servers/zeromq/default.nix
	pkgs/top-level/all-packages.nix
fabric: update to 1.10.0
Merge pull request #5054 from j-keck/master

sbt: update to version 0.13.7
Add Ubuntu 14.10
Update to Debian 7.7