From 58332290833b3de7ba4f3638b81ab33ca31b157b Mon Sep 17 00:00:00 2001 From: Zexin Yuan Date: Fri, 4 Jul 2025 14:39:34 +0800 Subject: [PATCH 1/2] tailwindcss-language-server: 0.14.23 -> 0.14.24 --- pkgs/by-name/ta/tailwindcss-language-server/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ta/tailwindcss-language-server/package.nix b/pkgs/by-name/ta/tailwindcss-language-server/package.nix index a996e2d164a3..6390d6f974d3 100644 --- a/pkgs/by-name/ta/tailwindcss-language-server/package.nix +++ b/pkgs/by-name/ta/tailwindcss-language-server/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tailwindcss-language-server"; - version = "0.14.23"; + version = "0.14.24"; src = fetchFromGitHub { owner = "tailwindlabs"; repo = "tailwindcss-intellisense"; tag = "v${finalAttrs.version}"; - hash = "sha256-O97JkcTOe2HEb1MlJ82UPEHZgyV7dzoWOOtSnNcN13k="; + hash = "sha256-FlPrDoCGV7w3RBAZPP8gT/RGze9LDYQeAIVVPQA4Na4="; }; pnpmDeps = pnpm_9.fetchDeps { From 87405d273b0789342228865717285dd845e480ac Mon Sep 17 00:00:00 2001 From: Zexin Yuan Date: Fri, 4 Jul 2025 15:18:45 +0800 Subject: [PATCH 2/2] tailwindcss-language-server: use lts versions of nodejs --- .../tailwindcss-language-server/package.nix | 25 ++++++++----------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/ta/tailwindcss-language-server/package.nix b/pkgs/by-name/ta/tailwindcss-language-server/package.nix index 6390d6f974d3..bef1a40ee1bf 100644 --- a/pkgs/by-name/ta/tailwindcss-language-server/package.nix +++ b/pkgs/by-name/ta/tailwindcss-language-server/package.nix @@ -2,9 +2,8 @@ lib, stdenv, fetchFromGitHub, - nodejs_latest, + nodejs, pnpm_9, - cacert, nix-update-script, }: @@ -25,31 +24,27 @@ stdenv.mkDerivation (finalAttrs: { version src pnpmWorkspaces - prePnpmInstall ; hash = "sha256-SUEq20gZCiTDkFuNgMc5McHBPgW++8P9Q1MJb7a7pY8="; }; nativeBuildInputs = [ - nodejs_latest pnpm_9.configHook ]; - buildInputs = [ nodejs_latest ]; + buildInputs = [ + nodejs + ]; - pnpmWorkspaces = [ "@tailwindcss/language-server..." ]; - prePnpmInstall = '' - # Warning section for "pnpm@v8" - # https://pnpm.io/cli/install#--filter-package_selector - pnpm config set dedupe-peer-dependents false - export NODE_EXTRA_CA_CERTS="${cacert}/etc/ssl/certs/ca-bundle.crt" - ''; + pnpmWorkspaces = [ + "@tailwindcss/language-server..." + ]; + # Must build the "@tailwindcss/language-service" package. Dependency is linked via workspace by "pnpm" + # https://github.com/tailwindlabs/tailwindcss-intellisense/blob/v0.14.24/pnpm-lock.yaml#L71 buildPhase = '' runHook preBuild - # Must build the "@tailwindcss/language-service" package. Dependency is linked via workspace by "pnpm" - # (https://github.com/tailwindlabs/tailwindcss-intellisense/blob/%40tailwindcss/language-server%40v0.0.27/pnpm-lock.yaml#L47) pnpm --filter "@tailwindcss/language-server..." build runHook postBuild @@ -75,6 +70,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ happysalada ]; mainProgram = "tailwindcss-language-server"; - platforms = lib.platforms.all; + platforms = nodejs.meta.platforms; }; })