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 9e1578e6f1a14..077fb4b2ee3f7 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 @@ -24,7 +24,7 @@ index eaa6e0e..63c2947 100644 @@ -104,6 +107,8 @@ dependencies { implementation 'io.prometheus:simpleclient_httpserver:0.15.0' implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3' - implementation 'io.sentry:sentry:5.7.3' + implementation 'io.sentry:sentry:6.1.2' + implementation 'com.github.gmazzo.buildconfig:com.github.gmazzo.buildconfig.gradle.plugin:3.0.3' + implementation 'org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.31' testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2' 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 a6efeb4a44f12..2374ca1174c09 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 @@ -50,7 +50,7 @@ index eaa6e0e..9a2f4e2 100644 @@ -104,6 +117,8 @@ dependencies { implementation 'io.prometheus:simpleclient_httpserver:0.15.0' implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3' - implementation 'io.sentry:sentry:5.7.3' + implementation 'io.sentry:sentry:6.1.2' + implementation 'com.github.gmazzo.buildconfig:com.github.gmazzo.buildconfig.gradle.plugin:3.0.3' + implementation 'org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.31' testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2' diff --git a/pkgs/applications/networking/instant-messengers/signald/default.nix b/pkgs/applications/networking/instant-messengers/signald/default.nix index ac7040a9aaca6..ae01020908e25 100644 --- a/pkgs/applications/networking/instant-messengers/signald/default.nix +++ b/pkgs/applications/networking/instant-messengers/signald/default.nix @@ -4,18 +4,18 @@ let pname = "signald"; - version = "0.18.5"; + version = "0.20.0"; src = fetchFromGitLab { owner = pname; repo = pname; rev = version; - sha256 = "sha256-2cb1pyBOoOlFqJsNKXA0Q9x4wCE4yzzcfrDDtTp7HMk="; + hash = "sha256-OSZpZZ4Ia2dKiC2Btvnafa4nXezZSlvxlDrseJ6OKrk="; }; jre' = jre_minimal.override { jdk = jdk17_headless; - # from https://gitlab.com/signald/signald/-/blob/0.18.5/build.gradle#L173 + # from https://gitlab.com/signald/signald/-/blob/0.19.0/build.gradle#L173 modules = [ "java.base" "java.management" @@ -54,8 +54,8 @@ let outputHashMode = "recursive"; # Downloaded jars differ by platform outputHash = { - x86_64-linux = "sha256-q1gzauIL7aKalvPSfiK5IvkNkidCh+6jp5bpwxR+PZ0="; - aarch64-linux = "sha256-cM+7MaV0/4yAzobXX9FSdl/ZfLddwySayao96UdDgzk="; + x86_64-linux = "sha256-Z6mPFIxx3WomaHVi2YEp6KPCL47Fj6m17K/8COuif4c="; + aarch64-linux = "sha256-Kow+m5m0X8+lqrJnFfXcDyyXqjbIaQeMMRuRvR4dIi4="; }.${stdenv.system} or (throw "Unsupported platform"); }; @@ -73,6 +73,7 @@ in stdenv.mkDerivation rec { runHook preBuild export GRADLE_USER_HOME=$(mktemp -d) + export VERSION="${version}" gradle --offline --no-daemon distTar