diff options
| -rw-r--r-- | lib/maintainers.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/misc/ids.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/module-list.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/services/scheduling/marathon.nix | 58 | ||||
| -rw-r--r-- | pkgs/applications/networking/cluster/marathon/default.nix | 30 | ||||
| -rw-r--r-- | pkgs/tools/misc/cutecom/default.nix | 18 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
7 files changed, 113 insertions, 0 deletions
diff --git a/lib/maintainers.nix b/lib/maintainers.nix index d913a28c999de..89ab1f5c3cfe6 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -159,6 +159,7 @@ roelof = "Roelof Wobben <rwobben@hotmail.com>"; romildo = "José Romildo Malaquias <malaquias@gmail.com>"; rszibele = "Richard Szibele <richard_szibele@hotmail.com>"; + rushmorem = "Rushmore Mushambi <rushmore@webenchanter.com>"; rycee = "Robert Helgesson <robert@rycee.net>"; sander = "Sander van der Burg <s.vanderburg@tudelft.nl>"; schristo = "Scott Christopher <schristopher@konputa.com>"; diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index f3cda7b954167..390bab907b372 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -178,6 +178,7 @@ nylon = 168; apache-kafka = 169; panamax = 170; + marathon = 171; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 8ce1c6c20a364..e0255bbbe28e6 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -315,6 +315,7 @@ ./services/scheduling/chronos.nix ./services/scheduling/cron.nix ./services/scheduling/fcron.nix + ./services/scheduling/marathon.nix ./services/search/elasticsearch.nix ./services/search/solr.nix ./services/security/clamav.nix diff --git a/nixos/modules/services/scheduling/marathon.nix b/nixos/modules/services/scheduling/marathon.nix new file mode 100644 index 0000000000000..8513d1174c388 --- /dev/null +++ b/nixos/modules/services/scheduling/marathon.nix @@ -0,0 +1,58 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.marathon; + +in { + + ###### interface + + options.services.marathon = { + enable = mkOption { + description = "Whether to enable the marathon mesos framework."; + default = false; + type = types.uniq types.bool; + }; + + httpPort = mkOption { + description = "Marathon listening port"; + default = 8080; + type = types.int; + }; + + master = mkOption { + description = "Marathon mesos master zookeeper address"; + default = "zk://${head cfg.zookeeperHosts}/mesos"; + type = types.str; + }; + + zookeeperHosts = mkOption { + description = "Marathon mesos zookepper addresses"; + default = [ "localhost:2181" ]; + type = types.listOf types.str; + }; + }; + + ###### implementation + + config = mkIf cfg.enable { + systemd.services.marathon = { + description = "Marathon Service"; + wantedBy = [ "multi-user.target" ]; + after = [ "network-interfaces.target" "zookeeper.service" "mesos-master.service" "mesos-slave.service" ]; + + serviceConfig = { + ExecStart = "${pkgs.marathon}/bin/marathon --master ${cfg.master} --zk zk://${head cfg.zookeeperHosts}/marathon"; + User = "marathon"; + }; + }; + + users.extraUsers.marathon = { + uid = config.ids.uids.marathon; + description = "Marathon mesos framework user"; + }; + }; +} diff --git a/pkgs/applications/networking/cluster/marathon/default.nix b/pkgs/applications/networking/cluster/marathon/default.nix new file mode 100644 index 0000000000000..36ce79aaf3417 --- /dev/null +++ b/pkgs/applications/networking/cluster/marathon/default.nix @@ -0,0 +1,30 @@ +{ stdenv, makeWrapper, jdk, mesos, fetchurl }: + +stdenv.mkDerivation rec { + name = "marathon-v${version}"; + version = "0.8.0"; + + src = fetchurl { + url = "https://downloads.mesosphere.com/marathon/v${version}/marathon-${version}.tgz"; + sha256 = "794c915e205aebd8273f2b40c6faea1517fc683cdc0169194c4a67ce8779fa41"; + }; + + buildInputs = [ makeWrapper jdk mesos ]; + + installPhase = '' + mkdir -p $out/{bin,libexec/marathon} + cp target/scala-*/marathon*.jar $out/libexec/marathon/${name}.jar + + makeWrapper ${jdk.jre}/bin/java $out/bin/marathon \ + --add-flags "-Xmx512m -jar $out/libexec/marathon/${name}.jar" \ + --prefix "MESOS_NATIVE_LIBRARY" : "$MESOS_NATIVE_LIBRARY" + ''; + + meta = with stdenv.lib; { + homepage = https://mesosphere.github.io/marathon; + description = "Cluster-wide init and control system for services in cgroups or Docker containers."; + license = licenses.asl20; + maintainers = with maintainers; [ rushmorem ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/cutecom/default.nix b/pkgs/tools/misc/cutecom/default.nix new file mode 100644 index 0000000000000..37d5b6cbc7fe9 --- /dev/null +++ b/pkgs/tools/misc/cutecom/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, qt4, cmake }: + +stdenv.mkDerivation rec { + name = "cutecom-0.22.0"; + src = fetchurl { + url = "http://cutecom.sourceforge.net/${name}.tar.gz"; + sha256 = "199fvl463nyn77r3nm8xgzgifs28j5759kkcnc5xbwww2nk20rhv"; + }; + buildInputs = [qt4 cmake]; + + meta = { + description = "A graphical serial terminal"; + version = "0.22.0"; + homepage = http://cutecom.sourceforge.net/; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = [ stdenv.lib.maintainers.bennofs ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c43979a880f24..aed64994cee08 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9807,6 +9807,8 @@ let imagemagick = imagemagick; }; + cutecom = callPackage ../tools/misc/cutecom { }; + cvs = callPackage ../applications/version-management/cvs { }; cvsps = callPackage ../applications/version-management/cvsps { }; @@ -10013,6 +10015,8 @@ let magit = callPackage ../applications/editors/emacs-modes/magit { }; + marathon = callPackage ../applications/networking/cluster/marathon { }; + maudeMode = callPackage ../applications/editors/emacs-modes/maude { }; metaweblog = callPackage ../applications/editors/emacs-modes/metaweblog { }; |