diff options
| author | Shea Levy <shea@shealevy.com> | 2014-04-05 15:18:14 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2014-04-05 15:18:14 -0400 |
| commit | a46d2e31507eaa90d8f5cd5b553dd28b8bd41f50 (patch) | |
| tree | d9f440f9ce7caca60b7cba088a6a1a7abf36a36e /nixos/modules/misc | |
| parent | bd1a95ee608f70ffb673f4cb1c4dd109e1f32485 (diff) | |
| parent | 788354cc348d976eeb84e5e8041ea5563d931504 (diff) | |
| download | nixpkgs-a46d2e31507eaa90d8f5cd5b553dd28b8bd41f50.tar nixpkgs-a46d2e31507eaa90d8f5cd5b553dd28b8bd41f50.tar.gz nixpkgs-a46d2e31507eaa90d8f5cd5b553dd28b8bd41f50.tar.bz2 nixpkgs-a46d2e31507eaa90d8f5cd5b553dd28b8bd41f50.tar.lz nixpkgs-a46d2e31507eaa90d8f5cd5b553dd28b8bd41f50.tar.xz nixpkgs-a46d2e31507eaa90d8f5cd5b553dd28b8bd41f50.tar.zst nixpkgs-a46d2e31507eaa90d8f5cd5b553dd28b8bd41f50.zip | |
Merge branch 'murmur' of git://github.com/thoughtpolice/nixpkgs
nixos: add Murmur module (Mumble chat) Conflicts: nixos/modules/misc/ids.nix
Diffstat (limited to 'nixos/modules/misc')
| -rw-r--r-- | nixos/modules/misc/ids.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index a7ef2ca1803..91df29236b8 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -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. |