From 8346e72a222025e500262eecca62d38e2dd3243a Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sun, 3 Jul 2016 16:55:51 +0100
Subject: [PATCH] direnv: 2.8.0 -> 2.9.0

---
 pkgs/tools/misc/direnv/default.nix | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix
index 305a32edadeb..b04420b083ea 100644
--- a/pkgs/tools/misc/direnv/default.nix
+++ b/pkgs/tools/misc/direnv/default.nix
@@ -1,21 +1,27 @@
-{ fetchurl, stdenv, go }:
+{ stdenv, fetchFromGitHub, go, bash }:
 
 stdenv.mkDerivation rec {
   name = "direnv-${version}";
-  version = "2.8.0";
+  version = "2.9.0";
 
-  src = fetchurl {
-    url = "http://github.com/zimbatm/direnv/archive/v${version}.tar.gz";
-    name = "direnv-${version}.tar.gz";
-    sha256 = "1l1kvjgpak7cc9s37qipfw6lybb4650zwd8kcdagm409gs89mil6";
+  src = fetchFromGitHub {
+    owner = "direnv";
+    repo = "direnv";
+    rev = "v${version}";
+    sha256 = "1zi4i2ds8xkbhfcpi52hca4lcwan9gf93bdmd2vwdsry16kn3f6k";
   };
 
   buildInputs = [ go ];
 
-  buildPhase = "make";
-  installPhase = "make install DESTDIR=$out";
+  buildPhase = ''
+    make BASH_PATH=${bash}
+  '';
 
-  meta = {
+  installPhase = ''
+    make install DESTDIR=$out
+  '';
+
+  meta = with stdenv.lib; {
     description = "A shell extension that manages your environment";
     longDescription = ''
       Once hooked into your shell direnv is looking for an .envrc file in your
@@ -29,8 +35,8 @@ stdenv.mkDerivation rec {
       environment variables.
     '';
     homepage = http://direnv.net;
-    license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.zimbatm ];
-    platforms = go.meta.platforms;
+    license = licenses.mit;
+    maintainers = with maintainers; [ zimbatm ];
+    inherit (go.meta) platforms;
   };
 }