summary refs log tree commit diff
path: root/pkgs/applications/networking
diff options
context:
space:
mode:
authorArseniy Seroka <jagajaga@users.noreply.github.com>2016-01-30 21:45:32 +0300
committerArseniy Seroka <jagajaga@users.noreply.github.com>2016-01-30 21:45:32 +0300
commitf8c1d61f12ed9eb80065ff8a36d3736dff8c8351 (patch)
treeee1158f969d67c2ef1644df2fb5bd2f8497855d6 /pkgs/applications/networking
parent79f34bedc6b2044c0ad22d477d34329ce6c645a8 (diff)
parent40eaffdc1bf9947d9ed0adaa5b5801d98c79c367 (diff)
downloadnixlib-f8c1d61f12ed9eb80065ff8a36d3736dff8c8351.tar
nixlib-f8c1d61f12ed9eb80065ff8a36d3736dff8c8351.tar.gz
nixlib-f8c1d61f12ed9eb80065ff8a36d3736dff8c8351.tar.bz2
nixlib-f8c1d61f12ed9eb80065ff8a36d3736dff8c8351.tar.lz
nixlib-f8c1d61f12ed9eb80065ff8a36d3736dff8c8351.tar.xz
nixlib-f8c1d61f12ed9eb80065ff8a36d3736dff8c8351.tar.zst
nixlib-f8c1d61f12ed9eb80065ff8a36d3736dff8c8351.zip
Merge pull request #12673 from kamilchm/marathon
marathon: 0.8.1 -> 0.14.1
Diffstat (limited to 'pkgs/applications/networking')
-rw-r--r--pkgs/applications/networking/cluster/marathon/default.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/networking/cluster/marathon/default.nix b/pkgs/applications/networking/cluster/marathon/default.nix
index 4311b352ab96..8f3437644457 100644
--- a/pkgs/applications/networking/cluster/marathon/default.nix
+++ b/pkgs/applications/networking/cluster/marathon/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "marathon-${version}";
-  version = "0.8.1";
+  version = "0.14.1";
 
   src = fetchurl {
     url = "https://downloads.mesosphere.io/marathon/v${version}/marathon-${version}.tgz";
-    sha256 = "1g2z2c8p47rryyappwv0k3najb6bypvwgg7z9z8prvph2x6rafp6";
+    sha256 = "0vdl7jf7yhb985dj3v46qnqjv1zwfkyizlsyf9c5dq7khvxrp1l4";
   };
 
   buildInputs = [ makeWrapper jdk mesos ];
@@ -17,14 +17,14 @@ stdenv.mkDerivation rec {
 
     makeWrapper ${jdk.jre}/bin/java $out/bin/marathon \
       --add-flags "-Xmx512m -jar $out/libexec/marathon/${name}.jar" \
-      --prefix "MESOS_NATIVE_JAVA_LIBRARY" : "$MESOS_NATIVE_JAVA_LIBRARY"
+      --set "MESOS_NATIVE_JAVA_LIBRARY" "$MESOS_NATIVE_JAVA_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 ];
+    maintainers = with maintainers; [ rushmorem kamilchm ];
     platforms = platforms.linux;
   };
 }