From 31031577c1a0c763ae05f9533d408dcc0ea6e82f Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 28 Dec 2017 11:29:12 +0000
Subject: [PATCH 1/2] meld: 3.16.4 -> 3.18.0

---
 .../applications/version-management/meld/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix
index 05db6d964c3..d5bd24cf938 100644
--- a/pkgs/applications/version-management/meld/default.nix
+++ b/pkgs/applications/version-management/meld/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, fetchurl, itstool, python2Packages, intltool, wrapGAppsHook
+{ stdenv, fetchurl, itstool, python3Packages, intltool, wrapGAppsHook
 , libxml2, gobjectIntrospection, gtk3, gnome3, cairo, file
 }:
 
 
 let
-  minor = "3.16";
-  version = "${minor}.4";
-  inherit (python2Packages) python buildPythonApplication pycairo pygobject3;
+  minor = "3.18";
+  version = "${minor}.0";
+  inherit (python3Packages) python buildPythonApplication pycairo pygobject3;
 in buildPythonApplication rec {
   name = "meld-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/meld/${minor}/meld-${version}.tar.xz";
-    sha256 = "0rwflfkfnb9ydnk4k591x0il29d4dvz95cjs2f279blx64lgki4k";
+    sha256 = "0gi2jzgsrd5q2icyp6wphbn532ddg82nxhfxlffkniy7wnqmi0c4";
   };
 
   buildInputs = [
@@ -41,6 +41,8 @@ in buildPythonApplication rec {
 
   pythonPath = [ gtk3 ];
 
+  doCheck = false;
+
   meta = with stdenv.lib; {
     description = "Visual diff and merge tool";
     homepage = http://meldmerge.org/;

From 66a0ac9358de6007b2f91f39c248f44a78716724 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 8 Jan 2018 07:35:23 +0000
Subject: [PATCH 2/2] pythonPackages.rabbitvcs: disable tests

---
 pkgs/applications/version-management/rabbitvcs/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/version-management/rabbitvcs/default.nix b/pkgs/applications/version-management/rabbitvcs/default.nix
index 01929655081..2d77a9c3265 100644
--- a/pkgs/applications/version-management/rabbitvcs/default.nix
+++ b/pkgs/applications/version-management/rabbitvcs/default.nix
@@ -30,6 +30,8 @@ python2Packages.buildPythonApplication rec {
     wrapPythonProgramsIn $cli "$out $pythonPath"
   '';
 
+  doCheck = false;
+
   meta = {
     description = "Graphical tools for working with version control systems";
     homepage = http://rabbitvcs.org/;