From 79c83d718e892756d40f7aaf2f712b345558e34e Mon Sep 17 00:00:00 2001 From: Mel Date: Tue, 29 Oct 2024 23:00:41 +0100 Subject: [PATCH 1/4] ycmd: correct gopls package and link path This fixes built-in Go completion support in vimPlugins.YouCompleteMe. Previously both an outdated package (gotools) and an outdated binary path were used when installing gopls into ycmd, silently breaking after an upstream update. Signed-off-by: Mel --- pkgs/by-name/yc/ycmd/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/yc/ycmd/package.nix b/pkgs/by-name/yc/ycmd/package.nix index 590055955881..92262a993b27 100644 --- a/pkgs/by-name/yc/ycmd/package.nix +++ b/pkgs/by-name/yc/ycmd/package.nix @@ -6,8 +6,8 @@ , python , withGodef ? true , godef -, withGotools ? true -, gotools +, withGopls ? true +, gopls , withRustAnalyzer ? true , rust-analyzer , withTypescript ? true @@ -80,10 +80,10 @@ stdenv.mkDerivation { TARGET=$out/lib/ycmd/third_party/godef mkdir -p $TARGET ln -sf ${godef}/bin/godef $TARGET - '' + lib.optionalString withGotools '' - TARGET=$out/lib/ycmd/third_party/go/src/golang.org/x/tools/cmd/gopls + '' + lib.optionalString withGopls '' + TARGET=$out/lib/ycmd/third_party/go/bin mkdir -p $TARGET - ln -sf ${gotools}/bin/gopls $TARGET + ln -sf ${gopls}/bin/gopls $TARGET '' + lib.optionalString withRustAnalyzer '' TARGET=$out/lib/ycmd/third_party/rust-analyzer mkdir -p $TARGET From 3e90066ad3276c9dc1599568ec0cd91cdb51f477 Mon Sep 17 00:00:00 2001 From: Mel Date: Thu, 31 Oct 2024 20:10:15 +0100 Subject: [PATCH 2/4] maintainers: add mel Signed-off-by: Mel --- maintainers/maintainer-list.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ddecf2a644bd..a26e5c1c7106 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -14701,6 +14701,14 @@ githubId = 8263431; name = "Matt Miemiec"; }; + mel = { + email = "mel@rnrd.eu"; + github = "melnary"; + githubId = 10659529; + matrix = "@mel:rnrd.eu"; + name = "Mel G."; + keys = [ { fingerprint = "D75A C286 ACA7 00B4 D8EC 377D 2082 F8EC 11CC 009B"; } ]; + }; melchips = { email = "truphemus.francois@gmail.com"; github = "melchips"; From 852e6fd7234e819d8a914c1e76027bc10b0a43f9 Mon Sep 17 00:00:00 2001 From: Mel Date: Thu, 31 Oct 2024 20:16:07 +0100 Subject: [PATCH 3/4] ycmd: replace maintainer siriobalmelli with mel Signed-off-by: Mel --- pkgs/by-name/yc/ycmd/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/yc/ycmd/package.nix b/pkgs/by-name/yc/ycmd/package.nix index 92262a993b27..1484fd64239c 100644 --- a/pkgs/by-name/yc/ycmd/package.nix +++ b/pkgs/by-name/yc/ycmd/package.nix @@ -105,7 +105,7 @@ stdenv.mkDerivation { mainProgram = "ycmd"; homepage = "https://github.com/ycm-core/ycmd"; license = licenses.gpl3; - maintainers = with maintainers; [ rasendubi lnl7 siriobalmelli ]; + maintainers = with maintainers; [ rasendubi lnl7 mel ]; platforms = platforms.all; }; } From 11de0087000d07297df8de28638eb0b7e610b7e4 Mon Sep 17 00:00:00 2001 From: Mel Date: Thu, 31 Oct 2024 20:18:26 +0100 Subject: [PATCH 4/4] vimPlugins.YouCompleteMe: add mel as maintainer Signed-off-by: Mel --- pkgs/applications/editors/vim/plugins/overrides.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index b97ec9349a3b..1b682954f6c1 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -3822,6 +3822,7 @@ in maintainers = with maintainers; [ marcweber jagajaga + mel ]; platforms = platforms.unix; };