From ca97ea91ae3161fcd99b6a07004b0df50b90b06d Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 16 Aug 2024 08:21:47 +0200 Subject: [PATCH 1/3] csharp-ls: move to pkgs/by-name --- .../csharp-ls/default.nix => by-name/cs/csharp-ls/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/tools/language-servers/csharp-ls/default.nix => by-name/cs/csharp-ls/package.nix} (100%) diff --git a/pkgs/development/tools/language-servers/csharp-ls/default.nix b/pkgs/by-name/cs/csharp-ls/package.nix similarity index 100% rename from pkgs/development/tools/language-servers/csharp-ls/default.nix rename to pkgs/by-name/cs/csharp-ls/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4658573485ec..d43609da0e2b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -864,8 +864,6 @@ with pkgs; # Dotnet - csharp-ls = callPackage ../development/tools/language-servers/csharp-ls { }; - dotnetCorePackages = recurseIntoAttrs (callPackage ../development/compilers/dotnet {}); dotnet-sdk_6 = dotnetCorePackages.sdk_6_0; From 36f29a2229e45a96681e9e952ec1072c8895306e Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 16 Aug 2024 08:23:34 +0200 Subject: [PATCH 2/3] csharp-ls: clean derivation, add testVersion --- pkgs/by-name/cs/csharp-ls/package.nix | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/cs/csharp-ls/package.nix b/pkgs/by-name/cs/csharp-ls/package.nix index 5cae31845563..398a0f20f4a4 100644 --- a/pkgs/by-name/cs/csharp-ls/package.nix +++ b/pkgs/by-name/cs/csharp-ls/package.nix @@ -1,6 +1,8 @@ -{ lib -, buildDotnetGlobalTool -, dotnetCorePackages +{ + lib, + buildDotnetGlobalTool, + dotnetCorePackages, + nix-update-script, }: let inherit (dotnetCorePackages) sdk_8_0; @@ -15,13 +17,17 @@ buildDotnetGlobalTool rec { dotnet-sdk = sdk_8_0; dotnet-runtime = sdk_8_0; - meta = with lib; { + passthru.tests = { + updateScript = nix-update-script { }; + }; + + meta = { description = "Roslyn-based LSP language server for C#"; mainProgram = "csharp-ls"; homepage = "https://github.com/razzmatazz/csharp-language-server"; changelog = "https://github.com/razzmatazz/csharp-language-server/releases/tag/v${version}"; - license = licenses.mit; - platforms = platforms.unix; - maintainers = with maintainers; [ GaetanLepage ]; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ GaetanLepage ]; }; } From d46f91b13d9bdc3d82546d76b1983193bb1536eb Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 16 Aug 2024 08:28:31 +0200 Subject: [PATCH 3/3] csharp-ls: 0.14.0 -> 0.15.0 Diff: https://github.com/razzmatazz/csharp-language-server/compare/0.14.0...0.15.0 Changelog: https://github.com/razzmatazz/csharp-language-server/releases/tag/0.15.0 --- pkgs/by-name/cs/csharp-ls/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cs/csharp-ls/package.nix b/pkgs/by-name/cs/csharp-ls/package.nix index 398a0f20f4a4..75ad3c6aaf13 100644 --- a/pkgs/by-name/cs/csharp-ls/package.nix +++ b/pkgs/by-name/cs/csharp-ls/package.nix @@ -10,9 +10,9 @@ in buildDotnetGlobalTool rec { pname = "csharp-ls"; - version = "0.14.0"; + version = "0.15.0"; - nugetHash = "sha256-agcx7VPIqGhl3NzdGLPwXYJsRuvSjL4SdbNg9vFjIh4="; + nugetHash = "sha256-Fp1D2z4x2e85z4IO4xQentS7dbqhFT3e/BPZm0d5L5M="; dotnet-sdk = sdk_8_0; dotnet-runtime = sdk_8_0;