diff --git a/pkgs/by-name/mo/modrinth-app-unwrapped/deps.json b/pkgs/by-name/mo/modrinth-app-unwrapped/deps.json index 8893492302749..a36c1f6b3e9f2 100644 --- a/pkgs/by-name/mo/modrinth-app-unwrapped/deps.json +++ b/pkgs/by-name/mo/modrinth-app-unwrapped/deps.json @@ -21,20 +21,13 @@ "jar": "sha256-gSZpIKHNxHMGqKK0cmyZ7Imz+/McJHDk9eR32dhXyp8=", "pom": "sha256-+ZXFCx0gl18KjW8OUyK8jRPHiuPcGCcXdoQUlypmzIU=" }, - "com/google/code/gson#gson-parent/2.10.1": { - "pom": "sha256-QkjgiCQmxhUYI4XWCGw+8yYudplXGJ4pMGKAuFSCuDM=" + "com/gradleup/shadow#com.gradleup.shadow.gradle.plugin/9.2.2": { + "pom": "sha256-ZLCuyyPFfukfzPJXx4F8uyxpXQT565nM+9pth/TFlOk=" }, - "com/google/code/gson#gson/2.10.1": { - "jar": "sha256-QkHBSncnw0/uplB+yAExij1KkPBw5FJWgQefuU7kxZM=", - "pom": "sha256-0rEVY09cCF20ucn/wmWOieIx/b++IkISGhzZXU2Ujdc=" - }, - "com/gradleup/shadow#com.gradleup.shadow.gradle.plugin/9.0.0-rc2": { - "pom": "sha256-uKkn9s51uhAWjcrA8xjfpYEyzmuUB6c57mfbUHeuAtc=" - }, - "com/gradleup/shadow#shadow-gradle-plugin/9.0.0-rc2": { - "jar": "sha256-ahe27qKH9v4Twu4FPpuoOreLRsymwFPtOMxSgonaIdo=", - "module": "sha256-knUwimifoY61+xvPfcvmH60Jkbr99Osmmo7zDQx+gbk=", - "pom": "sha256-WqoWzo1nn3vXlmrNdvy9QLx6aEfIT+a0tKlcpQZuo9k=" + "com/gradleup/shadow#shadow-gradle-plugin/9.2.2": { + "jar": "sha256-rqYDnab2KTcMEKFxcOjz2o1nPhS++FgL0aZc3kSQc9A=", + "module": "sha256-4tXqtRULxjBI6WcI6t6/0XbmOfIsgFFoBVszcQdo3YI=", + "pom": "sha256-bO3IWZV0n5H/XNb8Z3H6PfZ4qlZSIl5uoFjNnXmVjGo=" }, "commons-io#commons-io/2.20.0": { "jar": "sha256-35C7oP48tYa38WTnj+j49No/LdXCf6ZF+IgQDMwl3XI=", @@ -67,21 +60,21 @@ "module": "sha256-1sIlTINHuEzahMr3SRShh8Lzd+QoTo2Ls/kBUhgQqos=", "pom": "sha256-qkTrUr/f5h0ns+RQ0rNI2I3qo0N6tNnUmoQJU0j59vs=" }, - "org/apache/logging/log4j#log4j-api/2.25.1": { - "jar": "sha256-ILnHfAqeVNEGOjnlUdyvmMfY56SZRkj4TQueFMcfchU=", - "module": "sha256-6tMmKCISCzyfiiDNDZnVY1lg1SeyBD1n//Zr6HeDHJo=", - "pom": "sha256-up6JUpGBShh506YMLUEReZMk64R5seASpHs1GjeIMcM=" + "org/apache/logging/log4j#log4j-api/2.25.2": { + "jar": "sha256-n9Zsn+C+oG+pZmwUeYmkbK+qkrSoh1NpfTlFzEMzjLs=", + "module": "sha256-WPeF66u6zDA/Ow5aSF91X9qzKQ9p5JsDT4lj0ngjZV4=", + "pom": "sha256-CVYJaiUCQIyVioMXTytqV9yy5bB7uRTISHMrRLirvcM=" }, - "org/apache/logging/log4j#log4j-bom/2.25.1": { - "pom": "sha256-uKwjMoSXEbL3R0QVk3vbuWfSuTAO9M/+PzW+Oxqhik4=" + "org/apache/logging/log4j#log4j-bom/2.25.2": { + "pom": "sha256-Tym32cLZcP0qZpcXa/fd3EFQifYNaW0ov98xsk6S8Rw=" }, - "org/apache/logging/log4j#log4j-core/2.25.1": { - "jar": "sha256-eMIydHhVRksYLwq/eKmaIsiNTScP9YU0PatVV210IOI=", - "module": "sha256-pEq9beGPyZl+VT5fUXldXA2g9fOC2gNaubnt7HXlZnU=", - "pom": "sha256-nps2cOfwwwmXHS3TQ3qxEdPApmg9MgTWC2ql5KhELLg=" + "org/apache/logging/log4j#log4j-core/2.25.2": { + "jar": "sha256-5Q23cBQw/5B5gYUO9SekHVGlPdABf1Oghgr8urhXAnc=", + "module": "sha256-JRQSc3eFDwR83jJbc7efriEzKSK+tkmiUzr9CEIlihE=", + "pom": "sha256-L/9GPTmclAgtmCLCG/v0cOEFHbt9S0XyWw54G8Xg9BI=" }, - "org/apache/logging/log4j#log4j/2.25.1": { - "pom": "sha256-CuZl9wnhMQboIwM2+GzYMrgbytXAWQlyXD/3dD3U/10=" + "org/apache/logging/log4j#log4j/2.25.2": { + "pom": "sha256-HYBXBY0LBcj3clyhrbpoc5y+rHWJjsoGpIymEVRsA+w=" }, "org/apache/maven#maven-api-annotations/4.0.0-rc-3": { "jar": "sha256-XTSQ9yrTp+gr6IsnYp83xZ/SUxuuURw7E4ZkINXYYr0=", @@ -113,18 +106,31 @@ "org/eclipse/ee4j#project/1.0.7": { "pom": "sha256-IFwDmkLLrjVW776wSkg+s6PPlVC9db+EJg3I8oIY8QU=" }, - "org/gradle/toolchains#foojay-resolver/0.10.0": { - "jar": "sha256-DNfKn57RuooyPxkCwFryHdYiOhMDRfvnj15I1YzNbUw=", - "module": "sha256-SduV7YEABA8dZfCWuied7msSeCSNL3k7z7itAg59HNA=", - "pom": "sha256-vndZUF4PPTTVzJzcaGwZxlIuhMzg+MEJ69LW9HsYqSU=" + "org/gradle/toolchains#foojay-resolver/1.0.0": { + "jar": "sha256-eLhqR9/fdpfJvRXaeJg/2A2nJH1uAvwQa98H4DiLYKg=", + "module": "sha256-YZDPDkLmZMEeGsCnhWmasCtUnOo0OSxnnzbYosVQ/Lk=", + "pom": "sha256-m8SLSeQi2e2rw5asGNiwQd/CIhLX+ujjVmfShdSBApo=" }, - "org/gradle/toolchains/foojay-resolver-convention#org.gradle.toolchains.foojay-resolver-convention.gradle.plugin/0.10.0": { - "pom": "sha256-OpLrFa3uBcGiaCT2SIcqVx6fk99koO3L4TTjjtLY4Q8=" + "org/gradle/toolchains/foojay-resolver-convention#org.gradle.toolchains.foojay-resolver-convention.gradle.plugin/1.0.0": { + "pom": "sha256-8TMkmhh1Suah0nAdANhJsa+6ewaD3bX8GxinAHHOwvo=" }, "org/jdom#jdom2/2.0.6.1": { "jar": "sha256-CyD0XjoP2PDRLNxTFrBndukCsTZdsAEYh2+RdcYPMCw=", "pom": "sha256-VXleEBi4rmR7k3lnz4EKmbCFgsI3TnhzwShzTIyRS/M=" }, + "org/jetbrains#annotations/13.0": { + "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", + "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" + }, + "org/jetbrains/kotlin#kotlin-metadata-jvm/2.2.20": { + "jar": "sha256-hSTqyQ9+jg8TZog/LGyCDJO/ph3z12hXyNPoA89nMV0=", + "pom": "sha256-e2qAtqLSZ2oEIvaWg4EyMVQlUfYbMgxochz7nh9ZCdA=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/2.0.21": { + "jar": "sha256-8xzFPxBafkjAk2g7vVQ3Vh0SM5IFE3dLRwgFZBvtvAk=", + "module": "sha256-gf1tGBASSH7jJG7/TiustktYxG5bWqcpcaTd8b0VQe0=", + "pom": "sha256-/LraTNLp85ZYKTVw72E3UjMdtp/R2tHKuqYFSEA+F9o=" + }, "org/junit#junit-bom/5.11.4": { "module": "sha256-qaTye+lOmbnVcBYtJGqA9obSd9XTGutUgQR89R2vRuQ=", "pom": "sha256-GdS3R7IEgFMltjNFUylvmGViJ3pKwcteWTpeTE9eQRU=" @@ -165,63 +171,63 @@ } }, "https://repo.maven.apache.org/maven2": { - "com/google/code/gson#gson-parent/2.13.1": { - "pom": "sha256-+IEKzlDd/j/ag9ESbeZdmdXSUVoUo2uIvrG5mkdpeDY=" + "com/google/code/gson#gson-parent/2.13.2": { + "pom": "sha256-g6tSip1Q/XauuK1vcns+6ct2ZYYlV3TtFsqMTHbZ2s0=" }, - "com/google/code/gson#gson/2.13.1": { - "jar": "sha256-lIVZQtSZLxEpRtPeHDNOcJI3uBJtgTC/B4B8AYpKISA=", - "pom": "sha256-wPZXItdcDljNGDWzBGBG9ga12mmZBBYfjba3j+ubQBo=" + "com/google/code/gson#gson/2.13.2": { + "jar": "sha256-3QzhtVo+0ggMtw+cZVhQzahsIGhiMQAJ3LXlyVJlpeA=", + "pom": "sha256-OqBqp8D5rwkpYaQtCVeOQyS+FGNIoO5u1HhX98Jne3Y=" }, - "com/google/errorprone#error_prone_annotations/2.38.0": { - "jar": "sha256-ZmHVM1CQpfxh3YadIJW8bB4hVuOqR6bkq6vfZMmaeIk=", - "pom": "sha256-MAe++K/zro6hLYHD/qy08Vl5ss9cPjj8kYmpjeoUEWc=" + "com/google/errorprone#error_prone_annotations/2.41.0": { + "jar": "sha256-pW54K1tQgRrCBAc6NVoh2RWiEH/OE+xxEzGtA29mD8w=", + "pom": "sha256-oVHfHi4LSGGNiwahgHSKKbOrs5sbI5b2och5pydIjG4=" }, - "com/google/errorprone#error_prone_parent/2.38.0": { - "pom": "sha256-5iRYpqPmMIG8fFezwPrJ8E92zjL2BlMttp/is9R7k0w=" + "com/google/errorprone#error_prone_parent/2.41.0": { + "pom": "sha256-xTg4jXYKXByY3PBvbtPP5fEaZRgn21y9LtgojHlcrUI=" }, "org/apiguardian#apiguardian-api/1.1.2": { "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" }, - "org/junit#junit-bom/5.12.1": { - "module": "sha256-TdKqnplFecYwRX35lbkZsDVFYzZGNy6q3R0WXQv1jBo=", - "pom": "sha256-fIJrxyvt3IF9rZJjAn+QEqD1Wjd9ON+JxCkyolAcK/A=" - }, - "org/junit/jupiter#junit-jupiter-api/5.12.1": { - "jar": "sha256-pAHgtgNz7fffCWLCXrMhPkUaR3h5LTOnaHbDuKW7IJs=", - "module": "sha256-iv9r5FYIFhBl7mO4QDyfKTE6HdnzkfP5eIVlpiMxGXY=", - "pom": "sha256-zqRvFdpTNT8vtSYZyvbcAH7CqE8O2vQMwSV/jjzvd9w=" - }, - "org/junit/jupiter#junit-jupiter-engine/5.12.1": { - "jar": "sha256-Dn8tvrkb+usNTLM6SHNRuvDlpu1ykGFU2P2ZddMpxZI=", - "module": "sha256-tvSQZ/FmJdFN7gmT8weKTGYeF8kOV0yf0SoWRur98tA=", - "pom": "sha256-GCeXDlNI10sY6757guDLGdxOj5np1NmEyyZJTVcTPao=" - }, - "org/junit/jupiter#junit-jupiter-params/5.12.1": { - "jar": "sha256-WVFwaZnjWVHU3w7KbgkdNhn2WanBCFjy9aPOGRy1dnM=", - "module": "sha256-KYwQtU+G3dtCeclfSYnRW+DV5QDEU+yTXv1Wd8v6Guk=", - "pom": "sha256-dHNtHnFnHQDeQFyxnD2GhOHFl9BwfeJmH7gHGyeEJ8M=" - }, - "org/junit/jupiter#junit-jupiter/5.12.1": { - "jar": "sha256-IoqUye50PVW/6gm1djBoHqeyCmYaR3RH9cH2DcEtnjo=", - "module": "sha256-OY71Q1eCyqfceKDRVRBpP6Xt7w/HP5PFVOZ3FxtCIj4=", - "pom": "sha256-m42YgPjFl2/JUEKEnzsSwRWdom5UUkMSY3edCx54yKQ=" - }, - "org/junit/platform#junit-platform-commons/1.12.1": { - "jar": "sha256-wxYWNYGqpWSSgBIrEuo2/k6cICoaImd1P+p8nh3wVes=", - "module": "sha256-ypN54aC/xbLOQ8dOh0SxT7fEkhPiISv1pH7QIv3bMM4=", - "pom": "sha256-tzKBEektR47QlWxjCgwkZm52gbUTgWj6FchbUJRqcAM=" - }, - "org/junit/platform#junit-platform-engine/1.12.1": { - "jar": "sha256-f+3/k/2SrsfSn8YNwB+gJyRrNrgIhCOl78SUnl9q/6Q=", - "module": "sha256-Vb3CX4rhKh3yQQisSArgiAKMiOMV+ou01HbU4RXyrGE=", - "pom": "sha256-TANohTegh/d9NLNNjczZO5NhcWu5u/S0ucbYMXkBS5w=" - }, - "org/junit/platform#junit-platform-launcher/1.12.1": { - "jar": "sha256-67sU57KfYHMOrt6GLtadfeDVgeoMA4+mogKVXHVB9SU=", - "module": "sha256-e+5FMgZp1sP8SKnaJV9Xn7zlgA+mY8QgT6NL1XgkUfQ=", - "pom": "sha256-nd9DNXV223LpTvM8ipY09gOrQEb+Cubl4ZJMq2aIjtk=" + "org/junit#junit-bom/5.14.0": { + "module": "sha256-etPdstdOanfWWuiaykXUaMl7+ZFba8UvRJ1nXk5vmzU=", + "pom": "sha256-9apHs2ZIPo0fm+8Q5noMZvZq/A8zHJ+WaxMQutYND28=" + }, + "org/junit/jupiter#junit-jupiter-api/5.14.0": { + "jar": "sha256-00MaAEuDgjvN2VtnOBMAh+wysvsopaXetPvBY1e6uPk=", + "module": "sha256-V86ZtxkZ0eDbZV6tULSICJBLKO5qv3xUWBB/mEjVw1o=", + "pom": "sha256-BB5HJeF9zQfpo65wj6aHHXEq3dsLXTbqy0D1xC4nE7s=" + }, + "org/junit/jupiter#junit-jupiter-engine/5.14.0": { + "jar": "sha256-IDt6JAsVcW+LiB4t+rDFgPHaWydKGW/zYPjK2i0XUuo=", + "module": "sha256-KGfhYWM1n7KIfHUvqy8A0Z2Pyj8NzO2dHV8BiM32rgY=", + "pom": "sha256-KPX4YI+V7PYg3qXcJg2BTF6RFZuKrayxa5QrcVBmXZI=" + }, + "org/junit/jupiter#junit-jupiter-params/5.14.0": { + "jar": "sha256-f7tRg3khwylgS6EZ3BrwVz02Iw6oD3hqo9T9jB27ihs=", + "module": "sha256-V/+2UZyCd8xdhK7GB1hLfcPgA/Dtjc4sJYBHBWHELGY=", + "pom": "sha256-RkOJ7Dv6ZGLKy944a9Ba0f9/3iCY24vQXD73fC5Omdg=" + }, + "org/junit/jupiter#junit-jupiter/5.14.0": { + "jar": "sha256-qJUBx26Rq/3AggGs2qrmgdXI1Zti83XVkptmgaARj0M=", + "module": "sha256-cbSt8Ak6UM6YuGLTp1eIinVug+X58LsfU0guaQ4zWQo=", + "pom": "sha256-lKGuTY5jmp+gt0JTGMQjwf3U8tJlFoDnxjNvRlUwl5M=" + }, + "org/junit/platform#junit-platform-commons/1.14.0": { + "jar": "sha256-5UOjqEIvHf5gR/U1MFtwx3fg20MfHvP1XvXIasC7y5s=", + "module": "sha256-Kwq1YmEUumwASZEJ6MOJoXy6XhP7+BEExBjoY3UNSLw=", + "pom": "sha256-Ed3u4UN656ybNGhLDophehZaIKobIjyk0YM3ZMxwZJI=" + }, + "org/junit/platform#junit-platform-engine/1.14.0": { + "jar": "sha256-V80p3oNEaa7mVuXevaHwn3xZYw/Ve5DMDLqjFyb8TUo=", + "module": "sha256-panr9kOUz5HYW/InO6g+K3f5V2dAYYiEV+4nzr00gOQ=", + "pom": "sha256-dAumF9c4ITX+Ekf3H3Umh0ljeYj9OdEq5Qn9Rl+v3QY=" + }, + "org/junit/platform#junit-platform-launcher/1.14.0": { + "jar": "sha256-EACyeHl1ENzsQNkPd/DYTcwT5ZgtpWPBi2tWZarkuBw=", + "module": "sha256-pJlI15aokT/22Jl1ITnUl2YxQ7AS3fgEqxzlMuC/1zw=", + "pom": "sha256-q41bLHzlSaDJEsG9E7yNV0dYOcLneiLlb4DxniPcdQI=" }, "org/opentest4j#opentest4j/1.3.0": { "jar": "sha256-SOLfY2yrZWPO1k3N/4q7I1VifLI27wvzdZhoLd90Lxs=", @@ -231,13 +237,13 @@ "org/ow2#ow2/1.5.1": { "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU=" }, - "org/ow2/asm#asm-tree/9.8": { - "jar": "sha256-FLeIDLfIXu0QHicQQy/D/7gydVMqaolNxMQJXUmtWfE=", - "pom": "sha256-cUnn+qDhkSlvh5ru2SCciULTmPBpjSzKGpxijy4qj3c=" + "org/ow2/asm#asm-tree/9.9": { + "jar": "sha256-QhePN3XJxj+eXhRGdH0ptOyk2RvW515cQ8+jcqR9OMY=", + "pom": "sha256-0BeI7Y5ujiSsr2y0p73MJzNBYlL6oAIylZ4+Lp3xv0Q=" }, - "org/ow2/asm#asm/9.8": { - "jar": "sha256-h26raoPa7K1cpn65/KuwY8l7WuuM8fynqYns3hdSIFE=", - "pom": "sha256-wTZ8O7OD12Gef3l+ON91E4hfLu8ErntZCPaCImV7W6o=" + "org/ow2/asm#asm/9.9": { + "jar": "sha256-A9madK0e5ccTNO9nQ39O9P40iMqnyW2GRavHPI4gF9Q=", + "pom": "sha256-z4Ye8edF1XFUr3muFN80DtU0Hl3NAVfO/NLrfxqgXFc=" } } } diff --git a/pkgs/by-name/mo/modrinth-app-unwrapped/gradle-from-path.patch b/pkgs/by-name/mo/modrinth-app-unwrapped/gradle-from-path.patch index ef97f6e66e6e0..70cd2dac4a113 100644 --- a/pkgs/by-name/mo/modrinth-app-unwrapped/gradle-from-path.patch +++ b/pkgs/by-name/mo/modrinth-app-unwrapped/gradle-from-path.patch @@ -1,5 +1,5 @@ diff --git a/packages/app-lib/build.rs b/packages/app-lib/build.rs -index 251c4e84..eeacd02a 100644 +index 10ed29b9..97c832e1 100644 --- a/packages/app-lib/build.rs +++ b/packages/app-lib/build.rs @@ -1,7 +1,7 @@ @@ -10,8 +10,8 @@ index 251c4e84..eeacd02a 100644 +use std::env; fn main() { - println!("cargo::rerun-if-changed=java/gradle"); -@@ -19,21 +19,11 @@ fn main() { + println!("cargo::rerun-if-changed=.env"); +@@ -38,21 +38,12 @@ fn build_java_jars() { out_dir.join("java/libs").display() ); @@ -22,7 +22,7 @@ index 251c4e84..eeacd02a 100644 - "java/gradlew", - ) - .unwrap(); -- + let mut build_dir_str = OsString::from("-Dorg.gradle.project.buildDir="); build_dir_str.push(out_dir.join("java")); - let exit_status = Command::new(gradle_path) diff --git a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix index ef37bffd807df..491b8d4af2183 100644 --- a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix +++ b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix @@ -6,7 +6,7 @@ desktop-file-utils, fetchFromGitHub, gradle_8, - jdk11, + jdk17, makeBinaryWrapper, makeShellWrapper, nix-update-script, @@ -21,22 +21,23 @@ rustPlatform, turbo, webkitgtk_4_1, + xcbuild, }: let gradle = gradle_8.override { java = jdk; }; - jdk = jdk11; + jdk = jdk17; in rustPlatform.buildRustPackage (finalAttrs: { pname = "modrinth-app-unwrapped"; - version = "0.10.5"; + version = "0.10.23"; src = fetchFromGitHub { owner = "modrinth"; repo = "code"; tag = "v${finalAttrs.version}"; - hash = "sha256-KqC+5RLLvg3cyjY7Ecw9qxQ5XUKsK7Tfxl4WC1OwZeI="; + hash = "sha256-Or2KkcZnZCZOnUd++SmDgbUOwa6ZmRDaoo7gF3XvN6I="; }; patches = [ @@ -66,8 +67,7 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail '1.0.0-local' '${finalAttrs.version}' ''; - cargoHash = "sha256-chUPd1fLZ7dm0MXkbD7Bv4tE520ooEyliVZ9Pp+LIdk="; - + cargoHash = "sha256-hWjoNwKA39YYhPSrQUNaM1nS+CtV9vff+aXpoQLPCOM="; mitmCache = gradle.fetchDeps { inherit (finalAttrs) pname; data = ./deps.json; @@ -77,7 +77,7 @@ rustPlatform.buildRustPackage (finalAttrs: { inherit (finalAttrs) pname version src; pnpm = pnpm_9; fetcherVersion = 1; - hash = "sha256-1tDegt8OgG0ZhvNGpkYQR+PuX/xI287OFk4MGAXUKZQ="; + hash = "sha256-jLuI8qNJgFkuBbKuBNKGuk/6v62iY7fNZX2t3U3olk0="; }; nativeBuildInputs = [ @@ -90,7 +90,10 @@ rustPlatform.buildRustPackage (finalAttrs: { pnpmConfigHook pnpm_9 ] - ++ lib.optional stdenv.hostPlatform.isDarwin makeBinaryWrapper; + ++ lib.optional stdenv.hostPlatform.isDarwin [ + makeBinaryWrapper + xcbuild + ]; buildInputs = [ openssl ] ++ lib.optional stdenv.hostPlatform.isLinux webkitgtk_4_1; @@ -163,7 +166,7 @@ rustPlatform.buildRustPackage (finalAttrs: { # This builds on architectures like aarch64, but the launcher itself does not support them yet. # Darwin is the only exception # See https://github.com/modrinth/code/issues/776#issuecomment-1742495678 - broken = !stdenv.hostPlatform.isx86_64 && !stdenv.hostPlatform.isDarwin; + broken = !stdenv.hostPlatform.isx86_64 || !stdenv.hostPlatform.isLinux; sourceProvenance = with lib.sourceTypes; [ fromSource binaryBytecode # mitm cache diff --git a/pkgs/by-name/mo/modrinth-app-unwrapped/remove-spotless.patch b/pkgs/by-name/mo/modrinth-app-unwrapped/remove-spotless.patch index 7a4761a986990..d989756554cc7 100644 --- a/pkgs/by-name/mo/modrinth-app-unwrapped/remove-spotless.patch +++ b/pkgs/by-name/mo/modrinth-app-unwrapped/remove-spotless.patch @@ -1,15 +1,15 @@ diff --git a/packages/app-lib/java/build.gradle.kts b/packages/app-lib/java/build.gradle.kts -index a671dd6f..d18c28de 100644 +index 10435b98..c4346a0c 100644 --- a/packages/app-lib/java/build.gradle.kts +++ b/packages/app-lib/java/build.gradle.kts @@ -1,6 +1,5 @@ plugins { java -- id("com.diffplug.spotless") version "7.0.4" - id("com.gradleup.shadow") version "9.0.0-rc2" +- id("com.diffplug.spotless") version "8.0.0" + id("com.gradleup.shadow") version "9.2.2" } -@@ -27,13 +26,6 @@ tasks.withType().configureEach { +@@ -28,12 +27,6 @@ tasks.withType().configureEach { options.compilerArgs.addAll(listOf("-Xlint:all", "-Werror")) } @@ -19,7 +19,6 @@ index a671dd6f..d18c28de 100644 - removeUnusedImports() - } -} -- + tasks.jar { enabled = false - } diff --git a/pkgs/by-name/mo/modrinth-app/package.nix b/pkgs/by-name/mo/modrinth-app/package.nix index be0442eabfbba..3047fe2aa192c 100644 --- a/pkgs/by-name/mo/modrinth-app/package.nix +++ b/pkgs/by-name/mo/modrinth-app/package.nix @@ -7,6 +7,7 @@ glib, glib-networking, gsettings-desktop-schemas, + jdk25, jdk17, jdk21, jdk8, @@ -14,6 +15,7 @@ jdk8 jdk17 jdk21 + jdk25 ], libGL, libjack2,