diff --git a/pkgs/applications/networking/instant-messengers/signald/0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch b/pkgs/applications/networking/instant-messengers/signald/0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch index 1d9ca8d838d..d2cf9dd4315 100644 --- a/pkgs/applications/networking/instant-messengers/signald/0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch +++ b/pkgs/applications/networking/instant-messengers/signald/0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch @@ -11,25 +11,15 @@ diff --git a/build.gradle b/build.gradle index 799e782..caceaac 100644 --- a/build.gradle +++ b/build.gradle -@@ -83,6 +83,9 @@ static String getVersion() { - - repositories { - maven {url "https://gitlab.com/api/v4/groups/6853927/-/packages/maven"} // https://gitlab.com/groups/signald/-/packages -+ maven { -+ url "https://plugins.gradle.org/m2/" -+ } - mavenCentral() - } - -@@ -104,6 +107,8 @@ dependencies { - implementation 'io.prometheus:simpleclient_httpserver:0.16.0' - implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3' - implementation 'io.sentry:sentry:6.4.0' -+ implementation 'com.github.gmazzo.buildconfig:com.github.gmazzo.buildconfig.gradle.plugin:3.1.0' -+ implementation 'org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.10' - testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2' +@@ -87,7 +86,7 @@ repositories { } + dependencies { +- implementation 'org.signald:signal-service-java-' + getTarget() + ':2.15.3_unofficial_50_signald_1' ++ implementation 'org.signald:signal-service-java-' + getTarget() + ':2.15.3_unofficial_50_signald_2' + implementation 'org.bouncycastle:bcprov-jdk15on:1.70' + implementation 'com.kohlschutter.junixsocket:junixsocket-common:2.6.1' + implementation 'com.kohlschutter.junixsocket:junixsocket-native-common:2.6.1' @@ -171,4 +176,4 @@ allprojects { runtime { options = ['--strip-java-debug-attributes', '--compress', '2', '--no-header-files', '--no-man-pages'] diff --git a/pkgs/applications/networking/instant-messengers/signald/0002-buildconfig-local-deps-fixes.patch b/pkgs/applications/networking/instant-messengers/signald/0002-buildconfig-local-deps-fixes.patch index 96a7d6d2ef3..2f0f6e73159 100644 --- a/pkgs/applications/networking/instant-messengers/signald/0002-buildconfig-local-deps-fixes.patch +++ b/pkgs/applications/networking/instant-messengers/signald/0002-buildconfig-local-deps-fixes.patch @@ -47,15 +47,15 @@ index 799e782..6ecef3e 100644 } dependencies { -@@ -104,6 +117,8 @@ dependencies { - implementation 'io.prometheus:simpleclient_httpserver:0.16.0' - implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3' - implementation 'io.sentry:sentry:6.4.0' -+ implementation 'com.github.gmazzo.buildconfig:com.github.gmazzo.buildconfig.gradle.plugin:3.1.0' -+ implementation 'org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.10' - testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2' +@@ -87,7 +86,7 @@ repositories { } + dependencies { +- implementation 'org.signald:signal-service-java-' + getTarget() + ':2.15.3_unofficial_50_signald_1' ++ implementation 'org.signald:signal-service-java-' + getTarget() + ':2.15.3_unofficial_50_signald_2' + implementation 'org.bouncycastle:bcprov-jdk15on:1.70' + implementation 'com.kohlschutter.junixsocket:junixsocket-common:2.6.1' + implementation 'com.kohlschutter.junixsocket:junixsocket-native-common:2.6.1' @@ -167,8 +182,3 @@ allprojects { } } diff --git a/pkgs/applications/networking/instant-messengers/signald/default.nix b/pkgs/applications/networking/instant-messengers/signald/default.nix index a9e023cdf63..8847707e137 100644 --- a/pkgs/applications/networking/instant-messengers/signald/default.nix +++ b/pkgs/applications/networking/instant-messengers/signald/default.nix @@ -54,8 +54,8 @@ let outputHashMode = "recursive"; # Downloaded jars differ by platform outputHash = { - x86_64-linux = "sha256-ANiNDdTuCuDEH5zUPsrVF6Uegdq3zVsMv+uMtYRX0jE="; - aarch64-linux = "sha256-V9zn4v/ZeLELAwFJ5y7OVAeJwZp4DmHm4KWxE6KpwGs="; + x86_64-linux = "sha256-B2T8bM8xdob5507oS1CVO+sszEg9VWL8QKUEanIlXvk="; + aarch64-linux = "sha256-I314eLUQP8HPbwc+10ZDKzcn9WsqLGuBtfoiCEYZRck="; }.${stdenv.system} or (throw "Unsupported platform"); };