Fix virtualenvwrapper's PYTHONPATH
hplip: update to v3.14.10
Merge pull request #4693 from flosse/hplip-update

hplip: update to v3.14.10
Update hplip maintainer list
Merge pull request #4654 from geerds/virtualenvwrapper

Fix virtualenvwrapper's PYTHONPATH
oxygen-gtk2: update from 1.4.5 to 1.4.6
python33Packages.evdev: update from 0.4.5 to 0.4.6
xf86_input_wacom: update from 0.26.1 to 0.26.99.1
Revert "vte: fix chroot build"

This reverts commit c17427597e44a9a311e4a243916ac24abddb1ff5.
Revert "vte: update pkg and patch"

This reverts commit 383075e0091dee99d5ab4152c863710a3f6f2d16.
hydrogen: update from 0.9.6 to 0.9.6.1
Remove http_proxy/ftp_proxy overrides used in setup hooks.

Partially reverts eaa4db148dc402f7a124bc9c17583067710a7814. Used
together with nix-shell it results into unresolvable domains. For
example: `nix-shell -p libxml2` spawns a shell with non-working DNS.

chroot should remove such unpurities.
Merge branch 'master' of https://github.com/nixos/nixpkgs
fix nix-env -i evaluation
Merge branch 'master' of github.com:joelteon/nixpkgs into new-darwin

Conflicts:
	pkgs/applications/editors/vim/configurable.nix
	pkgs/applications/editors/vim/qvim.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/glibc/2.19/default.nix
	pkgs/development/libraries/mesa-darwin/default.nix
	pkgs/top-level/all-packages.nix