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
This commit is contained in:
Shea Levy
2014-03-14 19:16:59 -04:00
3 changed files with 27 additions and 2 deletions
+2
View File
@@ -118,6 +118,7 @@
searx = 107;
kippo = 108;
jenkins = 109;
systemd-journal-gateway = 110;
# When adding a uid, make sure it doesn't match an existing gid.
@@ -214,6 +215,7 @@
searx = 107;
kippo = 108;
jenkins = 109;
systemd-journal-gateway = 110;
# When adding a gid, make sure it doesn't match an existing uid.