From 9b68f4272c4ba390715f119630ef18b414f21b5f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 17 Oct 2016 22:10:44 +0200
Subject: [PATCH] git-cola: 2.5 -> 2.8

---
 .../git-and-tools/git-cola/default.nix           | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
index 77c2f45bbd5..cf7f6b82ce2 100644
--- a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
@@ -1,16 +1,18 @@
-{ stdenv, fetchurl, python, pythonPackages, makeWrapper, gettext }:
+{ stdenv, fetchurl, pythonPackages, makeWrapper, gettext, git }:
 
-pythonPackages.buildPythonApplication rec {
+let
+  inherit (pythonPackages) buildPythonApplication pyqt4 sip pyinotify python mock;
+in buildPythonApplication rec {
   name = "git-cola-${version}";
-  version = "2.5";
+  version = "2.8";
 
   src = fetchurl {
     url = "https://github.com/git-cola/git-cola/archive/v${version}.tar.gz";
-    sha256 = "0ybjmlwm1plnvqi20y91ci7sgldzwlwn86vyyn9a157h7lf4ngb8";
+    sha256 = "19ff7i0h5fznrkm17lp3xkxwkq27whhiil6y6bm16b1wny5hjqlr";
   };
 
-  buildInputs = [ makeWrapper gettext ];
-  propagatedBuildInputs = with pythonPackages; [ pyqt4 sip pyinotify ];
+  buildInputs = [ git makeWrapper gettext ];
+  propagatedBuildInputs = [ pyqt4 sip pyinotify ];
 
   # HACK: wrapPythonPrograms adds 'import sys; sys.argv[0] = "git-cola"', but
   # "import __future__" must be placed above that. This removes the argv[0] line.
@@ -26,6 +28,8 @@ pythonPackages.buildPythonApplication rec {
     }'
   '';
 
+  doCheck = false;
+
   meta = with stdenv.lib; {
     homepage = https://github.com/git-cola/git-cola;
     description = "A sleek and powerful Git GUI";