diff options
Diffstat (limited to 'pkgs/by-name/ry')
| -rw-r--r-- | pkgs/by-name/ry/rye/Cargo.lock | 2 | ||||
| -rw-r--r-- | pkgs/by-name/ry/rye/package.nix | 8 | ||||
| -rw-r--r-- | pkgs/by-name/ry/ryujinx/package.nix | 6 | ||||
| -rwxr-xr-x | pkgs/by-name/ry/ryujinx/updater.sh | 6 |
4 files changed, 13 insertions, 9 deletions
diff --git a/pkgs/by-name/ry/rye/Cargo.lock b/pkgs/by-name/ry/rye/Cargo.lock index e1a1be7c9809..1d828aa7aeca 100644 --- a/pkgs/by-name/ry/rye/Cargo.lock +++ b/pkgs/by-name/ry/rye/Cargo.lock @@ -1819,7 +1819,7 @@ dependencies = [ [[package]] name = "rye" -version = "0.39.0" +version = "0.40.0" dependencies = [ "age", "anyhow", diff --git a/pkgs/by-name/ry/rye/package.nix b/pkgs/by-name/ry/rye/package.nix index 3719ae8988e8..7a6f0c18d231 100644 --- a/pkgs/by-name/ry/rye/package.nix +++ b/pkgs/by-name/ry/rye/package.nix @@ -20,13 +20,13 @@ rustPlatform.buildRustPackage rec { pname = "rye"; - version = "0.39.0"; + version = "0.40.0"; src = fetchFromGitHub { owner = "mitsuhiko"; repo = "rye"; rev = "refs/tags/${version}"; - hash = "sha256-qDXD5vNoIppe1EWKxr1tssgAelEKoMdZ/y7Dq979PwI="; + hash = "sha256-EfmHCjDwpnxkKCxX1clFp1HxzlnJYkWscLMPonhOXOA="; }; cargoLock = { @@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk; [ frameworks.CoreServices @@ -85,11 +85,13 @@ rustPlatform.buildRustPackage rec { "--skip=test_config_show_path" "--skip=test_dotenv" "--skip=test_empty_sync" + "--skip=test_exclude_hashes" "--skip=test_fetch" "--skip=test_init_default" "--skip=test_init_lib" "--skip=test_init_script" "--skip=test_lint_and_format" + "--skip=test_list_never_overwrite" "--skip=test_list_not_rye_managed" "--skip=test_publish_outside_project" "--skip=test_version" diff --git a/pkgs/by-name/ry/ryujinx/package.nix b/pkgs/by-name/ry/ryujinx/package.nix index 46385a0c824d..11d2281a2e1c 100644 --- a/pkgs/by-name/ry/ryujinx/package.nix +++ b/pkgs/by-name/ry/ryujinx/package.nix @@ -19,13 +19,13 @@ buildDotnetModule rec { pname = "ryujinx"; - version = "1.1.1385"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml + version = "1.1.1398"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "ca59c3f4998e2d1beb3b0d0214611e3332238557"; - hash = "sha256-pLE8UUH4BzYyR3pqyUwQ112vBOump0wKyZaKwE131yY="; + rev = "319507f2a12a6751f3ab833e498a3efd3119f806"; + hash = "sha256-3DM/kahNhl8EhSIRuqH0trYoR51OrGxSE+GuOKxKr2c="; }; enableParallelBuilding = false; diff --git a/pkgs/by-name/ry/ryujinx/updater.sh b/pkgs/by-name/ry/ryujinx/updater.sh index 74b291640077..bf6a41aa3e15 100755 --- a/pkgs/by-name/ry/ryujinx/updater.sh +++ b/pkgs/by-name/ry/ryujinx/updater.sh @@ -1,5 +1,6 @@ #! /usr/bin/env nix-shell #! nix-shell -I nixpkgs=./. -i bash -p coreutils gnused curl common-updater-scripts nix-prefetch-git jq +# shellcheck shell=bash set -euo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" @@ -68,9 +69,10 @@ cd ../../../.. if [[ "${1-default}" != "--deps-only" ]]; then SHA="$(nix-prefetch-git https://github.com/ryujinx/ryujinx --rev "$COMMIT" --quiet | jq -r '.sha256')" - update-source-version ryujinx "$NEW_VERSION" "$SHA" --rev="$COMMIT" + SRI=$(nix --experimental-features nix-command hash to-sri "sha256:$SHA") + update-source-version ryujinx "$NEW_VERSION" "$SRI" --rev="$COMMIT" fi echo "building Nuget lockfile" -$(nix-build -A ryujinx.fetch-deps --no-out-link) +eval "$(nix-build -A ryujinx.fetch-deps --no-out-link)" |