updating bitcoin to 0.9.2.1
fixing whitespace
plan9port:
	- Update to 20140306
	- Fixed libXt dependency.  The compiler could not find X11/IntrinsicP.h, even though it is available through the nix store.  I think there must be some issue with the 9c compiler being used and not obeying the CFLAGS that nix is supposed to pass.  There are probably other dependencies I'm missing, but 9c found in my /usr/include.
plan9port: builder.sh called install script twice, meaning a redundant recompile.
Merge branch 'master' of ssh://github.com/vvanpo/nixpkgs into plan9port
nano: support system-wide nanorc

This patch does two things
1. builds nano with sysconfdir=/etc; and
2. adds an option programs.nano.nanorc
nano: bump to version 2.3.6
zotero: version bump 4.0.21.1 -> 4.0.21.2
firefox: bring back version 30.0 for zotero
get xorg/x11 working on Darwin
fix mesa_drivers
sl: fix license (close #3072)

From https://github.com/fistonbettens/nixpkgs/commit/7b6591b551afc6a17b
but it failed to apply for me, so I hand-added and corrected the change.
ffmpeg: maintenance update
Merge pull request #3101 from cstrahan/xquartz

Use XQuartz on Darwin
merge #3428: nano: bump and add system-wide config
merge #3416: plan9port: update
licenses: add LPL-102
plan9port: enableParallelBuilding, improve meta
merge #3340: bitcoin: minor update
plowshare: version bump

From #3301.