From eea84e25e62d35ec0a3577900a0055b9849e53fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sat, 9 Jan 2021 23:14:49 +0100
Subject: [PATCH] pythonPackages.notmuch2: Disable tests

---
 pkgs/development/python-modules/notmuch/2.nix              | 7 ++++++-
 .../python-modules/python-language-server/default.nix      | 6 +-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/notmuch/2.nix b/pkgs/development/python-modules/notmuch/2.nix
index 171b8810870..970928e03f4 100644
--- a/pkgs/development/python-modules/notmuch/2.nix
+++ b/pkgs/development/python-modules/notmuch/2.nix
@@ -1,4 +1,5 @@
-{ lib, stdenv
+{ lib
+, stdenv
 , buildPythonPackage
 , notmuch
 , python
@@ -13,6 +14,10 @@ buildPythonPackage {
 
   buildInputs = [ python notmuch cffi ];
 
+  # no tests
+  doCheck = false;
+  pythonImportsCheck = [ "notmuch2" ];
+
   meta = with lib; {
     description = "Pythonic bindings for the notmuch mail database using CFFI";
     homepage = "https://notmuchmail.org/";
diff --git a/pkgs/development/python-modules/python-language-server/default.nix b/pkgs/development/python-modules/python-language-server/default.nix
index 85e55634806..dc3b33a6f53 100644
--- a/pkgs/development/python-modules/python-language-server/default.nix
+++ b/pkgs/development/python-modules/python-language-server/default.nix
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch, pythonOlder, isPy27
-=======
-{ stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, isPy27
->>>>>>> 15db9043242... pythonPackages.python-language-server: 0.34.1 -> 0.36.2
+{ stdenv, lib, buildPythonPackage, fetchFromGitHub, pythonOlder, isPy27
 , backports_functools_lru_cache, configparser, futures, future, jedi, pluggy, python-jsonrpc-server, flake8
 , pytestCheckHook, mock, pytestcov, coverage, setuptools, ujson, flaky
 , # Allow building a limited set of providers, e.g. ["pycodestyle"].