From c59f26f329839830b96696b3554fa599db84c045 Mon Sep 17 00:00:00 2001
From: Felix Uhl <github@mail.felix-uhl.de>
Date: Wed, 27 Mar 2024 22:46:13 +0100
Subject: [PATCH 1/3] ycmd: autoformat with nixpkgs-fmt

---
 pkgs/development/tools/misc/ycmd/default.nix | 25 ++++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix
index 4d5230f3159b..b675334c343a 100644
--- a/pkgs/development/tools/misc/ycmd/default.nix
+++ b/pkgs/development/tools/misc/ycmd/default.nix
@@ -1,9 +1,20 @@
-{ stdenv, lib, fetchFromGitHub, cmake, ninja, python
-, withGodef ? true, godef
-, withGotools? true, gotools
-, withTypescript ? true, typescript
-, abseil-cpp, boost, llvmPackages
-, fixDarwinDylibNames, Cocoa
+{ stdenv
+, lib
+, fetchFromGitHub
+, cmake
+, ninja
+, python
+, withGodef ? true
+, godef
+, withGotools ? true
+, gotools
+, withTypescript ? true
+, typescript
+, abseil-cpp
+, boost
+, llvmPackages
+, fixDarwinDylibNames
+, Cocoa
 }:
 
 stdenv.mkDerivation {
@@ -23,7 +34,7 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ cmake ninja ]
     ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
   buildInputs = with python.pkgs; with llvmPackages; [ abseil-cpp boost libllvm.all libclang.all ]
-    ++  [ jedi jedi-language-server pybind11 ]
+    ++ [ jedi jedi-language-server pybind11 ]
     ++ lib.optional stdenv.isDarwin Cocoa;
 
   buildPhase = ''

From fb037b6dacb31c1cf8737a8e9be634e6b0ca5e33 Mon Sep 17 00:00:00 2001
From: Felix Uhl <github@mail.felix-uhl.de>
Date: Wed, 27 Mar 2024 22:46:45 +0100
Subject: [PATCH 2/3] ycmd: Fix build on darwin

Fixes #299594, which was caused by a .so file in
ycmd/third_party/jedi_deps/jedi/test/examples/init_extension_module

Also reduces output size; we don't need to ship tests of dependencies.
---
 pkgs/development/tools/misc/ycmd/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix
index b675334c343a..986390a19dae 100644
--- a/pkgs/development/tools/misc/ycmd/default.nix
+++ b/pkgs/development/tools/misc/ycmd/default.nix
@@ -56,6 +56,7 @@ stdenv.mkDerivation {
   # symlink completion backends where ycmd expects them
   installPhase = ''
     rm -rf ycmd/tests
+    find third_party -type d -name "test" -exec rm -rf {} +
 
     chmod +x ycmd/__main__.py
     sed -i "1i #!${python.interpreter}\

From 33d886c0116dd1eb5443df26fa705929eb7c84fb Mon Sep 17 00:00:00 2001
From: Felix Uhl <github@mail.felix-uhl.de>
Date: Wed, 27 Mar 2024 22:54:49 +0100
Subject: [PATCH 3/3] ycmd: Migrate to by-name

---
 .../tools/misc/ycmd/default.nix => by-name/yc/ycmd/package.nix} | 0
 pkgs/top-level/all-packages.nix                                 | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/{development/tools/misc/ycmd/default.nix => by-name/yc/ycmd/package.nix} (100%)

diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/by-name/yc/ycmd/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/ycmd/default.nix
rename to pkgs/by-name/yc/ycmd/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 818a3c4f5e7b..6aaf49f06597 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20115,7 +20115,7 @@ with pkgs;
 
   yams = callPackage ../applications/audio/yams { };
 
-  ycmd = callPackage ../development/tools/misc/ycmd {
+  ycmd = callPackage ../by-name/yc/ycmd/package.nix {
     inherit (darwin.apple_sdk.frameworks) Cocoa;
     python = python3;
   };