From 27bf1c0794e2a68f6c0ca42017b44e480619333a Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jascha@jgeerds.name>
Date: Wed, 19 Oct 2016 10:26:03 +0200
Subject: [PATCH 1/3] deis: Use Godeps workspace instead of deps.nix

---
 pkgs/development/tools/deis/default.nix |  4 +++-
 pkgs/development/tools/deis/deps.nix    | 29 -------------------------
 2 files changed, 3 insertions(+), 30 deletions(-)
 delete mode 100644 pkgs/development/tools/deis/deps.nix

diff --git a/pkgs/development/tools/deis/default.nix b/pkgs/development/tools/deis/default.nix
index 5c76fc69ac3..599353fb6d3 100644
--- a/pkgs/development/tools/deis/default.nix
+++ b/pkgs/development/tools/deis/default.nix
@@ -21,5 +21,7 @@ buildGoPackage rec {
     sha256 = "1qv9lxqx7m18029lj8cw3k7jngvxs4iciwrypdy0gd2nnghc68sw";
   };
 
-  goDeps = ./deps.nix;
+  preBuild = ''
+    export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace
+  '';
 }
diff --git a/pkgs/development/tools/deis/deps.nix b/pkgs/development/tools/deis/deps.nix
deleted file mode 100644
index 5a1b30a7e66..00000000000
--- a/pkgs/development/tools/deis/deps.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-[
-  {
-    goPackagePath = "gopkg.in/yaml.v2";
-    fetch = {
-      type = "git";
-      url = "https://gopkg.in/yaml.v2";
-      rev = "a83829b6f1293c91addabc89d0571c246397bbf4";
-      sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh";
-    };
-  }
-  {
-    goPackagePath = "github.com/docopt/docopt-go";
-    fetch = {
-      type = "git";
-      url = "https://github.com/docopt/docopt-go";
-      rev = "784ddc588536785e7299f7272f39101f7faccc3f";
-      sha256 = "0wwz48jl9fvl1iknvn9dqr4gfy1qs03gxaikrxxp9gry6773v3sj";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/crypto";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/crypto";
-      rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6";
-      sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa";
-    };
-  }
-]

From b6a616c0b9826b93d1afe672ca46ca298962e995 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jascha@jgeerds.name>
Date: Wed, 19 Oct 2016 11:16:43 +0200
Subject: [PATCH 2/3] deis: 1.13.0 -> 1.13.3

---
 pkgs/development/tools/deis/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/deis/default.nix b/pkgs/development/tools/deis/default.nix
index 599353fb6d3..3743609f042 100644
--- a/pkgs/development/tools/deis/default.nix
+++ b/pkgs/development/tools/deis/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "deis-${version}";
-  version = "1.13.0";
+  version = "1.13.3";
   rev = "v${version}";
-  
+
   goPackagePath = "github.com/deis/deis";
   subPackages = [ "client" ];
 
@@ -18,7 +18,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "deis";
     repo = "deis";
-    sha256 = "1qv9lxqx7m18029lj8cw3k7jngvxs4iciwrypdy0gd2nnghc68sw";
+    sha256 = "15q44jyjms8fdmly0z4sn4ymf1dx6cmdavgixjixdj2wbjw0yi2p";
   };
 
   preBuild = ''

From c7d9de0e390a14119b76379e8cb310eb520c1c65 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jascha@jgeerds.name>
Date: Wed, 19 Oct 2016 11:25:08 +0200
Subject: [PATCH 3/3] deis: Add derivatin metadata

---
 pkgs/development/tools/deis/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/development/tools/deis/default.nix b/pkgs/development/tools/deis/default.nix
index 3743609f042..fe4ec06322f 100644
--- a/pkgs/development/tools/deis/default.nix
+++ b/pkgs/development/tools/deis/default.nix
@@ -24,4 +24,14 @@ buildGoPackage rec {
   preBuild = ''
     export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace
   '';
+
+  meta = with stdenv.lib; {
+    homepage = https://deis.io;
+    description = "A command line utility used to interact with the Deis open source PaaS.";
+    license = licenses.asl20;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [
+      jgeerds
+    ];
+  };
 }