consul: new package
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
Added gcolor2
Merge branch 'master' of https://github.com/NOTtheMessiah/nixpkgs
Update default.nix
added license for gcolor2 and myself to maintainers
Merge branch 'master' of https://github.com/NOTtheMessiah/nixpkgs
nodejs: Update to 0.10.30
teamspeak_client: 3.0.13.1 -> 3.0.16
Fix default icon location in 'wrapFirefox'
Adds hplayground, needs hastePerch
get xorg/x11 working on Darwin