Shea Levy 058fd7eeea Merge branch 'master' of git://github.com/madjar/nixpkgs ... rust: fixed i686 build Signed-off-by: Shea Levy <shea@shealevy.com>		2014-01-22 13:33:02 -05:00
..
applications	Merge pull request #1564 from aristidb/master	2014-01-22 10:17:38 -08:00
build-support	Merge master into stdenv-updates	2014-01-20 19:39:28 +01:00
data
desktops	gnome3: remove librsvg with gtk2	2014-01-21 14:11:20 +01:00
development	rust: fixed i686 build	2014-01-22 19:29:20 +01:00
games	Unmaintain a bunch of packages	2014-01-21 22:34:41 -05:00
misc	Merge master into stdenv-updates	2014-01-18 14:46:20 +01:00
os-specific	Unmaintain a bunch of packages	2014-01-21 22:34:41 -05:00
servers	nagios-plugins: change source location and homepage since the original site has been hijacked. https://bugzilla.redhat.com/show_bug.cgi?id=1054340	2014-01-22 08:42:35 +02:00
shells
stdenv	stdenv/setup.sh: add .gz extension to links to .gz man pages	2014-01-20 22:11:14 +01:00
test
tools	rockbox-utility: upgrade 1.3.1 -> 1.4.0	2014-01-22 06:40:32 +01:00
top-level	Add pythonPackages.pyramid_chameleon and disable tests for zope_testrunner	2014-01-22 18:19:07 +01:00