From 45fa146829167e6b45f46e131f01ae9b25c1ba15 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sat, 1 Apr 2017 21:24:08 -0500
Subject: [PATCH] git-imerge: 0.7.0 -> 1.0.0

---
 .../git-and-tools/git-imerge/default.nix      | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix b/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix
index 91180b33cde9..49856552aa3b 100644
--- a/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix
@@ -1,22 +1,20 @@
-{ stdenv, fetchurl, pythonPackages }:
+{ stdenv, fetchFromGitHub, pythonPackages }:
 
 stdenv.mkDerivation rec {
   name = "git-imerge-${version}";
-  version = "0.7.0";
+  version = "1.0.0";
 
-  src = fetchurl {
-    url = "https://github.com/mhagger/git-imerge/archive/${version}.tar.gz";
-    sha256 = "00nwn3rfhf15wsv01lfji5412d7yz827ric916lnyp662d6gx206";
+  src = fetchFromGitHub {
+    owner = "mhagger";
+    repo = "git-imerge";
+    rev = "v${version}";
+    sha256 = "1ylzxmbjfrzzxmcrbqzy1wv21npqj1r6cgl77a9n2zvsrz8zdb74";
   };
 
   buildInputs = [ pythonPackages.python pythonPackages.wrapPython ];
 
-  installPhase = ''
-    mkdir -p $out/bin
-    make install PREFIX=$out
-    wrapPythonPrograms
-  '';
-
+  makeFlags = "PREFIX= DESTDIR=$(out)" ; 
+ 
   meta = with stdenv.lib; {
     homepage = https://github.com/mhagger/git-imerge;
     description = "Perform a merge between two branches incrementally";