From 4d09579e20ff0a0b1bf9bbb2f4f8d38cd029a27b Mon Sep 17 00:00:00 2001
From: Anton Desyatov <anton.dessiatov@gmail.com>
Date: Thu, 18 Apr 2019 01:01:46 +0700
Subject: [PATCH 1/2] maintainers: add anton-dessiatov

---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index de8d00f94337cc..3e7408b64a0a9f 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -365,6 +365,11 @@
     github = "ankhers";
     name = "Justin Wood";
   };
+  anton-dessiatov = {
+    email = "anton.dessiatov@gmail.com";
+    github = "anton-dessiatov";
+    name = "Anton Desyatov";
+  };
   Anton-Latukha = {
     email = "anton.latuka+nixpkgs@gmail.com";
     github = "Anton-Latukha";

From 1e3f2ecad1603403f414a2eeccfd5e0e1f9aea66 Mon Sep 17 00:00:00 2001
From: Anton Desyatov <anton.dessiatov@gmail.com>
Date: Thu, 18 Apr 2019 00:58:01 +0700
Subject: [PATCH 2/2] tilt: init at 0.7.13

---
 .../networking/cluster/tilt/default.nix       | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/applications/networking/cluster/tilt/default.nix

diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix
new file mode 100644
index 00000000000000..c4699a87ef6316
--- /dev/null
+++ b/pkgs/applications/networking/cluster/tilt/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  pname   = "tilt";
+  name    = "${pname}-${version}";
+  /* Do not use "dev" as a version. If you do, Tilt will consider itself
+     running in development environment and try to serve assets from the
+     source tree, which is not there once build completes.  */
+  version = "0.7.13";
+  rev = "67cd823b2a07c7bb2bcb919c0963e8f23e22d57e";
+
+  src = fetchFromGitHub {
+    owner  = "windmilleng";
+    repo   = "tilt";
+    rev    = "${rev}";
+    sha256 = "0cfmdd6wsczcmy6fkd418rvancx4qy1c3pzq9jbfsy4innhh51j7";
+  };
+
+  goPackagePath = "github.com/windmilleng/tilt";
+  subPackages = [ "cmd/tilt" ];
+
+  buildFlagsArray = ("-ldflags=-X main.version=${version} -X main.date=2019-04-18");
+
+  meta = with stdenv.lib; {
+    description = "Local development tool to manage your developer instance when your team deploys to Kubernetes in production";
+    homepage = https://tilt.dev/;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ anton-dessiatov ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2c27791d4855b1..9fd3799ba944d9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23330,6 +23330,8 @@ in
 
   terragrunt = callPackage ../applications/networking/cluster/terragrunt {};
 
+  tilt = callPackage ../applications/networking/cluster/tilt {};
+
   tetex = callPackage ../tools/typesetting/tex/tetex { libpng = libpng12; };
 
   tetra-gtk-theme = callPackage ../misc/themes/tetra { };