Merge branch 'murmur' of git://github.com/thoughtpolice/nixpkgs

nixos: add Murmur module (Mumble chat)

Conflicts:
	nixos/modules/misc/ids.nix
This commit is contained in:
Shea Levy 2014-04-05 15:18:14 -04:00
commit a46d2e3150
5 changed files with 310 additions and 0 deletions

View file

@ -125,6 +125,7 @@
minecraft = 114;
monetdb = 115;
rippled = 116;
murmur = 117;
# When adding a uid, make sure it doesn't match an existing gid.