Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

signald: 0.18.5 -> 0.20.0 #174256

Closed
wants to merge 1 commit into from
Closed

signald: 0.18.5 -> 0.20.0 #174256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ...nstant-messengers/signald/0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion ...pplications/networking/instant-messengers/signald/0002-buildconfig-local-deps-fixes.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
11 changes: 6 additions & 5 deletions pkgs/applications/networking/instant-messengers/signald/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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");
};

Expand All @@ -73,6 +73,7 @@ in stdenv.mkDerivation rec {
runHook preBuild

export GRADLE_USER_HOME=$(mktemp -d)
export VERSION="${version}"

gradle --offline --no-daemon distTar

Expand Down