From 2bf6d009e06346b172980a57e9512ff29d016047 Mon Sep 17 00:00:00 2001 From: dish Date: Fri, 13 Mar 2026 13:27:17 -0400 Subject: [PATCH] [pkgs] delete caddyfile-language-server I upstreamed it --- neovim/languages/caddyfile.nix | 2 +- .../caddyfile-language-server/package.nix | 73 ------------------- 2 files changed, 1 insertion(+), 74 deletions(-) delete mode 100644 packages/caddyfile-language-server/package.nix diff --git a/neovim/languages/caddyfile.nix b/neovim/languages/caddyfile.nix index 2fb367f0..6e60f47b 100644 --- a/neovim/languages/caddyfile.nix +++ b/neovim/languages/caddyfile.nix @@ -26,7 +26,7 @@ # enable = true; # single_file_support = true; # cmd = [ - # (lib.meta.getExe inputs.self.packages.${pkgs.stdenv.system}.caddyfile-language-server) + # (lib.meta.getExe pkgs.caddyfile-language-server) # "--stdio" # ]; # root_markers = [ diff --git a/packages/caddyfile-language-server/package.nix b/packages/caddyfile-language-server/package.nix deleted file mode 100644 index de354fbb..00000000 --- a/packages/caddyfile-language-server/package.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - fetchPnpmDeps, - pnpm_8, - nodejs, - pnpmConfigHook, - makeBinaryWrapper, -}: -stdenv.mkDerivation (finalAttrs: { - pname = "caddyfile-language-server"; - version = "0.4.0"; - - src = fetchFromGitHub { - owner = "caddyserver"; - repo = "vscode-caddyfile"; - tag = "v${finalAttrs.version}"; - hash = "sha256-IusP9Z3e8mQ0mEhI1o1zIqPDB/i0pqlMfnt6M8bzb2w="; - }; - - pnpmWorkspaces = [ "@caddyserver/caddyfile-language-server" ]; - - pnpmDeps = fetchPnpmDeps { - inherit (finalAttrs) - pname - version - src - pnpmWorkspaces - ; - pnpm = pnpm_8; - fetcherVersion = 3; - hash = "sha256-D9kYFkmFlvg4r6vR9PHHAwF0qglHsTuRae0Z7CzDq1M="; - }; - - nativeBuildInputs = [ - pnpm_8 - pnpmConfigHook - nodejs - makeBinaryWrapper - ]; - - buildPhase = '' - runHook preBuild - - pnpm --filter=@caddyserver/caddyfile-language-server run build - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - rm -rf node_modules packages/server/node_modules - pnpm install --production --offline --force --filter=@caddyserver/caddyfile-language-server - mkdir -p $out/lib/node_modules/caddyfile-language-server/ - mv packages/server/dist/* $out/lib/node_modules/caddyfile-language-server/ - - makeWrapper ${lib.getExe nodejs} $out/bin/caddyfile-language-server \ - --add-flags "$out/lib/node_modules/caddyfile-language-server/index.js" - - runHook postInstall - ''; - - meta = { - changelog = "https://github.com/caddyserver/vscode-caddyfile/releases/tag/v${finalAttrs.version}"; - description = "Basic language server for caddyfile"; - homepage = "https://github.com/caddyserver/vscode-caddyfile"; - mainProgram = "caddyfile-language-server"; - maintainers = with lib.maintainers; [ pyrox0 ]; - platforms = lib.platforms.all; - }; -}) -- 2.51.2