Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
193 changes: 182 additions & 11 deletions pkgs/by-name/mo/modrinth-app-unwrapped/deps.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 6 additions & 4 deletions pkgs/by-name/mo/modrinth-app-unwrapped/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ in

rustPlatform.buildRustPackage (finalAttrs: {
pname = "modrinth-app-unwrapped";
version = "0.10.3";
version = "0.10.5";

src = fetchFromGitHub {
owner = "modrinth";
repo = "code";
tag = "v${finalAttrs.version}";
hash = "sha256-XfJbjbVcP9N3exAhXQoMGpoHORpKAlb0dPhQq195roY=";
hash = "sha256-KqC+5RLLvg3cyjY7Ecw9qxQ5XUKsK7Tfxl4WC1OwZeI=";
};

patches = [
Expand Down Expand Up @@ -65,7 +65,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
--replace-fail '1.0.0-local' '${finalAttrs.version}'
'';

cargoHash = "sha256-jWMHii65hTnTmiBFHxZ4xO5V+Qt/MPCy75eJvnlyE4c=";
cargoHash = "sha256-chUPd1fLZ7dm0MXkbD7Bv4tE520ooEyliVZ9Pp+LIdk=";

mitmCache = gradle.fetchDeps {
inherit (finalAttrs) pname;
Expand All @@ -75,7 +75,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
pnpmDeps = pnpm.fetchDeps {
inherit (finalAttrs) pname version src;
fetcherVersion = 1;
hash = "sha256-7iqXuIQPbP2p26vrWDjMoyZBPpbVQpigYAylhIg8+ZY=";
hash = "sha256-1tDegt8OgG0ZhvNGpkYQR+PuX/xI287OFk4MGAXUKZQ=";
};

nativeBuildInputs = [
Expand Down Expand Up @@ -121,6 +121,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
local nixGradleFlags=()
concatTo nixGradleFlags gradleFlags gradleFlagsArray
export NIX_GRADLEFLAGS_COMPILE="''${nixGradleFlags[@]}"

cp packages/app-lib/.env.prod packages/app-lib/.env
'';

postInstall =
Expand Down
8 changes: 4 additions & 4 deletions pkgs/by-name/mo/modrinth-app-unwrapped/remove-spotless.patch
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
diff --git a/packages/app-lib/java/build.gradle.kts b/packages/app-lib/java/build.gradle.kts
index b7f9ede0..8a336897 100644
index a671dd6f..d18c28de 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"
}

repositories {
@@ -23,13 +22,6 @@ tasks.withType<JavaCompile>().configureEach {
@@ -27,13 +26,6 @@ tasks.withType<JavaCompile>().configureEach {
options.compilerArgs.addAll(listOf("-Xlint:all", "-Werror"))
}

Expand All @@ -21,5 +21,5 @@ index b7f9ede0..8a336897 100644
-}
-
tasks.jar {
archiveFileName = "theseus.jar"
enabled = false
}
Loading