Skip to content

Commit ed6df6a

Browse files
authored
nodePackages.tailwindcss: drop and replace with alias to pkgs.tailwindcss (#364323)
2 parents ff5a272 + 50f5683 commit ed6df6a

File tree

5 files changed

+2
-200
lines changed

5 files changed

+2
-200
lines changed

pkgs/development/haskell-modules/configuration-nix.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1419,7 +1419,7 @@ self: super: builtins.intersectAttrs super {
14191419
tailwind = addBuildDepend
14201420
# Overrides for tailwindcss copied from:
14211421
# https://github.com/EmaApps/emanote/blob/master/nix/tailwind.nix
1422-
(pkgs.nodePackages.tailwindcss.overrideAttrs (oa: {
1422+
(pkgs.tailwindcss.overrideAttrs (oa: {
14231423
plugins = [
14241424
pkgs.nodePackages."@tailwindcss/aspect-ratio"
14251425
pkgs.nodePackages."@tailwindcss/forms"

pkgs/development/node-packages/aliases.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@ mapAliases {
183183
surge = pkgs.surge-cli; # Added 2023-09-08
184184
inherit (pkgs) svelte-language-server; # Added 2024-05-12
185185
swagger = throw "swagger was removed because it was broken and abandoned upstream"; # added 2023-09-09
186+
inherit (pkgs) tailwindcss; # added 2024-12-04
186187
teck-programmer = throw "teck-programmer was removed because it was broken and unmaintained"; # added 2024-08-23
187188
tedicross = throw "tedicross was removed because it was broken"; # added 2023-09-09
188189
inherit (pkgs) terser; # Added 2023-08-31

pkgs/development/node-packages/node-packages.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,6 @@
166166
, "speed-test"
167167
, "svelte-check"
168168
, "svgo"
169-
, "tailwindcss"
170169
, "tern"
171170
, "thelounge-plugin-closepms"
172171
, "thelounge-plugin-giphy"

pkgs/development/node-packages/node-packages.nix

Lines changed: 0 additions & 177 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkgs/development/node-packages/overrides.nix

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -258,27 +258,6 @@ final: prev: {
258258
name = "rush";
259259
};
260260

261-
tailwindcss = prev.tailwindcss.override {
262-
plugins = [ ];
263-
nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
264-
postInstall = ''
265-
nodePath=""
266-
for p in "$out" "${final.postcss}" $plugins; do
267-
nodePath="$nodePath''${nodePath:+:}$p/lib/node_modules"
268-
done
269-
wrapProgram "$out/bin/tailwind" \
270-
--prefix NODE_PATH : "$nodePath"
271-
wrapProgram "$out/bin/tailwindcss" \
272-
--prefix NODE_PATH : "$nodePath"
273-
unset nodePath
274-
'';
275-
passthru.tests = {
276-
simple-execution = callPackage ./package-tests/tailwindcss.nix {
277-
inherit (final) tailwindcss;
278-
};
279-
};
280-
};
281-
282261
thelounge-plugin-closepms = prev.thelounge-plugin-closepms.override {
283262
nativeBuildInputs = [ pkgs.node-pre-gyp ];
284263
};

0 commit comments

Comments
 (0)