From 8ac073a0e128f1121c00ea25119cf55c6ffed8ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 17 Feb 2021 23:11:49 +0100
Subject: [PATCH] pythonPackages.nbdime: disable failing test

---
 pkgs/development/python-modules/nbdime/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/nbdime/default.nix b/pkgs/development/python-modules/nbdime/default.nix
index 299cfc87024c..1c1e52b5a79d 100644
--- a/pkgs/development/python-modules/nbdime/default.nix
+++ b/pkgs/development/python-modules/nbdime/default.nix
@@ -49,7 +49,7 @@ buildPythonPackage rec {
     "test_filter_cmd_invalid_filter"
     "test_inline_merge"
     "test_interrogate_filter_no_repo"
-    "test_merge_input_strategy_inline_source_conflict"
+    "test_merge"
   ];
 
   nativeBuildInputs = [ setuptools_scm ];