syncthing: update from 0.8.11 to 0.8.15
php-packages: add zmq
Update zotero 4.0.20 -> 4.0.21.1
python nose-1.3.3
Merge branch 'php-zmq' of git://github.com/proger/nixpkgs

php-packages: add zmq
Merge pull request #3026 from ttuegel/zotero

Update zotero 4.0.20 -> 4.0.21.1
Merge pull request #3019 from matejc/syncthing0815

syncthing: update from 0.8.11 to 0.8.15
Implement per-user socket units
haskell-free-operational: Remove expression
hoogle-local: Add patch based on main hoogle expression
emacs-modes-emms, emacs-modes-org: Relax platform qualifier
Disable network-transport-tcp tests, since it should depend on network-transport-tests-0.2.0.0 which is not released yet.
haskell-network-transport-tcp: jailbreak to fix build with network 2.5
Revert "add OPENSSL_X509_CERT_FILE to the `git` command environment"

This reverts commit 88b5578a579ca7eefc8ac5507f9a5be3cc3684ca because of the
following issues:

 1) If $OPENSSL_X509_CERT_FILE is set in the current shell environment, then
    its value will overwrite any settings the user may have configured in
    http.sslCAInfo via git-config(1). If you are unaware of the wrapper, then
    this behavior is totally unexpected as $OPENSSL_X509_CERT_FILE is not
    supposed to have an effect on Git.

 2) The patch makes it impossible for Git users to use the $GIT_SSL_CAINFO
    environment variable as documented in git-config(1), because anything set
    there will be overwritten with the value of $OPENSSL_X509_CERT_FILE (which
    might be empty).

 3) The patch breaks other builds of packages that depend on Git, i.e.
    <http://hydra.nixos.org/build/11995872/nixlog/1/raw>.