Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2021-02-01 06:19:49 +00:00 committed by GitHub
commit 78b15a05d9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 23 additions and 19 deletions

View file

@ -1,26 +1,27 @@
{ buildPythonApplication, fetchFromGitHub, lib, paramiko, peewee, pyqt5
, python-dateutil, APScheduler, psutil, qdarkstyle, secretstorage
, appdirs, setuptools, qt5
{ lib
, python3
, fetchFromGitHub
, wrapQtAppsHook
}:
buildPythonApplication rec {
python3.pkgs.buildPythonApplication rec {
pname = "vorta";
version = "0.7.1";
version = "0.7.2";
src = fetchFromGitHub {
owner = "borgbase";
repo = "vorta";
rev = "v${version}";
sha256 = "069fq5gv324l2ap3g6m6i12lhq1iqm27dsmaagyc3sva945j0gxw";
sha256 = "1amq0fz3xrnxplzd6ih2azx6b4k1w496kcr7f8agfp617f5rkwa5";
};
postPatch = ''
sed -i -e '/setuptools_git/d' -e '/pytest-runner/d' setup.cfg
'';
nativeBuildInputs = [ qt5.wrapQtAppsHook ];
nativeBuildInputs = [ wrapQtAppsHook ];
propagatedBuildInputs = [
propagatedBuildInputs = with python3.pkgs; [
paramiko peewee pyqt5 python-dateutil APScheduler psutil qdarkstyle
secretstorage appdirs setuptools
];
@ -33,7 +34,7 @@ buildPythonApplication rec {
'';
meta = with lib; {
license = licenses.gpl3;
license = licenses.gpl3Only;
homepage = "https://vorta.borgbase.com/";
maintainers = with maintainers; [ ma27 ];
description = "Desktop Backup Client for Borg";

View file

@ -1,13 +1,13 @@
{ stdenv, lib, fetchurl, makeWrapper, jre_headless, libmatthew_java, dbus, dbus_java }:
{ stdenv, lib, fetchurl, makeWrapper, openjdk11_headless, libmatthew_java, dbus, dbus_java }:
stdenv.mkDerivation rec {
pname = "signal-cli";
version = "0.6.12";
version = "0.7.4";
# Building from source would be preferred, but is much more involved.
src = fetchurl {
url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}.tar.gz";
sha256 = "0i1y2p5qi2bwhkm8sv0wkb0lfi2vm26qalnpg6kn0ikcxkqkq5bc";
sha256 = "18dv2944nsryl6372jqgb52z3s1grvgfc5sb1b1rgn0y84g8g46n";
};
buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ];
@ -18,15 +18,15 @@ stdenv.mkDerivation rec {
cp -r lib $out/lib
cp bin/signal-cli $out/bin/signal-cli
'' + (if stdenv.isLinux then ''
makeWrapper ${jre_headless}/bin/java $out/bin/signal-cli \
--set JAVA_HOME "${jre_headless}" \
makeWrapper ${openjdk11_headless}/bin/java $out/bin/signal-cli \
--set JAVA_HOME "${openjdk11_headless}" \
--add-flags "-classpath '$out/lib/*:${libmatthew_java}/lib/jni'" \
--add-flags "-Djava.library.path=${libmatthew_java}/lib/jni:${dbus_java}/share/java/dbus:$out/lib" \
--add-flags "org.asamk.signal.Main"
'' else ''
wrapProgram $out/bin/signal-cli \
--prefix PATH : ${lib.makeBinPath [ jre_headless ]} \
--set JAVA_HOME ${jre_headless}
--prefix PATH : ${lib.makeBinPath [ openjdk11_headless ]} \
--set JAVA_HOME ${openjdk11_headless}
'');
# Execution in the macOS (10.13) sandbox fails with

View file

@ -48,6 +48,6 @@ stdenv.mkDerivation rec {
description = "High-quality data compression program";
license = licenses.bsdOriginal;
platforms = platforms.all;
maintainers = [];
maintainers = with maintainers; [ mic92 ];
};
}

View file

@ -21,6 +21,9 @@ rustPlatform.buildRustPackage rec {
Security
];
# cargo test has an x86-only dependency
doCheck = stdenv.hostPlatform.isx86;
postBuild = ''
cargo run --example generate-docs
cargo run --example generate-completions

View file

@ -33,6 +33,6 @@ stdenv.mkDerivation rec {
license = lib.licenses.gpl3Plus;
platforms = lib.platforms.unix;
maintainers = [ ];
maintainers = with lib.maintainers; [ mic92 ];
};
}

View file

@ -3792,7 +3792,7 @@ in
volctl = callPackage ../tools/audio/volctl { };
vorta = python3Packages.callPackage ../applications/backup/vorta { };
vorta = libsForQt5.callPackage ../applications/backup/vorta { };
utahfs = callPackage ../applications/networking/utahfs { };