Shea Levy 0c12dd3ded Merge branch 'pkgs/systemd/journald_http_gateway' of git://github.com/offlinehacker/nixpkgs ... systemd: python support & journal http gateway Conflicts: nixos/modules/misc/ids.nix		2014-03-14 19:16:59 -04:00
..
darwin	set all licenses to be attributes (and wait for Nix 1.7)	2014-03-12 21:20:43 +01:00
gnu	More renames	2012-12-28 19:42:10 +01:00
linux	Merge branch 'pkgs/systemd/journald_http_gateway' of git://github.com/offlinehacker/nixpkgs	2014-03-14 19:16:59 -04:00
windows	windows/cygwin-setup: Drop meta.platforms attr.	2014-03-04 00:52:39 +01:00