From a89419c3682dc712609240c3785d01f378667e21 Mon Sep 17 00:00:00 2001 From: seth Date: Mon, 23 Dec 2024 23:17:23 -0500 Subject: [PATCH] modrinth-app: 0.8.9 -> 0.9.0 Diff: https://github.com/modrinth/code/compare/refs/tags/v0.8.9...v0.9.0 (cherry picked from commit 04e4b6a585089dccc98fe14f4baeac773b6e4c58) --- .../mo/modrinth-app-unwrapped/package.nix | 16 +++++++++++----- pkgs/by-name/mo/modrinth-app/package.nix | 3 +-- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix index 39891514cb343..695d42ca6ea0e 100644 --- a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix +++ b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix @@ -22,21 +22,21 @@ in rustPlatform.buildRustPackage rec { pname = "modrinth-app-unwrapped"; - version = "0.8.9"; + version = "0.9.0"; src = fetchFromGitHub { owner = "modrinth"; repo = "code"; - rev = "refs/tags/v${version}"; - hash = "sha256-DR1aPbSqAVhL/m/Maa3mPzNWwK4A1WvDd/PwEMVYn5g="; + tag = "v${version}"; + hash = "sha256-uDG+WHeMY/quzF8mHBn5o8xod4/G5+S4/zD2lbqdN0M="; }; useFetchCargoVendor = true; - cargoHash = "sha256-cIJooOuAmDieikpm7W78rjTjxO1c+Sk005Y/VN/cqRg="; + cargoHash = "sha256-D9hkdliyKc8m9i2D9pG3keGmZsx+rzrgVXZws9Ot24I="; pnpmDeps = pnpm.fetchDeps { inherit pname version src; - hash = "sha256-murZ82LV2pGng/Cg08NoWr/mDIVECrf00utVrs6PKRg="; + hash = "sha256-nFuPFgwJw38XVxhW0QXmU31o+hqJKGJysnPg2YSg2D0="; }; nativeBuildInputs = [ @@ -53,6 +53,12 @@ rustPlatform.buildRustPackage rec { ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11 ++ lib.optional stdenv.hostPlatform.isLinux webkitgtk_4_1; + # Tests fail on other, unrelated packages in the monorepo + cargoTestFlags = [ + "--package" + "theseus_gui" + ]; + env = { TURBO_BINARY_PATH = lib.getExe turbo; }; diff --git a/pkgs/by-name/mo/modrinth-app/package.nix b/pkgs/by-name/mo/modrinth-app/package.nix index 87935320bebc6..65ea5598cb1ae 100644 --- a/pkgs/by-name/mo/modrinth-app/package.nix +++ b/pkgs/by-name/mo/modrinth-app/package.nix @@ -24,8 +24,7 @@ xorg, }: -symlinkJoin rec { - name = "${pname}-${version}"; +symlinkJoin { pname = "modrinth-app"; inherit (modrinth-app-unwrapped) version;