From 9e26668bb5acbf83274f12662be1bda6810f87d9 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Sat, 28 Dec 2024 03:19:50 +0200 Subject: [PATCH 1/2] raycast: add `archBuild`, refactor `passthru.updateScript` --- pkgs/by-name/ra/raycast/package.nix | 38 +++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/ra/raycast/package.nix b/pkgs/by-name/ra/raycast/package.nix index 6a5cb87b64c1..e88b0b630d65 100644 --- a/pkgs/by-name/ra/raycast/package.nix +++ b/pkgs/by-name/ra/raycast/package.nix @@ -3,9 +3,10 @@ stdenvNoCC, fetchurl, writeShellApplication, + cacert, curl, jq, - common-updater-scripts, + openssl, undmg, }: @@ -13,11 +14,20 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "raycast"; version = "1.88.3"; - src = fetchurl { - name = "Raycast.dmg"; - url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=universal"; - hash = "sha256-MOJlEUQHLDw8YeQC9sG5QLSO8qhgcWG8HtyRZCPHb+M="; - }; + src = + { + aarch64-darwin = fetchurl { + name = "Raycast.dmg"; + url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=arm"; + hash = "sha256-EeD9EcP4q85CjjZ7MrG9/ASlKl1x0/9q/S3ySNMv3XY="; + }; + x86_64-darwin = fetchurl { + name = "Raycast.dmg"; + url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=x86_64"; + hash = "sha256-Uxe3YNVmT41VB3ehxy/pKntIafWbzo6d1HuLJc12nkg="; + }; + } + .${stdenvNoCC.system} or (throw "raycast: ${stdenvNoCC.system} is unsupported."); dontPatch = true; dontConfigure = true; @@ -40,14 +50,26 @@ stdenvNoCC.mkDerivation (finalAttrs: { passthru.updateScript = lib.getExe (writeShellApplication { name = "raycast-update-script"; runtimeInputs = [ + cacert curl jq - common-updater-scripts + openssl ]; text = '' url=$(curl --silent "https://releases.raycast.com/releases/latest?build=universal") version=$(echo "$url" | jq -r '.version') - update-source-version raycast "$version" --file=./pkgs/by-name/ra/raycast/package.nix + + arm_url="https://releases.raycast.com/releases/$version/download?build=arm" + x86_url="https://releases.raycast.com/releases/$version/download?build=x86_64" + + arm_hash="sha256-$(curl -sL "$arm_url" | openssl dgst -sha256 -binary | openssl base64)" + x86_hash="sha256-$(curl -sL "$x86_url" | openssl dgst -sha256 -binary | openssl base64)" + + sed -i -E \ + -e 's|(version = )"[0-9]+\.[0-9]+\.[0-9]+";|\1"'"$version"'";|' \ + -e '/aarch64-darwin = fetchurl/,/};/ s|(hash = )"sha256-[A-Za-z0-9+/]+=";|\1"'"$arm_hash"'";|' \ + -e '/x86_64-darwin = fetchurl/,/};/ s|(hash = )"sha256-[A-Za-z0-9+/]+=";|\1"'"$x86_hash"'";|' \ + ./pkgs/by-name/ra/raycast/package.nix ''; }); From 625e9b07d80ae695739e4f241679c99058714431 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Sat, 28 Dec 2024 01:20:18 +0000 Subject: [PATCH 2/2] raycast: 1.88.3 -> 1.88.4 --- pkgs/by-name/ra/raycast/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ra/raycast/package.nix b/pkgs/by-name/ra/raycast/package.nix index e88b0b630d65..828ac219fd30 100644 --- a/pkgs/by-name/ra/raycast/package.nix +++ b/pkgs/by-name/ra/raycast/package.nix @@ -12,19 +12,19 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "raycast"; - version = "1.88.3"; + version = "1.88.4"; src = { aarch64-darwin = fetchurl { name = "Raycast.dmg"; url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=arm"; - hash = "sha256-EeD9EcP4q85CjjZ7MrG9/ASlKl1x0/9q/S3ySNMv3XY="; + hash = "sha256-q3pX/mOl/u9KMcAfvXm4giYKjnTB903N1ibubvaO9Uw="; }; x86_64-darwin = fetchurl { name = "Raycast.dmg"; url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=x86_64"; - hash = "sha256-Uxe3YNVmT41VB3ehxy/pKntIafWbzo6d1HuLJc12nkg="; + hash = "sha256-l61AVKx+aYmgnVK8d+by2pKiu1cIAueLipRjOzCvib4="; }; } .${stdenvNoCC.system} or (throw "raycast: ${stdenvNoCC.system} is unsupported.");