From 4111d41c0b2b86c5b935f2ba61cd1806a797a1a9 Mon Sep 17 00:00:00 2001 From: Hugh Mandalidis Date: Tue, 10 Sep 2024 21:19:31 +1000 Subject: [PATCH 1/2] maintainers: add hughmandalidis --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index dfcbe955346b..41f9005cbc97 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8604,6 +8604,12 @@ githubId = 1592375; name = "Walter Huf"; }; + hughmandalidis = { + name = "Hugh Mandalidis"; + email = "mandalidis.hugh@gmail.com"; + github = "ThanePatrol"; + githubId = 23148089; + }; hughobrien = { email = "github@hughobrien.ie"; github = "hughobrien"; From 3a238a1f8bb71f819f073b546bc1f0e756fbe300 Mon Sep 17 00:00:00 2001 From: Hugh Mandalidis Date: Tue, 10 Sep 2024 21:32:32 +1000 Subject: [PATCH 2/2] thrift-ls: change binary name to mimic upstream --- pkgs/by-name/th/thrift-ls/package.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/th/thrift-ls/package.nix b/pkgs/by-name/th/thrift-ls/package.nix index b41880c6a97d..9eba51c0b680 100644 --- a/pkgs/by-name/th/thrift-ls/package.nix +++ b/pkgs/by-name/th/thrift-ls/package.nix @@ -17,6 +17,10 @@ buildGoModule rec { vendorHash = "sha256-YoZ2dku84065Ygh9XU6dOwmCkuwX0r8a0Oo8c1HPsS4="; + postInstall = '' + mv $out/bin/thrift-ls $out/bin/thriftls + ''; + ldflags = [ "-s" "-w" @@ -26,7 +30,10 @@ buildGoModule rec { description = "Thrift Language Server"; homepage = "https://github.com/joyme123/thrift-ls"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ callumio ]; - mainProgram = "thrift-ls"; + maintainers = with lib.maintainers; [ + callumio + hughmandalidis + ]; + mainProgram = "thriftls"; }; }