Shea Levy f4c989ede4 Merge branch 'master' of git://github.com/hrdinka/nixpkgs ... conky: add config options		2014-03-20 20:14:14 -04:00
..
applications	git: Update to 1.9.1	2014-03-20 15:44:25 +01:00
build-support	runInLinuxVM: Set the clock properly	2014-03-18 15:02:09 +01:00
data	man-pages-posix: update 2003a -> 2013-a	2014-03-16 17:39:50 +01:00
desktops	Add shotwell 1.15.1	2014-03-18 18:23:13 +01:00
development	Merge branch 'fsharp' of git://github.com/thoughtpolice/nixpkgs	2014-03-20 20:07:44 -04:00
games	add Planetary Annihilation: next-generation RTS that takes the genre to a planetary scale	2014-03-16 23:31:08 +01:00
misc	nixpkgs-lint: add the platforms meta attr for most of my packages	2014-03-16 12:08:26 +01:00
os-specific	Merge branch 'master' of git://github.com/hrdinka/nixpkgs	2014-03-20 20:14:14 -04:00
servers	Add ngircd IRC server	2014-03-19 21:03:19 -04:00
shells	fish: Fix propagatedBuildInputs and other assorted changes	2014-02-15 12:17:06 +01:00
stdenv	Explicitly require Nix 1.6	2014-03-17 11:33:36 +01:00
test
tools	Merge branch 'ssdeep' of git://github.com/thoughtpolice/nixpkgs	2014-03-20 19:59:12 -04:00
top-level	Merge branch 'master' of git://github.com/hrdinka/nixpkgs	2014-03-20 20:14:14 -04:00