mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-11 07:23:40 +00:00
65778c0da2
Replaces/Closes #174256 Needed because the CA of a signal server seems to have changed[1] which has caused the following errors to appear while trying to send messages from Matrix (via `mautrix-signal` and subsequently `signald`): ⚠ Your message was not bridged: org.whispersystems.signalservice.api.push.exceptions.PushNetworkException, javax.net.ssl.SSLHandshakeException, sun.security.validator.ValidatorException, sun.security.provider.certpath.SunCertPathBuilderException: org.whispersystems.signalservice.api.push.exceptions.PushNetworkException: javax.net.ssl.SSLHandshakeException: PKIX path building failed: sun.security.provider.certpath.SunCertPathBuilderException: unable to find valid certification path to requested target Migration can be performed by running a command like $ signald \ -d /var/lib/signald/data \ --database sqlite:/var/lib/signald/db \ -s /run/signald/signald.sock \ --migrate-data before starting signald itself. ChangeLogs: * https://gitlab.com/signald/signald/-/blob/main/releases/0.20.0.md * https://gitlab.com/signald/signald/-/blob/main/releases/0.21.0.md * https://gitlab.com/signald/signald/-/blob/main/releases/0.22.0.md * https://gitlab.com/signald/signald/-/blob/main/releases/0.22.1.md * https://gitlab.com/signald/signald/-/blob/main/releases/0.22.2.md * https://gitlab.com/signald/signald/-/blob/main/releases/0.23.0.md [1] https://gitlab.com/signald/signald/-/blob/main/releases/0.23.0.md
72 lines
2.1 KiB
Diff
72 lines
2.1 KiB
Diff
From b068af1f3e49dedfb489e3ed957934ff651e98ee Mon Sep 17 00:00:00 2001
|
|
From: Maximilian Bosch <maximilian@mbosch.me>
|
|
Date: Sat, 26 Feb 2022 12:36:15 +0100
|
|
Subject: [PATCH 2/2] buildconfig/local deps fixes
|
|
|
|
---
|
|
build.gradle | 26 ++++++++++++++++++--------
|
|
1 file changed, 18 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/build.gradle b/build.gradle
|
|
index 799e782..6ecef3e 100644
|
|
--- a/build.gradle
|
|
+++ b/build.gradle
|
|
@@ -10,11 +10,21 @@ import org.gradle.nativeplatform.platform.internal.ArchitectureInternal
|
|
import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
|
|
import org.gradle.nativeplatform.platform.internal.OperatingSystemInternal
|
|
|
|
+buildscript {
|
|
+ repositories {
|
|
+ maven {
|
|
+ url(uri("@deps@"))
|
|
+ }
|
|
+ }
|
|
+ dependencies {
|
|
+ classpath "com.github.gmazzo:gradle-buildconfig-plugin:3.0.3"
|
|
+ }
|
|
+}
|
|
+
|
|
plugins {
|
|
- id 'com.github.gmazzo.buildconfig' version '3.0.3'
|
|
- id 'org.beryx.runtime' version '1.12.7'
|
|
id 'application'
|
|
}
|
|
+apply plugin: "com.github.gmazzo.buildconfig"
|
|
|
|
compileJava.options.encoding = 'UTF-8'
|
|
|
|
@@ -83,7 +93,10 @@ static String getVersion() {
|
|
|
|
repositories {
|
|
maven {url "https://gitlab.com/api/v4/groups/6853927/-/packages/maven"} // https://gitlab.com/groups/signald/-/packages
|
|
- mavenCentral()
|
|
+ mavenLocal()
|
|
+ maven {
|
|
+ url uri("@deps@")
|
|
+ }
|
|
}
|
|
|
|
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'
|
|
}
|
|
|
|
@@ -167,8 +182,3 @@ allprojects {
|
|
}
|
|
}
|
|
}
|
|
-
|
|
-runtime {
|
|
- options = ['--strip-java-debug-attributes', '--compress', '2', '--no-header-files', '--no-man-pages']
|
|
- modules = ['java.base', 'java.management', 'java.naming', 'java.sql', 'java.xml', 'jdk.crypto.ec', 'jdk.httpserver', 'java.desktop', 'jdk.unsupported']
|
|
-}
|
|
\ No newline at end of file
|
|
--
|
|
2.36.2
|
|
|