nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-03 13:30:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

rush-lyrics: 6.7.1 -> 7.1.0

Browse Source
This commit is contained in:
Irgendeinwer
2026-09-27 19:28:19 +02:00
parent 9c2d170ec7
commit b3fceb7425
3 changed files with 1053 additions and 3330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4353
pkgs/by-name/ru/rush-lyrics/deps.json generated
View File

File diff suppressed because it is too large Load Diff

4
pkgs/by-name/ru/rush-lyrics/package.nix
View File

@@ -35,13 +35,13 @@ stdenv.mkDerivation (finalAttrs: {
strictDeps = true;
pname = "rush-lyrics";
version = "6.7.1";
version = "7.1.0";
src = fetchFromGitHub {
owner = "shub39";
repo = "Rush";
tag = finalAttrs.version;
hash = "sha256-EeONyTVKunOU28im/vtsDLmcSAQr0PclCZXRfqn/A3Y=";
hash = "sha256-SHeg8ZHV+xhB5AUPRaGy0288SKFeL7eJCmOvU8EBVZQ=";
};
patches = [

26
pkgs/by-name/ru/rush-lyrics/remove-android.patch
View File

@@ -12,7 +12,7 @@ index 1535716..ccca9fb 100644
-
include(":desktopApp")
diff --git a/shared/core/build.gradle.kts b/shared/core/build.gradle.kts
index a4e7587..f2404ee 100644
index 0ecc538..393c4bd 100644
--- a/shared/core/build.gradle.kts
+++ b/shared/core/build.gradle.kts
@@ -17,7 +17,6 @@
@@ -36,9 +36,9 @@ index a4e7587..f2404ee 100644
-
jvm()
listOf(iosArm64(), iosSimulatorArm64()).forEach { iosTarget ->
// listOf(iosArm64(), iosSimulatorArm64()).forEach { iosTarget ->
diff --git a/shared/logic/build.gradle.kts b/shared/logic/build.gradle.kts
index ef5a1dd..db72417 100644
index a7e2031..9084eba 100644
--- a/shared/logic/build.gradle.kts
+++ b/shared/logic/build.gradle.kts
@@ -19,7 +19,6 @@ import java.util.Properties
@@ -62,13 +62,13 @@ index ef5a1dd..db72417 100644
- androidResources { enable = true }
- }
-
listOf(iosArm64(), iosSimulatorArm64()).forEach { iosTarget ->
iosTarget.binaries.framework {
baseName = "SharedLogic"
// listOf(iosArm64(), iosSimulatorArm64()).forEach { iosTarget ->
// iosTarget.binaries.framework {
// baseName = "SharedLogic"
@@ -81,10 +71,6 @@ kotlin {
implementation(libs.ktor.client.darwin)
implementation(libs.androidx.sqlite.bundled)
}
// implementation(libs.ktor.client.darwin)
// implementation(libs.androidx.sqlite.bundled)
// }
- androidMain.dependencies {
- implementation(libs.ktor.client.okhttp)
- implementation(projects.androidLibs.romanization)
@@ -81,11 +81,11 @@ index ef5a1dd..db72417 100644
dependencies {
add("kspJvm", libs.androidx.room.compiler)
- add("kspAndroid", libs.androidx.room.compiler)
add("kspIosSimulatorArm64", libs.androidx.room.compiler)
add("kspIosArm64", libs.androidx.room.compiler)
// add("kspIosSimulatorArm64", libs.androidx.room.compiler)
// add("kspIosArm64", libs.androidx.room.compiler)
}
diff --git a/shared/ui/build.gradle.kts b/shared/ui/build.gradle.kts
index cf0d519..9ab57e2 100644
index f387ceb..b925c3d 100644
--- a/shared/ui/build.gradle.kts
+++ b/shared/ui/build.gradle.kts
@@ -18,7 +18,6 @@
@@ -110,7 +110,7 @@ index cf0d519..9ab57e2 100644
jvm()
sourceSets {
@@ -79,20 +71,9 @@ kotlin {
@@ -81,20 +73,9 @@ kotlin {
implementation(libs.koin.compose.viewmodel.navigation)
implementation(libs.koin.annotations)
}