From b00705196878fb0d05c66cdae25488765f4ed124 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Tue, 20 Feb 2024 21:09:42 +0800 Subject: [PATCH] zls: move to by-name --- .../tools/language-servers => by-name/zl}/zls/deps.nix | 0 .../zls/default.nix => by-name/zl/zls/package.nix} | 4 +--- pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) rename pkgs/{development/tools/language-servers => by-name/zl}/zls/deps.nix (100%) rename pkgs/{development/tools/language-servers/zls/default.nix => by-name/zl/zls/package.nix} (94%) diff --git a/pkgs/development/tools/language-servers/zls/deps.nix b/pkgs/by-name/zl/zls/deps.nix similarity index 100% rename from pkgs/development/tools/language-servers/zls/deps.nix rename to pkgs/by-name/zl/zls/deps.nix diff --git a/pkgs/development/tools/language-servers/zls/default.nix b/pkgs/by-name/zl/zls/package.nix similarity index 94% rename from pkgs/development/tools/language-servers/zls/default.nix rename to pkgs/by-name/zl/zls/package.nix index 408bb69f64b6e..b685a66a2b082 100644 --- a/pkgs/development/tools/language-servers/zls/default.nix +++ b/pkgs/by-name/zl/zls/package.nix @@ -21,9 +21,7 @@ stdenv.mkDerivation (finalAttrs: { "-Dversion_data_path=${zig_0_13.src}/doc/langref.html.in" ]; - nativeBuildInputs = [ - zig_0_13.hook - ]; + nativeBuildInputs = [ zig_0_13.hook ]; postPatch = '' ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cec23a431dbe1..4bc4773b4895f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16731,8 +16731,6 @@ with pkgs; vscode-langservers-extracted = callPackage ../development/tools/language-servers/vscode-langservers-extracted { }; - zls = callPackage ../development/tools/language-servers/zls { }; - ansible-later = callPackage ../tools/admin/ansible/later.nix { }; ansible-lint = callPackage ../tools/admin/ansible/lint.nix { };