Remove name parameter for services that already specify an instanceName

services-agnostic/apache-tomcat/default.nix

@@ -17,7 +17,6 @@ let
   pidFile = "${runtimeDir}/${instanceName}.pid";
 in
 createManagedProcess rec {
-  name = instanceName;
   inherit instanceName user pidFile dependencies postInstall;
 
   process = "${tomcat}/bin/catalina.sh";

services-agnostic/apache/default.nix

@@ -14,7 +14,6 @@ let
   group = instanceName;
 in
 createManagedProcess {
-  name = instanceName;
   inherit instanceName initialize dependencies environment postInstall;
 
   process = "${apacheHttpd}/bin/httpd";

services-agnostic/fcron/default.nix

@@ -22,7 +22,6 @@ let
   group = instanceName;
 in
 createManagedProcess {
-  name = instanceName;
   inherit instanceName;
 
   initialize = ''

services-agnostic/hydra/hydra-evaluator.nix

@@ -7,8 +7,8 @@ let
   # TODO: ExecStopPost /bin/hydra-evaluator --unlock
 in
 createManagedProcess {
-  name = instanceName;
   inherit instanceName;
+
   dependencies = [ nix-daemon.pkg hydra-server.pkg ];
   path = [ hydra ];
   environment = import ./generate-env-vars.nix {

services-agnostic/hydra/hydra-queue-runner.nix

@@ -9,8 +9,8 @@ let
   queueRunnerBaseDir = "${hydra-server.baseDir}/queue-runner";
 in
 createManagedProcess {
-  name = instanceName;
   inherit instanceName;
+
   environment = import ./generate-env-vars.nix {
     inherit (hydra-server) baseDir hydraDatabase hydraUser;
   } // {

services-agnostic/hydra/hydra-server.nix

@@ -41,7 +41,6 @@ let
   };
 in
 createManagedProcess {
-  name = instanceName;
   inherit instanceName user;
 
   path = [ postgresql su ];

services-agnostic/influxdb/default.nix

@@ -13,7 +13,6 @@ let
   influxdbStateDir = "${stateDir}/lib/${instanceName}";
 in
 createManagedProcess {
-  name = instanceName;
   inherit instanceName user postInstall;
   foregroundProcess = "${influxdb}/bin/influxd";
   args = [ "-config" configFile ];

services-agnostic/mongodb/default.nix

@@ -12,8 +12,8 @@ let
   group = instanceName;
 in
 createManagedProcess {
-  name = instanceName;
   inherit instanceName initialize postInstall;
+
   process = "${mongodb}/bin/mongod";
   args = [ "--config" configFile ];
   daemonExtraArgs = [ "--fork" "--pidfilepath" "${runtimeDir}/${instanceName}.pid" ];

services-agnostic/mysql/default.nix

@@ -25,7 +25,6 @@ let
   group = instanceName;
 in
 createManagedProcess {
-  name = instanceName;
   inherit instanceName postInstall;
 
   initialize = ''

services-agnostic/nginx/default.nix

@@ -15,7 +15,6 @@ let
   nginxCacheDir = "${cacheDir}/${instanceName}";
 in
 createManagedProcess {
-  name = instanceName;
   description = "Nginx";
   initialize = ''
     mkdir -p ${nginxLogDir}

services-agnostic/postgresql/default.nix

@@ -16,8 +16,8 @@ let
   group = instanceName;
 in
 createManagedProcess rec {
-  name = instanceName;
   inherit instanceName user postInstall;
+
   path = [ postgresql su ];
   initialize = ''
     mkdir -m0755 -p ${socketDir}

services-agnostic/s6-svscan/default.nix

@@ -8,7 +8,8 @@
 }:
 
 createManagedProcess {
-  name = instanceName;
+  inherit instanceName;
+
   path = [ s6 ];
   foregroundProcess = "${s6}/bin/s6-svscan";
   args = [ scanDir ];

services-agnostic/sshd/default.nix

@@ -29,7 +29,6 @@ let
   user = instanceName;
 in
 createManagedProcess {
-  name = instanceName;
   inherit instanceName;
 
   initialize = ''

services-agnostic/supervisord/default.nix

@@ -12,8 +12,8 @@ let
   logFile = "${logDir}/${instanceName}.log";
 in
 createManagedProcess {
-  name = instanceName;
   inherit instanceName postInstall;
+
   initialize = ''
     mkdir -p ${logDir}
     ${initialize}

services-agnostic/svnserve/default.nix

@@ -12,8 +12,8 @@ let
   pidFile = "${runtimeDir}/${instanceName}.pid";
 in
 createManagedProcess {
-  name = instanceName;
   inherit instanceName postInstall;
+
   initialize = ''
     mkdir -p ${svnBaseDir}
     ${lib.optionalString (!forceDisableUserChange) ''