From 50f5683d8c8534c2f125f76b5ba6d4fa22ad4fc6 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 4 Dec 2024 15:08:39 -0500 Subject: [PATCH] nodePackages.tailwindcss: drop and replace with alias to pkgs.tailwindcss --- .../haskell-modules/configuration-nix.nix | 2 +- pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 177 ------------------ pkgs/development/node-packages/overrides.nix | 21 --- 5 files changed, 2 insertions(+), 200 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 8b9e8e4fbe23..f2415d204dbe 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1419,7 +1419,7 @@ self: super: builtins.intersectAttrs super { tailwind = addBuildDepend # Overrides for tailwindcss copied from: # https://github.com/EmaApps/emanote/blob/master/nix/tailwind.nix - (pkgs.nodePackages.tailwindcss.overrideAttrs (oa: { + (pkgs.tailwindcss.overrideAttrs (oa: { plugins = [ pkgs.nodePackages."@tailwindcss/aspect-ratio" pkgs.nodePackages."@tailwindcss/forms" diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index d187b9ee4378..868052db7aec 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -182,6 +182,7 @@ mapAliases { surge = pkgs.surge-cli; # Added 2023-09-08 inherit (pkgs) svelte-language-server; # Added 2024-05-12 swagger = throw "swagger was removed because it was broken and abandoned upstream"; # added 2023-09-09 + inherit (pkgs) tailwindcss; # added 2024-12-04 teck-programmer = throw "teck-programmer was removed because it was broken and unmaintained"; # added 2024-08-23 tedicross = throw "tedicross was removed because it was broken"; # added 2023-09-09 inherit (pkgs) terser; # Added 2023-08-31 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index f990a692b0f1..9e41935ad8cd 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -167,7 +167,6 @@ , "speed-test" , "svelte-check" , "svgo" -, "tailwindcss" , "tern" , "thelounge-plugin-closepms" , "thelounge-plugin-giphy" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 2371cf2b48a0..7479e1a25865 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -75210,183 +75210,6 @@ in bypassCache = true; reconstructLock = true; }; - tailwindcss = nodeEnv.buildNodePackage { - name = "tailwindcss"; - packageName = "tailwindcss"; - version = "3.4.12"; - src = fetchurl { - url = "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.12.tgz"; - sha512 = "Htf/gHj2+soPb9UayUNci/Ja3d8pTmu9ONTfh4QY8r3MATTZOzmv6UYWF7ZwikEIC8okpfqmGqrmDehua8mF8w=="; - }; - dependencies = [ - sources."@alloc/quick-lru-5.2.0" - sources."@cspotcode/source-map-support-0.8.1" - sources."@isaacs/cliui-8.0.2" - (sources."@jridgewell/gen-mapping-0.3.5" // { - dependencies = [ - sources."@jridgewell/trace-mapping-0.3.25" - ]; - }) - sources."@jridgewell/resolve-uri-3.1.2" - sources."@jridgewell/set-array-1.2.1" - sources."@jridgewell/sourcemap-codec-1.5.0" - sources."@jridgewell/trace-mapping-0.3.9" - sources."@nodelib/fs.scandir-2.1.5" - sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.7.26" - sources."@swc/counter-0.1.3" - sources."@swc/helpers-0.5.13" - sources."@swc/types-0.1.12" - sources."@swc/wasm-1.7.26" - sources."@tsconfig/node10-1.0.11" - sources."@tsconfig/node12-1.0.11" - sources."@tsconfig/node14-1.0.3" - sources."@tsconfig/node16-1.0.4" - sources."@types/node-22.5.5" - sources."acorn-8.12.1" - sources."acorn-walk-8.3.4" - sources."ansi-regex-5.0.1" - sources."ansi-styles-6.2.1" - sources."any-promise-1.3.0" - sources."anymatch-3.1.3" - sources."arg-5.0.2" - sources."balanced-match-1.0.2" - sources."binary-extensions-2.3.0" - sources."brace-expansion-2.0.1" - sources."braces-3.0.3" - sources."camelcase-css-2.0.1" - (sources."chokidar-3.6.0" // { - dependencies = [ - sources."glob-parent-5.1.2" - ]; - }) - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."commander-4.1.1" - sources."create-require-1.1.1" - sources."cross-spawn-7.0.3" - sources."cssesc-3.0.0" - sources."didyoumean-1.2.2" - sources."diff-4.0.2" - sources."dlv-1.1.3" - sources."eastasianwidth-0.2.0" - sources."emoji-regex-9.2.2" - (sources."fast-glob-3.3.2" // { - dependencies = [ - sources."glob-parent-5.1.2" - ]; - }) - sources."fastq-1.17.1" - sources."fill-range-7.1.1" - sources."foreground-child-3.3.0" - sources."function-bind-1.1.2" - sources."glob-10.4.5" - sources."glob-parent-6.0.2" - sources."hasown-2.0.2" - sources."is-binary-path-2.1.0" - sources."is-core-module-2.15.1" - sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" - sources."is-glob-4.0.3" - sources."is-number-7.0.0" - sources."isexe-2.0.0" - sources."jackspeak-3.4.3" - sources."jiti-1.21.6" - sources."lilconfig-2.1.0" - sources."lines-and-columns-1.2.4" - sources."lru-cache-10.4.3" - sources."make-error-1.3.6" - sources."merge2-1.4.1" - sources."micromatch-4.0.8" - sources."minimatch-9.0.5" - sources."minipass-7.1.2" - sources."mz-2.7.0" - sources."nanoid-3.3.7" - sources."normalize-path-3.0.0" - sources."object-assign-4.1.1" - sources."object-hash-3.0.0" - sources."package-json-from-dist-1.0.0" - sources."path-key-3.1.1" - sources."path-parse-1.0.7" - sources."path-scurry-1.11.1" - sources."picocolors-1.1.0" - sources."picomatch-2.3.1" - sources."pify-2.3.0" - sources."pirates-4.0.6" - sources."postcss-8.4.47" - sources."postcss-import-15.1.0" - sources."postcss-js-4.0.1" - (sources."postcss-load-config-4.0.2" // { - dependencies = [ - sources."lilconfig-3.1.2" - ]; - }) - sources."postcss-nested-6.2.0" - sources."postcss-selector-parser-6.1.2" - sources."postcss-value-parser-4.2.0" - sources."queue-microtask-1.2.3" - sources."read-cache-1.0.0" - sources."readdirp-3.6.0" - sources."resolve-1.22.8" - sources."reusify-1.0.4" - sources."run-parallel-1.2.0" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."signal-exit-4.1.0" - sources."source-map-js-1.2.1" - sources."string-width-5.1.2" - (sources."string-width-cjs-4.2.3" // { - dependencies = [ - sources."emoji-regex-8.0.0" - sources."strip-ansi-6.0.1" - ]; - }) - (sources."strip-ansi-7.1.0" // { - dependencies = [ - sources."ansi-regex-6.1.0" - ]; - }) - sources."strip-ansi-cjs-6.0.1" - sources."sucrase-3.35.0" - sources."supports-preserve-symlinks-flag-1.0.0" - sources."thenify-3.3.1" - sources."thenify-all-1.6.0" - sources."to-regex-range-5.0.1" - sources."ts-interface-checker-0.1.13" - (sources."ts-node-10.9.2" // { - dependencies = [ - sources."arg-4.1.3" - ]; - }) - sources."tslib-2.7.0" - sources."typescript-5.6.2" - sources."undici-types-6.19.8" - sources."util-deprecate-1.0.2" - sources."v8-compile-cache-lib-3.0.1" - sources."which-2.0.2" - sources."wrap-ansi-8.1.0" - (sources."wrap-ansi-cjs-7.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."emoji-regex-8.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - ]; - }) - sources."yaml-2.5.1" - sources."yn-3.1.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "A utility-first CSS framework for rapidly building custom user interfaces."; - homepage = "https://tailwindcss.com"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; tern = nodeEnv.buildNodePackage { name = "tern"; packageName = "tern"; diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index c770df51c1d1..814ce34f85e9 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -258,27 +258,6 @@ final: prev: { name = "rush"; }; - tailwindcss = prev.tailwindcss.override { - plugins = [ ]; - nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; - postInstall = '' - nodePath="" - for p in "$out" "${final.postcss}" $plugins; do - nodePath="$nodePath''${nodePath:+:}$p/lib/node_modules" - done - wrapProgram "$out/bin/tailwind" \ - --prefix NODE_PATH : "$nodePath" - wrapProgram "$out/bin/tailwindcss" \ - --prefix NODE_PATH : "$nodePath" - unset nodePath - ''; - passthru.tests = { - simple-execution = callPackage ./package-tests/tailwindcss.nix { - inherit (final) tailwindcss; - }; - }; - }; - thelounge-plugin-closepms = prev.thelounge-plugin-closepms.override { nativeBuildInputs = [ pkgs.node-pre-gyp ]; };