Merge pull request #19677 from jgeerds/deis

deis: 1.13.0 -> 1.13.3
NixOS · Oct 19, 2016 · e376ed8 · e376ed8
2 parents 9803ad8 + c7d9de0
commit e376ed8
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 34 deletions.
diff --git 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,8 +18,20 @@ buildGoPackage rec {
     inherit rev;
     owner = "deis";
     repo = "deis";
-    sha256 = "1qv9lxqx7m18029lj8cw3k7jngvxs4iciwrypdy0gd2nnghc68sw";
+    sha256 = "15q44jyjms8fdmly0z4sn4ymf1dx6cmdavgixjixdj2wbjw0yi2p";
   };
 
-  goDeps = ./deps.nix;
+  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
+    ];
+  };
 }
diff --git a/pkgs/development/tools/deis/deps.nix b/pkgs/development/tools/deis/deps.nix