From d241d22daad106419c897d6c17a0f70bbbf768a6 Mon Sep 17 00:00:00 2001 From: Amadej Kastelic Date: Tue, 6 May 2025 21:47:23 +0200 Subject: [PATCH 1/2] ryubing: change upstream of updater.sh --- pkgs/by-name/ry/ryubing/updater.sh | 30 +++++------------------------- 1 file changed, 5 insertions(+), 25 deletions(-) diff --git a/pkgs/by-name/ry/ryubing/updater.sh b/pkgs/by-name/ry/ryubing/updater.sh index 49de0f8f21eb..a851801cccea 100755 --- a/pkgs/by-name/ry/ryubing/updater.sh +++ b/pkgs/by-name/ry/ryubing/updater.sh @@ -4,34 +4,14 @@ set -euo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" -# provide a github token so you don't get rate limited -# if you use gh cli you can use: -# `export GITHUB_TOKEN="$(cat ~/.config/gh/config.yml | yq '.hosts."github.com".oauth_token' -r)"` -# or just set your token by hand: -# `read -s -p "Enter your token: " GITHUB_TOKEN; export GITHUB_TOKEN` -# (we use read so it doesn't show in our shell history and in secret mode so the token you paste isn't visible) -if [ -z "${GITHUB_TOKEN:-}" ]; then - echo "no GITHUB_TOKEN provided - you could meet API request limiting" >&2 -fi - -# or provide the new version manually -# manually modify and uncomment or export these env vars in your shell so they're accessable within the script -# make sure you don't commit your changes here -# -# NEW_VERSION="" -# COMMIT="" - +# If NEW_VERSION or COMMIT are not set, fetch the latest version if [ -z ${NEW_VERSION+x} ] && [ -z ${COMMIT+x} ]; then - RELEASE_DATA=$( - curl -s -H "Accept: application/vnd.github.v3+json" \ - ${GITHUB_TOKEN:+ -H "Authorization: bearer $GITHUB_TOKEN"} \ - https://api.github.com/repos/Ryubing/Ryujinx/releases - ) - if [ -z "$RELEASE_DATA" ] || [[ $RELEASE_DATA =~ "rate limit exceeded" ]]; then + RELEASE_DATA=$(curl -s "https://git.ryujinx.app/api/v4/projects/1/repository/tags?order_by=updated&sort=desc") + if [ -z "$RELEASE_DATA" ] || [[ $RELEASE_DATA =~ "imposed ratelimits" ]]; then echo "failed to get release job data" >&2 exit 1 fi - NEW_VERSION=$(echo "$RELEASE_DATA" | jq -r '.[0].name') + NEW_VERSION=$(echo "$RELEASE_DATA" | jq -r '[.[] | select(.name | startswith("Canary") | not)][0].name') fi OLD_VERSION="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./package.nix)" @@ -47,7 +27,7 @@ fi cd ../../../.. if [[ "${1-default}" != "--deps-only" ]]; then - SHA="$(nix-prefetch-git https://github.com/Ryubing/Ryujinx --rev "$NEW_VERSION" --quiet | jq -r '.sha256')" + SHA="$(nix-prefetch-git https://git.ryujinx.app/ryubing/ryujinx --rev "$NEW_VERSION" --quiet | jq -r '.sha256')" SRI=$(nix --experimental-features nix-command hash to-sri "sha256:$SHA") update-source-version ryubing "$NEW_VERSION" "$SRI" fi From 2eb016262b2f306b62620cf4cdfadd17db145564 Mon Sep 17 00:00:00 2001 From: Amadej Kastelic Date: Tue, 6 May 2025 21:48:13 +0200 Subject: [PATCH 2/2] ryubing: 1.2.86 -> 1.3.1 https://git.ryujinx.app/ryubing/ryujinx/-/releases/1.3.1 --- pkgs/by-name/ry/ryubing/deps.json | 18 +++++++++--------- pkgs/by-name/ry/ryubing/package.nix | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/ry/ryubing/deps.json b/pkgs/by-name/ry/ryubing/deps.json index 9d5a449410d2..e6281013c0ea 100644 --- a/pkgs/by-name/ry/ryubing/deps.json +++ b/pkgs/by-name/ry/ryubing/deps.json @@ -795,9 +795,9 @@ "hash": "sha256-NHGzMcYduuYJjduIlf8M8zSQQuJcXAEaMNmKIqAgs3w=" }, { - "pname": "Ryujinx.Graphics.Nvdec.Dependencies", - "version": "5.0.3-build14", - "hash": "sha256-+ff+tlWggY+qZTBJroOOphRpOjBDg5cQgwGtVOTiqRQ=" + "pname": "Ryujinx.Graphics.Nvdec.Dependencies.AllArch", + "version": "6.1.2-build3", + "hash": "sha256-Glhvv00ZbrbB+Z4PMSTsmiP14HZDonp611s1gXGuyqI=" }, { "pname": "Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK", @@ -946,8 +946,8 @@ }, { "pname": "System.CodeDom", - "version": "9.0.0", - "hash": "sha256-578lcBgswW0eM16r0EnJzfGodPx86RxxFoZHc2PSzsw=" + "version": "9.0.2", + "hash": "sha256-hNhCSyuD9/teTgFuX4zrBn/LWlijczwrMqv+r3/yfHI=" }, { "pname": "System.Collections", @@ -991,8 +991,8 @@ }, { "pname": "System.IO.Hashing", - "version": "9.0.0", - "hash": "sha256-k6Pdndm5fTD6CB1QsQfP7G+2h4B30CWIsuvjHuBg3fc=" + "version": "9.0.2", + "hash": "sha256-CI1z3rCDA2XnYE7hA1Hh6+rPkdIRAcswCXu/Pbaavck=" }, { "pname": "System.IO.Pipelines", @@ -1011,8 +1011,8 @@ }, { "pname": "System.Management", - "version": "9.0.0", - "hash": "sha256-UyLO5dgNVC7rBT1S6o/Ix6EQGlVTSWUQtVC+/cyTkfQ=" + "version": "9.0.2", + "hash": "sha256-7FhGnAYgoJnPcHy+HbVdK/fD8ICSLAttLtueTLBoWZc=" }, { "pname": "System.Memory", diff --git a/pkgs/by-name/ry/ryubing/package.nix b/pkgs/by-name/ry/ryubing/package.nix index a3f1951ef483..bfecc76db70f 100644 --- a/pkgs/by-name/ry/ryubing/package.nix +++ b/pkgs/by-name/ry/ryubing/package.nix @@ -30,14 +30,14 @@ buildDotnetModule rec { pname = "ryubing"; - version = "1.2.86"; + version = "1.3.1"; src = fetchFromGitLab { domain = "git.ryujinx.app"; owner = "Ryubing"; repo = "Ryujinx"; tag = version; - hash = "sha256-Goxg2+zaKaqbGv5q/ril4TBtfTbPEYEwQQ/M6NlEpus="; + hash = "sha256-MFZIFoMc80b2xTjKiHaabToftk3BZUP/Sr/V5q6rjpw="; }; nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin [