modrinth-app-unwrapped: 0.13.6 -> 0.13.17 (#516185)

pkgs/by-name/mo/modrinth-app-unwrapped/package.nix

@@ -13,7 +13,7 @@
   nodejs,
   openssl,
   pkg-config,
-  pnpm_9,
+  pnpm_10,
   fetchPnpmDeps,
   pnpmConfigHook,
   replaceVars,
@@ -31,13 +31,13 @@ in
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "modrinth-app-unwrapped";
-  version = "0.13.6";
+  version = "0.13.17";
 
   src = fetchFromGitHub {
     owner = "modrinth";
     repo = "code";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-47uokwYsEg5D0lyHdpqfvKlsuXZK0sm5YIWwNjVGsKQ=";
+    hash = "sha256-Qn4IlqJagLoIcP9p9QdKzu2wdcBDLvfq/2sgVwIjbm4=";
   };
 
   patches = [
@@ -61,20 +61,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
     ./remove-spotless.patch
   ];
 
-  cargoPatches = [
-    # Cidre 0.11.3 currently fails to build on darwin. Updating it to the latest version
-    # resolves this issue.
-    # Upstream PR is https://github.com/modrinth/code/pull/5862
-    ./update-cidre.patch
-  ];
-
   # Let the app know about our actual version number
   postPatch = ''
     substituteInPlace {apps/app,packages/app-lib}/Cargo.toml apps/app-frontend/package.json \
       --replace-fail '1.0.0-local' '${finalAttrs.version}'
   '';
 
-  cargoHash = "sha256-GwangszzKTEYvflibPgkIyUkHlpfMgenD/mq3my5LIY=";
+  cargoHash = "sha256-iI1AjFApd9fzss3hSVJLofHLZ6SJqUccHJ7PHqtBk+k=";
 
   mitmCache = gradle.fetchDeps {
     inherit (finalAttrs) pname;
@@ -83,9 +76,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
-    pnpm = pnpm_9;
+    pnpm = pnpm_10;
     fetcherVersion = 3;
-    hash = "sha256-Hk32LBD20F2LRgqNs8f1j3VdUxKoTPWs3yJvOghsEbI=";
+    hash = "sha256-oPZt68SosRgzl50VR/xWozcc0weQKiY6T1UcvgMRq1M=";
   };
 
   nativeBuildInputs = [
@@ -96,7 +89,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     nodejs
     pkg-config
     pnpmConfigHook
-    pnpm_9
+    pnpm_10
   ]
   ++ lib.optional stdenv.hostPlatform.isDarwin [
     makeBinaryWrapper

pkgs/by-name/mo/modrinth-app-unwrapped/update-cidre.patch

@@ -1,41 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index ee2157d44..db41b81a3 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -1572,18 +1572,19 @@ dependencies = [
- 
- [[package]]
- name = "cidre"
--version = "0.11.3"
-+version = "0.15.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "0cc0eb4d7faf9f94493eaf7e7c0534dee2dfa9642353382039572abb4e0e56e9"
-+checksum = "0c903ff1729987d29e07295d2c5841993db25ff86cca43bee04505878d3ec1a7"
- dependencies = [
-+ "cc",
-  "cidre-macros",
- ]
- 
- [[package]]
- name = "cidre-macros"
--version = "0.3.0"
-+version = "0.5.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "82bc2f84c0baaa09299da3a03864491549685912c1e338a54211e00589dc1e4c"
-+checksum = "6facfeffa8b9792dc014bb4e65e364d13518b74e06783d56249810a3e48cfad7"
- 
- [[package]]
- name = "cityhash-rs"
-diff --git a/Cargo.toml b/Cargo.toml
-index 54865d6d3..a09ad3089 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -51,7 +51,7 @@ bytes = "1.10.1"
- censor = "0.3.0"
- chardetng = "0.1.17"
- chrono = "0.4.42"
--cidre = { version = "0.11.3", default-features = false, features = [
-+cidre = { version = "0.15.0", default-features = false, features = [
-   "macos_15_0"
- ] }
- clap = "4.5.48"