diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index fe92449220c4..66a892f13da5 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -786,7 +786,6 @@
./services/scheduling/atd.nix
./services/scheduling/cron.nix
./services/scheduling/fcron.nix
- ./services/scheduling/marathon.nix
./services/search/elasticsearch.nix
./services/search/elasticsearch-curator.nix
./services/search/hound.nix
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 98a1393fef98..4733e3f758b7 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -20,6 +20,7 @@ with lib;
(mkRemovedOptionModule [ "services" "chronos" ] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [ "services" "firefox" "syncserver" "user" ] "")
(mkRemovedOptionModule [ "services" "firefox" "syncserver" "group" ] "")
+ (mkRemovedOptionModule [ "services" "marathon" ] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [ "services" "mesos" ] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [ "services" "winstone" ] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [ "networking" "vpnc" ] "Use environment.etc.\"vpnc/service.conf\" instead.")
diff --git a/nixos/modules/services/scheduling/marathon.nix b/nixos/modules/services/scheduling/marathon.nix
deleted file mode 100644
index 2e0d20c64b23..000000000000
--- a/nixos/modules/services/scheduling/marathon.nix
+++ /dev/null
@@ -1,98 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-
- cfg = config.services.marathon;
-
-in {
-
- ###### interface
-
- options.services.marathon = {
- enable = mkOption {
- type = types.bool;
- default = false;
- description = ''
- Whether to enable the marathon mesos framework.
- '';
- };
-
- master = mkOption {
- type = types.str;
- default = "zk://${concatStringsSep "," cfg.zookeeperHosts}/mesos";
- example = "zk://1.2.3.4:2181,2.3.4.5:2181,3.4.5.6:2181/mesos";
- description = ''
- Mesos master address. See for details.
- '';
- };
-
- zookeeperHosts = mkOption {
- type = types.listOf types.str;
- default = [ "localhost:2181" ];
- example = [ "1.2.3.4:2181" "2.3.4.5:2181" "3.4.5.6:2181" ];
- description = ''
- ZooKeeper hosts' addresses.
- '';
- };
-
- user = mkOption {
- type = types.str;
- default = "marathon";
- example = "root";
- description = ''
- The user that the Marathon framework will be launched as. If the user doesn't exist it will be created.
- If you want to run apps that require root access or you want to launch apps using arbitrary users, that
- is using the `--mesos_user` flag then you need to change this to `root`.
- '';
- };
-
- httpPort = mkOption {
- type = types.int;
- default = 8080;
- description = ''
- Marathon listening port for HTTP connections.
- '';
- };
-
- extraCmdLineOptions = mkOption {
- type = types.listOf types.str;
- default = [ ];
- example = [ "--https_port=8443" "--zk_timeout=10000" "--marathon_store_timeout=2000" ];
- description = ''
- Extra command line options to pass to Marathon.
- See for all possible flags.
- '';
- };
-
- environment = mkOption {
- default = { };
- type = types.attrs;
- example = { JAVA_OPTS = "-Xmx512m"; MESOSPHERE_HTTP_CREDENTIALS = "username:password"; };
- description = ''
- Environment variables passed to Marathon.
- '';
- };
- };
-
- ###### implementation
-
- config = mkIf cfg.enable {
- systemd.services.marathon = {
- description = "Marathon Service";
- environment = cfg.environment;
- wantedBy = [ "multi-user.target" ];
- after = [ "network.target" "zookeeper.service" "mesos-master.service" "mesos-slave.service" ];
-
- serviceConfig = {
- ExecStart = "${pkgs.marathon}/bin/marathon --master ${cfg.master} --zk zk://${concatStringsSep "," cfg.zookeeperHosts}/marathon --http_port ${toString cfg.httpPort} ${concatStringsSep " " cfg.extraCmdLineOptions}";
- User = cfg.user;
- Restart = "always";
- RestartSec = "2";
- };
- };
-
- users.users.${cfg.user}.isSystemUser = true;
- };
-}