From c585679a42a8376d6ad3d6869f2c1eba36ff0c90 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Sun, 16 Feb 2025 18:03:44 -0500 Subject: [PATCH 1/3] 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 { }; From 1ea38ae206f7152fffb35f816139098db17512d1 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Sun, 16 Feb 2025 18:09:19 -0500 Subject: [PATCH 2/3] tailwindcss_4: add adamcstephens as maintainer --- pkgs/by-name/ta/tailwindcss_4/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ta/tailwindcss_4/package.nix b/pkgs/by-name/ta/tailwindcss_4/package.nix index 0032ca379844..388a39759bb4 100644 --- a/pkgs/by-name/ta/tailwindcss_4/package.nix +++ b/pkgs/by-name/ta/tailwindcss_4/package.nix @@ -70,7 +70,10 @@ stdenv.mkDerivation { homepage = "https://tailwindcss.com/blog/tailwindcss-v4"; license = lib.licenses.mit; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; - maintainers = [ lib.maintainers.adamjhf ]; + maintainers = with lib.maintainers; [ + adamcstephens + adamjhf + ]; mainProgram = "tailwindcss"; platforms = lib.platforms.darwin ++ lib.platforms.linux; }; From 285bd8dd46ff90b5572cdbf51e6658eacc780b17 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Sun, 16 Feb 2025 18:16:53 -0500 Subject: [PATCH 3/3] tailwindcss_[34]: split and fix updater scripts --- pkgs/by-name/ta/tailwindcss_3/update.sh | 14 +++++++------- pkgs/by-name/ta/tailwindcss_4/update.sh | 12 ++++++------ 2 files changed, 13 insertions(+), 13 deletions(-) mode change 100644 => 100755 pkgs/by-name/ta/tailwindcss_4/update.sh diff --git a/pkgs/by-name/ta/tailwindcss_3/update.sh b/pkgs/by-name/ta/tailwindcss_3/update.sh index b3a9ccf37819..1a5f68d74f07 100755 --- a/pkgs/by-name/ta/tailwindcss_3/update.sh +++ b/pkgs/by-name/ta/tailwindcss_3/update.sh @@ -1,27 +1,27 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl gnused jq nix-prefetch +#!nix-shell -i bash -p common-updater-scripts gnused jq nix-prefetch set -eou pipefail ROOT="$(dirname "$(readlink -f "$0")")" -CURRENT_VERSION=$(nix-instantiate --eval --strict --json -A tailwindcss.version . | jq -r .) -LATEST_VERSION=$(curl --fail --silent https://api.github.com/repos/tailwindlabs/tailwindcss/releases/latest | jq --raw-output .tag_name | sed 's/v//') -sed -i "s/version = \".*\"/version = \"${LATEST_VERSION}\"/" "$ROOT/default.nix" +CURRENT_VERSION=$(nix-instantiate --eval --strict --json -A tailwindcss_3.version . | jq -r .) +LATEST_VERSION=$(list-git-tags --url=https://github.com/tailwindlabs/tailwindcss | rg 'v3[0-9\.]*$' | sed -e 's/^v//' | sort -V | tail -n 1) +sed -i "s/version = \".*\"/version = \"${LATEST_VERSION}\"/" "$ROOT/package.nix" if [ "$CURRENT_VERSION" = "$LATEST_VERSION" ]; then - echo "tailwindcss already at latest version $CURRENT_VERSION, exiting" + echo "tailwindcss_3 already at latest version $CURRENT_VERSION, exiting" exit 0 fi function updatePlatform() { NIXPLAT=$1 TAILWINDPLAT=$2 - echo "Updating tailwindcss for $NIXPLAT" + echo "Updating tailwindcss_3 for $NIXPLAT" URL="https://github.com/tailwindlabs/tailwindcss/releases/download/v${LATEST_VERSION}/tailwindcss-${TAILWINDPLAT}" HASH=$(nix hash to-sri --type sha256 "$(nix-prefetch-url --type sha256 "$URL")") - sed -i "s,$NIXPLAT = \"sha256.*\",$NIXPLAT = \"${HASH}\"," "$ROOT/default.nix" + sed -i "s,$NIXPLAT = \"sha256.*\",$NIXPLAT = \"${HASH}\"," "$ROOT/package.nix" } updatePlatform aarch64-darwin macos-arm64 diff --git a/pkgs/by-name/ta/tailwindcss_4/update.sh b/pkgs/by-name/ta/tailwindcss_4/update.sh old mode 100644 new mode 100755 index bcf057e6e9b9..3f50e10768e1 --- a/pkgs/by-name/ta/tailwindcss_4/update.sh +++ b/pkgs/by-name/ta/tailwindcss_4/update.sh @@ -1,27 +1,27 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl gnused jq nix-prefetch +#!nix-shell -i bash -p common-updater-scripts gnused jq nix-prefetch set -eou pipefail ROOT="$(dirname "$(readlink -f "$0")")" CURRENT_VERSION=$(nix-instantiate --eval --strict --json -A tailwindcss.version . | jq -r .) -LATEST_VERSION=$(curl --fail --silent https://api.github.com/repos/tailwindlabs/tailwindcss/releases/latest | jq --raw-output .tag_name | sed 's/v//') -sed -i "s/version = \".*\"/version = \"${LATEST_VERSION}\"/" "$ROOT/default.nix" +LATEST_VERSION=$(list-git-tags --url=https://github.com/tailwindlabs/tailwindcss | rg 'v4[0-9\.]*$' | sed -e 's/^v//' | sort -V | tail -n 1) +sed -i "s/version = \".*\"/version = \"${LATEST_VERSION}\"/" "$ROOT/package.nix" if [ "$CURRENT_VERSION" = "$LATEST_VERSION" ]; then - echo "tailwindcss already at latest version $CURRENT_VERSION, exiting" + echo "tailwindcss_4 already at latest version $CURRENT_VERSION, exiting" exit 0 fi function updatePlatform() { NIXPLAT=$1 TAILWINDPLAT=$2 - echo "Updating tailwindcss for $NIXPLAT" + echo "Updating tailwindcss_4 for $NIXPLAT" URL="https://github.com/tailwindlabs/tailwindcss/releases/download/v${LATEST_VERSION}/tailwindcss-${TAILWINDPLAT}" HASH=$(nix hash to-sri --type sha256 "$(nix-prefetch-url --type sha256 "$URL")") - sed -i "s,$NIXPLAT = \"sha256.*\",$NIXPLAT = \"${HASH}\"," "$ROOT/default.nix" + sed -i "s,$NIXPLAT = \"sha256.*\",$NIXPLAT = \"${HASH}\"," "$ROOT/package.nix" } updatePlatform aarch64-darwin macos-arm64