sshfsFuse: update from 2.4 to 2.5
gnutls on darwin: drop patch that is integrated now
libssh: update, incl. features and CVE-2014-0017 fix

Also add pkgconfig to inputs, as it was looked for by cmake.
Dependent packages seem to build fine.
ffmpeg_2: update 2.1.1 -> .4, fixing CVE-2014-209{7,8,9}
Security update: update to warp 2.0.3.3
See https://github.com/yesodweb/wai/issues/231 for details.
Changed virtualenv-clone to use the version from pypi (the author will keep updating it, so I don't need my fork on github anymore)
Tried to made the tests run with tox: updating tox (and the dependencies: virtualenv and py) let the installation finish, but its tests still fail
opensmtpd: Update to 5.4.2p1
Allow ntpq locally
Merge pull request #1885 from errge/ntp

Allow ntpq locally
Merge pull request #1884 from pSub/warp-security-update

Security update: update to warp 2.0.3.3
dd_rescue: 1.22 -> 1.42.1
ddrescue: 1.16 -> 1.17
Add nvidiabl kernel module
xlrd: Add python package
mupdf: fix CVE-2014-2013 by upstream patch
Merge pull request #1887 from berdario/vagrant

Updated vagrant to 1.4.3
Merge branch 'pew' of git://github.com/berdario/nixpkgs

Added Pew (and misc. related changes)

Conflicts:
	pkgs/top-level/python-packages.nix
Merge branch 'master' of git://github.com/esterlus/nixpkgs

added telegram-cli as instant-messenger application
Merge branch 'desktopmanager-fix' of git://github.com/pSub/nixpkgs

Use feh only as a fallback if the xserver is actually enabled.
Merge branch 'pipes-binary' of git://github.com/klao/nixpkgs

Add lens-family-core and pipes-binary Haskell packages