From 76160b73ecf956953f1ccf7a8037a951c3335bef Mon Sep 17 00:00:00 2001
From: Langston Barrett <langston.barrett@gmail.com>
Date: Thu, 11 Aug 2016 06:03:57 +0000
Subject: [PATCH] fasd: 2015-03-29 -> 2016-08-11

change "git" to "unstable" (recommended by @FRidh)
---
 pkgs/tools/misc/fasd/default.nix | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/pkgs/tools/misc/fasd/default.nix b/pkgs/tools/misc/fasd/default.nix
index aa1fa8f3c6c9..b651caf5a5e7 100644
--- a/pkgs/tools/misc/fasd/default.nix
+++ b/pkgs/tools/misc/fasd/default.nix
@@ -1,16 +1,14 @@
-{ stdenv, fetchgit } :
+{ stdenv, fetchFromGitHub } :
 
-let
-  rev = "61ce53be996189e1c325916e45a7dc0aa89660e3";
-in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
+  pname = "fasd";
+  name = "${pname}-unstable-2016-08-11";
 
-  name = "fasd-git-2015-03-29";
-
-  src = fetchgit {
-    url = "https://github.com/clvv/fasd.git";
-    inherit rev;
-    sha256 = "1fd36ff065ae73de2d6b1bae2131c18c8c4dea98ca63d96b0396e8b291072b5e";
+  src = fetchFromGitHub {
+    owner = "clvv";
+    repo = "${pname}";
+    rev = "90b531a5daaa545c74c7d98974b54cbdb92659fc";
+    sha256 = "0i22qmhq3indpvwbxz7c472rdyp8grag55x7iyjz8gmyn8gxjc11";
   };
 
   installPhase = ''
@@ -18,9 +16,9 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = "https://github.com/clvv/fasd";
+    homepage = "https://github.com/clvv/${pname}";
     description = "Quick command-line access to files and directories for POSIX shells";
-    license = stdenv.lib.licenses.free; # https://github.com/clvv/fasd/blob/master/LICENSE
+    license = stdenv.lib.licenses.mit;
 
     longDescription = ''
       Fasd is a command-line productivity booster.