Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ycmd: correct gopls package and link path #352222

Merged
merged 4 commits into from
Jan 24, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14701,6 +14701,14 @@
githubId = 8263431;
name = "Matt Miemiec";
};
mel = {
email = "[email protected]";
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 = "[email protected]";
github = "melchips";
Expand Down
1 change: 1 addition & 0 deletions pkgs/applications/editors/vim/plugins/overrides.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3822,6 +3822,7 @@ in
maintainers = with maintainers; [
marcweber
jagajaga
mel
];
platforms = platforms.unix;
};
Expand Down
12 changes: 6 additions & 6 deletions pkgs/by-name/yc/ycmd/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
, python
, withGodef ? true
, godef
, withGotools ? true
, gotools
, withGopls ? true
, gopls
, withRustAnalyzer ? true
, rust-analyzer
, withTypescript ? true
Expand Down Expand Up @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
ln -sf ${gopls}/bin/gopls $TARGET
ln -sf ${lib.getExe gopls} $TARGET

'' + lib.optionalString withRustAnalyzer ''
TARGET=$out/lib/ycmd/third_party/rust-analyzer
mkdir -p $TARGET
Expand All @@ -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;
};
}