From acece1ffe5d5ba8d0897c45746691035a6c33744 Mon Sep 17 00:00:00 2001 From: emaryn <197520219+emaryn@users.noreply.github.com> Date: Tue, 10 Jun 2025 08:02:22 +0800 Subject: [PATCH] Revert "typst: Update typst packages in typst update script" --- pkgs/by-name/ty/typst/package.nix | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/pkgs/by-name/ty/typst/package.nix b/pkgs/by-name/ty/typst/package.nix index e7b3c02efe20..eda1ea51344f 100644 --- a/pkgs/by-name/ty/typst/package.nix +++ b/pkgs/by-name/ty/typst/package.nix @@ -5,9 +5,7 @@ installShellFiles, pkg-config, openssl, - writeShellScript, - nix-update, - gitMinimal, + nix-update-script, versionCheckHook, callPackage, }: @@ -62,25 +60,7 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckProgramArg = "--version"; passthru = { - updateScript = { - command = [ - (writeShellScript "update-typst.sh" '' - currentVersion=$(nix-instantiate --eval -E "with import ./. {}; typst.version or (lib.getVersion typst)" | tr -d '"') - ${lib.getExe nix-update} typst > /dev/null - latestVersion=$(nix-instantiate --eval -E "with import ./. {}; typst.version or (lib.getVersion typst)" | tr -d '"') - changes=() - if [[ "$currentVersion" != "$latestVersion" ]]; then - changes+=("{\"attrPath\":\"typst\",\"oldVersion\":\"$currentVersion\",\"newVersion\":\"$latestVersion\",\"files\":[\"pkgs/by-name/ty/typst/package.nix\"]}") - fi - maintainers/scripts/update-typst-packages.py --output pkgs/by-name/ty/typst/typst-packages-from-universe.toml > /dev/null - ${lib.getExe gitMinimal} diff --quiet HEAD -- pkgs/by-name/ty/typst/typst-packages-from-universe.toml || changes+=("{\"attrPath\":\"typstPackages\",\"oldVersion\":\"0\",\"newVersion\":\"1\",\"files\":[\"pkgs/by-name/ty/typst/typst-packages-from-universe.toml\"]}") - echo -n "[" - IFS=,; echo -n "''${changes[*]}" - echo "]" - '') - ]; - supportedFeatures = [ "commit" ]; - }; + updateScript = nix-update-script { }; packages = callPackage ./typst-packages.nix { }; withPackages = callPackage ./with-packages.nix { }; };