disable nixpkgs' murmur module, replacing it with my own

Now possible with NixOS/nixpkgs#61570 and NixOS/nixpkgs#76857
infinisil · Mar 28, 2020 · 19a252a · 19a252a
1 parent 48d29f4
commit 19a252a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git 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
@@ -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 = [