public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2021-02-01 06:19:47 +00:00 committed by GitHub
commit a7e06fe8c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/applications/backup/vorta/default.nix
View File

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

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

2
pkgs/tools/compression/bzip2/default.nix
View File

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

3
pkgs/tools/security/rage/default.nix
View File

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

2
pkgs/tools/text/gnused/default.nix
View File

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

2
pkgs/top-level/all-packages.nix
View File

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