From 19a252a82e142ed9a81cd7fe88c8bc822d88cbd6 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <contact@infinisil.com>
Date: Sat, 28 Mar 2020 15:35:54 +0100
Subject: [PATCH] disable nixpkgs' murmur module, replacing it with my own

Now possible with https://github.com/NixOS/nixpkgs/pull/61570 and https://github.com/NixOS/nixpkgs/pull/76857
---
 config/machines/protos/default.nix |  2 +-
 config/new-modules/murmur.nix      | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/config/machines/protos/default.nix b/config/machines/protos/default.nix
index e13b0e0c..7d301946 100644
--- a/config/machines/protos/default.nix
+++ b/config/machines/protos/default.nix
@@ -24,7 +24,7 @@
 
   services.do-agent.enable = true;
 
-  services.murmur' = {
+  services.murmur = {
     enable = true;
     openFirewall = true;
     config.registerName = "Infinisil's Server";
diff --git a/config/new-modules/murmur.nix b/config/new-modules/murmur.nix
index 75992dba..1bd42a14 100644
--- a/config/new-modules/murmur.nix
+++ b/config/new-modules/murmur.nix
@@ -4,7 +4,7 @@ with lib;
 
 let
 
-  cfg = config.services.murmur';
+  cfg = config.services.murmur;
 
   iniValueTypes = with types; either str (either int bool);
 
@@ -19,7 +19,9 @@ let
 
 in {
 
-  options.services.murmur' = {
+  disabledModules = [ "services/networking/murmur.nix" ];
+
+  options.services.murmur = {
 
     enable = mkEnableOption "Murmur Mumble server";
 
@@ -67,7 +69,7 @@ in {
   config = mkIf cfg.enable (mkMerge [
     {
 
-      services.murmur'.config.database = "${dataDir}/murmur.sqlite";
+      services.murmur.config.database = "${dataDir}/murmur.sqlite";
 
       users.users.murmur.group = group;
       users.groups.murmur = {};
@@ -111,7 +113,7 @@ in {
         chgrp ${group} ${sslPath}
       ''; in {
 
-        services.murmur'.config.sslKey = sslPath;
+        services.murmur.config.sslKey = sslPath;
 
         # Above tmpfiles rules would set the owner to ${group}, use root instead
         systemd.tmpfiles.rules = [