From 1f67443319e231ea70d1a5d7e4b8b0e0b67ea4d9 Mon Sep 17 00:00:00 2001
From: Ryan Burns <rtburns@protonmail.com>
Date: Wed, 29 Jul 2020 21:54:49 -0700
Subject: [PATCH 1/2] cmake-language-server: fix test error on macOS

This should fix Hydra's Darwin test failures for this package.
See https://github.com/regen100/cmake-language-server/pull/24
---
 pkgs/development/tools/cmake-language-server/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/tools/cmake-language-server/default.nix b/pkgs/development/tools/cmake-language-server/default.nix
index a01c0372ded9..4dc1375df04c 100644
--- a/pkgs/development/tools/cmake-language-server/default.nix
+++ b/pkgs/development/tools/cmake-language-server/default.nix
@@ -1,6 +1,7 @@
 { stdenv, buildPythonApplication, fetchFromGitHub
 , poetry, pygls, pyparsing
 , cmake, pytest, pytest-datadir
+, fetchpatch
 }:
 
 buildPythonApplication rec {
@@ -15,6 +16,12 @@ buildPythonApplication rec {
     sha256 = "0vz7bjxkk0phjhz3h9kj6yr7wnk3g7lqmkqraa0kw12mzcfck837";
   };
 
+  # can be removed after v0.1.2
+  patches = stdenv.lib.optional stdenv.isDarwin (fetchpatch {
+    url = "https://github.com/regen100/cmake-language-server/pull/24.patch";
+    sha256 = "1id8wpmyc7djyqasb5g9z9i3jipcdb4sirn4cpx2v8xmdn9khdnz";
+  });
+
   postPatch = ''
     substituteInPlace pyproject.toml \
       --replace 'pygls = "^0.8.1"' 'pygls = "^0.9.0"'

From cccd2f0d2c48db3a6ca0f3ab297d0eccf28c59ba Mon Sep 17 00:00:00 2001
From: Ryan Burns <rtburns@protonmail.com>
Date: Thu, 30 Jul 2020 23:54:27 -0700
Subject: [PATCH 2/2] Use specific commit patch

---
 pkgs/development/tools/cmake-language-server/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/cmake-language-server/default.nix b/pkgs/development/tools/cmake-language-server/default.nix
index 4dc1375df04c..628bb31fbe93 100644
--- a/pkgs/development/tools/cmake-language-server/default.nix
+++ b/pkgs/development/tools/cmake-language-server/default.nix
@@ -18,8 +18,8 @@ buildPythonApplication rec {
 
   # can be removed after v0.1.2
   patches = stdenv.lib.optional stdenv.isDarwin (fetchpatch {
-    url = "https://github.com/regen100/cmake-language-server/pull/24.patch";
-    sha256 = "1id8wpmyc7djyqasb5g9z9i3jipcdb4sirn4cpx2v8xmdn9khdnz";
+    url = "https://github.com/regen100/cmake-language-server/commit/0ec120f39127f25898ab110b43819e3e9becb8a3.patch";
+    sha256 = "1xbmarvsvzd61fnlap4qscnijli2rw2iqr7cyyvar2jd87z6sfp0";
   });
 
   postPatch = ''