signald: 0.13.1 -> 0.14.1

Flakebi f97a6f81 3d29e432

Changed files
+17 -31
pkgs
applications
networking
+16 -14
pkgs/applications/networking/instant-messengers/signald/default.nix
···
-
{ lib, stdenv, fetchurl, fetchgit, jre_headless, coreutils, gradle_6, git, perl
, makeWrapper }:
let
pname = "signald";
-
-
version = "0.13.1";
-
# This package uses the .git directory
-
src = fetchgit {
-
url = "https://gitlab.com/signald/signald";
rev = version;
-
sha256 = "1ilmg0i1kw2yc7m3hxw1bqdpl3i9wwbj8623qmz9cxhhavbcd5i7";
-
leaveDotGit = true;
};
buildConfigJar = fetchurl {
···
sha256 = "0y1f42y7ilm3ykgnm6s3ks54d71n8lsy5649xgd9ahv28lj05x9f";
};
-
patches = [ ./git-describe-always.patch ./gradle-plugin.patch ];
-
postPatch = ''
patchShebangs gradlew
sed -i -e 's|BuildConfig.jar|${buildConfigJar}|' build.gradle
···
# fake build to pre-download deps into fixed-output derivation
deps = stdenv.mkDerivation {
name = "${pname}-deps";
-
inherit src version postPatch patches;
nativeBuildInputs = [ gradle_6 perl ];
buildPhase = ''
export GRADLE_USER_HOME=$(mktemp -d)
···
forceShare = [ "dummy" ];
outputHashAlgo = "sha256";
outputHashMode = "recursive";
-
outputHash = "0w8ixp1l0ch1jc2dqzxdx3ljlh17hpgns2ba7qvj43nr4prl71l7";
};
in stdenv.mkDerivation rec {
-
inherit pname src version postPatch patches;
buildPhase = ''
runHook preBuild
···
homepage = "https://signald.org";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ expipiplus1 ];
-
platforms = platforms.unix;
};
}
···
+
{ lib, stdenv, fetchurl, fetchgit, fetchFromGitLab, jre_headless, coreutils, gradle_6, git, perl
, makeWrapper }:
let
pname = "signald";
+
version = "0.14.1";
+
src = fetchFromGitLab {
+
owner = pname;
+
repo = pname;
rev = version;
+
sha256 = "K/G5+w1GINLZwJIG5a7u0TxlGe+Cyp4wQm+pgm28qCA=";
};
buildConfigJar = fetchurl {
···
sha256 = "0y1f42y7ilm3ykgnm6s3ks54d71n8lsy5649xgd9ahv28lj05x9f";
};
postPatch = ''
patchShebangs gradlew
sed -i -e 's|BuildConfig.jar|${buildConfigJar}|' build.gradle
···
# fake build to pre-download deps into fixed-output derivation
deps = stdenv.mkDerivation {
name = "${pname}-deps";
+
inherit src version postPatch;
nativeBuildInputs = [ gradle_6 perl ];
buildPhase = ''
export GRADLE_USER_HOME=$(mktemp -d)
···
forceShare = [ "dummy" ];
outputHashAlgo = "sha256";
outputHashMode = "recursive";
+
# Downloaded jars differ by platform
+
outputHash = {
+
x86_64-linux = "/gJFoT+vvdSWr33oI44XiZXlFfyUjtRVB1M6CMzSztM=";
+
aarch64-linux = "v71stMWBbNALasfGAHvsVTBaDOZfpKK3sQrjNJ6FG1A=";
+
}.${stdenv.system} or (throw "Unsupported platform");
};
in stdenv.mkDerivation rec {
+
inherit pname src version postPatch;
+
+
patches = [ ./gradle-plugin.patch ];
buildPhase = ''
runHook preBuild
···
homepage = "https://signald.org";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ expipiplus1 ];
+
platforms = [ "x86_64-linux" "aarch64-linux" ];
};
}
-9
pkgs/applications/networking/instant-messengers/signald/git-describe-always.patch
···
-
diff --git a/version.sh b/version.sh
-
index 7aeeb3c..060cba3 100755
-
--- a/version.sh
-
+++ b/version.sh
-
@@ -1,3 +1,3 @@
-
#!/bin/sh
-
-VERSION=$(git describe --exact-match 2> /dev/null) || VERSION=$(git describe --abbrev=0)+git$(date +%Y-%m-%d)r$(git rev-parse --short=8 HEAD).$(git rev-list $(git describe --abbrev=0)..HEAD --count)
-
+VERSION=$(git describe --exact-match 2> /dev/null) || VERSION=$(git describe --always --abbrev=0)+git$(date +%Y-%m-%d)r$(git rev-parse --short=8 HEAD).$(git rev-list $(git describe --always --abbrev=0)..HEAD --count)
-
echo $VERSION
···
+1 -8
pkgs/applications/networking/instant-messengers/signald/gradle-plugin.patch
···
index 11d7a99..66805bb 100644
--- a/build.gradle
+++ b/build.gradle
-
@@ -3,9 +3,12 @@ import org.gradle.nativeplatform.platform.internal.OperatingSystemInternal
import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
import org.xml.sax.SAXParseException
···
apply plugin: 'java'
apply plugin: 'application'
-
@@ -185,4 +188,4 @@ task integrationTest(type: Test) {
-
testClassesDirs = sourceSets.integrationTest.output.classesDirs
-
classpath = sourceSets.integrationTest.runtimeClasspath
-
outputs.upToDateWhen { false }
-
-}
-
\ No newline at end of file
-
+}
···
index 11d7a99..66805bb 100644
--- a/build.gradle
+++ b/build.gradle
+
@@ -18,9 +18,12 @@ import org.gradle.nativeplatform.platform.internal.OperatingSystemInternal
import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
import org.xml.sax.SAXParseException
···
apply plugin: 'java'
apply plugin: 'application'