Peter Simons 637a571b4e Merge pull request #2029 from ashalkhakov/master ... Adding ATS1, updating ATS2 package.		2014-03-26 11:22:04 +01:00
..
applications	Merge pull request #2037 from ambrop72/cura	2014-03-26 11:11:56 +01:00
build-support	Merge pull request #2010 from ambrop72/fetchgit-no-submodules	2014-03-26 11:11:25 +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 pull request #2029 from ashalkhakov/master	2014-03-26 11:22:04 +01: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	Fix services.udisks.enable.	2014-03-25 16:52:45 +01:00
servers	Add seyren, an alerting dashboard for Graphite	2014-03-25 23:45:11 +00:00
shells
stdenv	Explicitly require Nix 1.6	2014-03-17 11:33:36 +01:00
test
tools	file: update to fix CVE-2014-2270, CVE-2013-7345	2014-03-25 23:02:37 +01:00
top-level	Merge pull request #2029 from ashalkhakov/master	2014-03-26 11:22:04 +01:00