From d2b906c771917148df29969b2b1cc9bb33207650 Mon Sep 17 00:00:00 2001
From: Alexander Flatter <flatter@fastmail.fm>
Date: Tue, 24 Mar 2015 11:03:07 +0100
Subject: [PATCH 1/3] Add heroku-client

---
 pkgs/development/tools/heroku/default.nix | 18 ++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 20 insertions(+)
 create mode 100644 pkgs/development/tools/heroku/default.nix

diff --git a/pkgs/development/tools/heroku/default.nix b/pkgs/development/tools/heroku/default.nix
new file mode 100644
index 00000000000..d9767ee166c
--- /dev/null
+++ b/pkgs/development/tools/heroku/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, postgresql, ruby }:
+
+stdenv.mkDerivation rec {
+  version = "3.30.3";
+  name = "heroku-${version}";
+
+  src = fetchurl {
+    url = "https://s3.amazonaws.com/assets.heroku.com/heroku-client/heroku-client-${version}.tgz";
+    sha256 = "0m9l04syli4ripkh37lwk0hq4silnp830ddsk3ph77iymzh2iz1f";
+  };
+
+  installPhase = ''
+    mkdir -p $out
+    cp -R * $out/
+  '';
+
+  buildInputs = [ ruby postgresql ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 888b8bea781..cda6163037f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5287,6 +5287,8 @@ let
     inherit (perlPackages) LocaleGettext;
   };
 
+  heroku = callPackage ../development/tools/heroku { };
+
   hyenae = callPackage ../tools/networking/hyenae { };
 
   icmake = callPackage ../development/tools/build-managers/icmake { };

From be71c0871c7edebc72367b1ce1f95ea10af609df Mon Sep 17 00:00:00 2001
From: Alexander Flatter <flatter@fastmail.fm>
Date: Tue, 28 Apr 2015 17:02:33 +0200
Subject: [PATCH 2/3] Add meta information to heroku toolbelt

---
 lib/maintainers.nix                       | 2 ++
 pkgs/development/tools/heroku/default.nix | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 0d42ca79987..bbd89c74eb7 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -8,6 +8,7 @@
   abaldeau = "Andreas Baldeau <andreas@baldeau.net>";
   abbradar = "Nikolay Amiantov <ab@fmap.me>";
   aforemny = "Alexander Foremny <alexanderforemny@googlemail.com>";
+  aflatter = "Alexander Flatter <flatter@fastmail.fm>";
   aherrmann = "Andreas Herrmann <andreash87@gmx.ch>";
   ak = "Alexander Kjeldaas <ak@formalprivacy.com>";
   akc = "Anders Claesson <akc@akc.is>";
@@ -134,6 +135,7 @@
   meditans = "Carlo Nucera <meditans@gmail.com>";
   meisternu = "Matt Miemiec <meister@krutt.org>";
   michelk = "Michel Kuhlmann <michel@kuhlmanns.info>";
+  mirdhyn = "Merlin Gaillard <mirdhyn@gmail.com>";
   mschristiansen = "Mikkel Christiansen <mikkel@rheosystems.com>";
   modulistic = "Pablo Costa <modulistic@gmail.com>";
   mornfall = "Petr Ročkai <me@mornfall.net>";
diff --git a/pkgs/development/tools/heroku/default.nix b/pkgs/development/tools/heroku/default.nix
index d9767ee166c..a160e44b9ac 100644
--- a/pkgs/development/tools/heroku/default.nix
+++ b/pkgs/development/tools/heroku/default.nix
@@ -1,9 +1,17 @@
 { stdenv, fetchurl, postgresql, ruby }:
 
+with stdenv.lib;
 stdenv.mkDerivation rec {
   version = "3.30.3";
   name = "heroku-${version}";
 
+  meta = {
+    homepage = "https://toolbelt.heroku.com";
+    description = "Everything you need to get started using Heroku";
+    maintainers = with maintainers; [ aflatter mirdhyn ];
+    license = licenses.mit;
+  };
+
   src = fetchurl {
     url = "https://s3.amazonaws.com/assets.heroku.com/heroku-client/heroku-client-${version}.tgz";
     sha256 = "0m9l04syli4ripkh37lwk0hq4silnp830ddsk3ph77iymzh2iz1f";

From 7d9724057ca7c37a2dba246b48fc02a3c1329b79 Mon Sep 17 00:00:00 2001
From: Alexander Flatter <flatter@fastmail.fm>
Date: Tue, 28 Apr 2015 17:03:48 +0200
Subject: [PATCH 3/3] Update heroku toolbelt to 3.32.0

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

diff --git a/pkgs/development/tools/heroku/default.nix b/pkgs/development/tools/heroku/default.nix
index a160e44b9ac..df5f6454f6d 100644
--- a/pkgs/development/tools/heroku/default.nix
+++ b/pkgs/development/tools/heroku/default.nix
@@ -2,7 +2,7 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  version = "3.30.3";
+  version = "3.32.0";
   name = "heroku-${version}";
 
   meta = {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://s3.amazonaws.com/assets.heroku.com/heroku-client/heroku-client-${version}.tgz";
-    sha256 = "0m9l04syli4ripkh37lwk0hq4silnp830ddsk3ph77iymzh2iz1f";
+    sha256 = "1596zmnlwshx15xiccfskm71syrlm87jf40y2x0y7wn0vfcyis5s";
   };
 
   installPhase = ''