From 01d301b7d4a380a43005041597258239a53239d8 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Wed, 13 Aug 2025 00:00:20 +0900 Subject: [PATCH] shaperglot-cli: 0-unstable-2025-08-11 -> 1.1.0 - Switch to a stable version now that the upstream git tag and CLI version are synchronized. ref: https://github.com/googlefonts/shaperglot/commit/69add91ca4c6306cae5497e93c8ad96d7c2f83be - The current git revision is the same as 1.1.0, so the source hash is unchanged. --- pkgs/by-name/sh/shaperglot-cli/package.nix | 25 +++++++++------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/sh/shaperglot-cli/package.nix b/pkgs/by-name/sh/shaperglot-cli/package.nix index a7bf716f8e93..a7061dfef4a3 100644 --- a/pkgs/by-name/sh/shaperglot-cli/package.nix +++ b/pkgs/by-name/sh/shaperglot-cli/package.nix @@ -2,19 +2,18 @@ lib, fetchFromGitHub, rustPlatform, - _experimental-update-script-combinators, - unstableGitUpdater, + versionCheckHook, nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "shaperglot-cli"; - version = "0-unstable-2025-08-11"; + version = "1.1.0"; src = fetchFromGitHub { owner = "googlefonts"; repo = "shaperglot"; - rev = "b7ba56e583e89a1c169f4ef7c3419e4e76e00974"; + tag = "v${finalAttrs.version}"; hash = "sha256-XFzsUzHa4KsyDWlOKlWHBNimn1hzdrtCPe+lFrs0EDc="; }; @@ -29,6 +28,10 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; doInstallCheck = true; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = "--version"; installCheckPhase = '' runHook preInstallCheck @@ -39,22 +42,14 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; passthru = { - updateScript = _experimental-update-script-combinators.sequence [ - (unstableGitUpdater { - branch = "main"; - # Git tag differs from CLI version: https://github.com/googlefonts/shaperglot/issues/138 - hardcodeZeroVersion = true; - }) - (nix-update-script { - # Updating `cargoHash` - extraArgs = [ "--version=skip" ]; - }) - ]; + updateScript = nix-update-script { }; }; meta = { description = "Test font files for language support"; homepage = "https://github.com/googlefonts/shaperglot"; + # The CHANGELOG.md file exists in this repository but is not actually used. + changelog = "https://github.com/googlefonts/shaperglot/releases/tag/v${finalAttrs.version}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ kachick