From be4dd4cb0c258a973abd74f65e9540e8f332b95e Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 22 Mar 2025 10:14:51 -0500 Subject: [PATCH 1/3] 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 ''; }; From b5511f001cf9f8a19ec4c3eecbac3df5784c8a48 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 22 Mar 2025 10:18:29 -0500 Subject: [PATCH 2/3] yabai: 7.1.11 -> 7.1.12 Changelog: https://github.com/koekeishiya/yabai/blob/v7.1.12/CHANGELOG.md --- pkgs/by-name/ya/yabai/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ya/yabai/package.nix b/pkgs/by-name/ya/yabai/package.nix index 6645d57b675a..173ebaae2d9d 100644 --- a/pkgs/by-name/ya/yabai/package.nix +++ b/pkgs/by-name/ya/yabai/package.nix @@ -14,7 +14,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "yabai"; - version = "7.1.11"; + version = "7.1.12"; src = finalAttrs.passthru.sources.${stdenv.hostPlatform.system} @@ -66,13 +66,13 @@ stdenv.mkDerivation (finalAttrs: { # See the comments on https://github.com/NixOS/nixpkgs/pull/188322 for more information. "aarch64-darwin" = fetchzip { url = "https://github.com/koekeishiya/yabai/releases/download/v${finalAttrs.version}/yabai-v${finalAttrs.version}.tar.gz"; - hash = "sha256-WyoVGuCotiGpSxpq9hXSTnto4k945FeL+4+DlBp6MhA="; + hash = "sha256-2zmEFyJ+zntjnO6rCxE7duG1LUAvSKLwZzAA3wLwKBU="; }; "x86_64-darwin" = fetchFromGitHub { owner = "koekeishiya"; repo = "yabai"; rev = "v${finalAttrs.version}"; - hash = "sha256-r2uPzozDPH97k3IiweU7Hefhnzm9/TJfC+5p/GiJ+T0="; + hash = "sha256-KTiyP1mpxTXOZedwzh1bwKdBgRjWJqPLETZ8Iyv0pl0="; }; }; From 3ec83ae5ddc72460b7d462f9231ce354ebd5769f Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sun, 23 Mar 2025 09:30:10 -0500 Subject: [PATCH 3/3] yabai: 7.1.12 -> 7.1.13 Changelog: https://github.com/koekeishiya/yabai/blob/v7.1.13/CHANGELOG.md --- pkgs/by-name/ya/yabai/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ya/yabai/package.nix b/pkgs/by-name/ya/yabai/package.nix index 173ebaae2d9d..34b189174fb5 100644 --- a/pkgs/by-name/ya/yabai/package.nix +++ b/pkgs/by-name/ya/yabai/package.nix @@ -14,7 +14,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "yabai"; - version = "7.1.12"; + version = "7.1.13"; src = finalAttrs.passthru.sources.${stdenv.hostPlatform.system} @@ -66,13 +66,13 @@ stdenv.mkDerivation (finalAttrs: { # See the comments on https://github.com/NixOS/nixpkgs/pull/188322 for more information. "aarch64-darwin" = fetchzip { url = "https://github.com/koekeishiya/yabai/releases/download/v${finalAttrs.version}/yabai-v${finalAttrs.version}.tar.gz"; - hash = "sha256-2zmEFyJ+zntjnO6rCxE7duG1LUAvSKLwZzAA3wLwKBU="; + hash = "sha256-1/fPBLbC6wcgQAX/soCCVeIUXXm124RnxTJJc/7ayzo="; }; "x86_64-darwin" = fetchFromGitHub { owner = "koekeishiya"; repo = "yabai"; rev = "v${finalAttrs.version}"; - hash = "sha256-KTiyP1mpxTXOZedwzh1bwKdBgRjWJqPLETZ8Iyv0pl0="; + hash = "sha256-6yCMd7+RBqRj3OjnAwm3Ex4CVKVFPWyWdeMqXFaHZlM="; }; };