From be4dd4cb0c258a973abd74f65e9540e8f332b95e Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 22 Mar 2025 10:14:51 -0500 Subject: [PATCH] yabai: make updateScript work with `nix-update --use-update-script` --- pkgs/by-name/ya/yabai/package.nix | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/ya/yabai/package.nix b/pkgs/by-name/ya/yabai/package.nix index 9d63a1c773d5..6645d57b675a 100644 --- a/pkgs/by-name/ya/yabai/package.nix +++ b/pkgs/by-name/ya/yabai/package.nix @@ -77,21 +77,9 @@ stdenv.mkDerivation (finalAttrs: { }; updateScript = writeShellScript "update-yabai" '' - set -o errexit - export PATH="${ - lib.makeBinPath [ - curl - jq - common-updater-scripts - ] - }" - NEW_VERSION=$(curl --silent https://api.github.com/repos/koekeishiya/yabai/releases/latest | jq '.tag_name | ltrimstr("v")' --raw-output) - if [[ "${finalAttrs.version}" = "$NEW_VERSION" ]]; then - echo "The new version same as the old version." - exit 0 - fi + NEW_VERSION=$(${lib.getExe curl} --silent https://api.github.com/repos/koekeishiya/yabai/releases/latest | ${lib.getExe jq} '.tag_name | ltrimstr("v")' --raw-output) for platform in ${lib.escapeShellArgs finalAttrs.meta.platforms}; do - update-source-version "yabai" "$NEW_VERSION" --ignore-same-version --source-key="sources.$platform" + ${lib.getExe' common-updater-scripts "update-source-version"} "yabai" "$NEW_VERSION" --ignore-same-version --source-key="sources.$platform" done ''; };