From c585679a42a8376d6ad3d6869f2c1eba36ff0c90 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Sun, 16 Feb 2025 18:03:44 -0500 Subject: [PATCH] tailwindcss: make v4 default, move tailwindcss_3 to by-name --- pkgs/by-name/ta/tailwindcss/package.nix | 1 + .../default.nix => by-name/ta/tailwindcss_3/package.nix} | 3 +-- .../tools/tailwindcss => by-name/ta/tailwindcss_3}/update.sh | 0 pkgs/by-name/ta/tailwindcss_4/package.nix | 1 - pkgs/top-level/all-packages.nix | 2 -- 5 files changed, 2 insertions(+), 5 deletions(-) create mode 100644 pkgs/by-name/ta/tailwindcss/package.nix rename pkgs/{development/tools/tailwindcss/default.nix => by-name/ta/tailwindcss_3/package.nix} (97%) rename pkgs/{development/tools/tailwindcss => by-name/ta/tailwindcss_3}/update.sh (100%) diff --git a/pkgs/by-name/ta/tailwindcss/package.nix b/pkgs/by-name/ta/tailwindcss/package.nix new file mode 100644 index 000000000000..e981f68a88e5 --- /dev/null +++ b/pkgs/by-name/ta/tailwindcss/package.nix @@ -0,0 +1 @@ +{ tailwindcss_4 }: tailwindcss_4 diff --git a/pkgs/development/tools/tailwindcss/default.nix b/pkgs/by-name/ta/tailwindcss_3/package.nix similarity index 97% rename from pkgs/development/tools/tailwindcss/default.nix rename to pkgs/by-name/ta/tailwindcss_3/package.nix index f562cabd500f..2f43e836ff9a 100644 --- a/pkgs/development/tools/tailwindcss/default.nix +++ b/pkgs/by-name/ta/tailwindcss_3/package.nix @@ -3,7 +3,6 @@ fetchurl, stdenv, runCommand, - tailwindcss, }: let inherit (stdenv.hostPlatform) system; @@ -30,7 +29,7 @@ let .${system} or throwSystem; in stdenv.mkDerivation (finalAttrs: { - pname = "tailwindcss"; + pname = "tailwindcss_3"; version = "3.4.17"; src = fetchurl { diff --git a/pkgs/development/tools/tailwindcss/update.sh b/pkgs/by-name/ta/tailwindcss_3/update.sh similarity index 100% rename from pkgs/development/tools/tailwindcss/update.sh rename to pkgs/by-name/ta/tailwindcss_3/update.sh diff --git a/pkgs/by-name/ta/tailwindcss_4/package.nix b/pkgs/by-name/ta/tailwindcss_4/package.nix index 9c4128a4df5a..0032ca379844 100644 --- a/pkgs/by-name/ta/tailwindcss_4/package.nix +++ b/pkgs/by-name/ta/tailwindcss_4/package.nix @@ -5,7 +5,6 @@ versionCheckHook, autoPatchelfHook, makeWrapper, - tailwindcss_4, }: let version = "4.0.6"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a5d9e8ce8a00..9ee8e802c788 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1081,8 +1081,6 @@ with pkgs; ocamlPackages = ocaml-ng.ocamlPackages_4_14; }; - tailwindcss = callPackage ../development/tools/tailwindcss { }; - ufolint = with python3Packages; toPythonApplication ufolint; valeronoi = qt6Packages.callPackage ../tools/misc/valeronoi { };