Merge pull request #111413 from dotlambda/vorta-0.7.2

vorta: 0.7.1 -> 0.7.2

authored by Graham Christensen and committed by GitHub 86d5d965 f23bfffc

+11 -10
+10 -9
pkgs/applications/backup/vorta/default.nix
··· 1 - { buildPythonApplication, fetchFromGitHub, lib, paramiko, peewee, pyqt5 2 - , python-dateutil, APScheduler, psutil, qdarkstyle, secretstorage 3 - , appdirs, setuptools, qt5 1 + { lib 2 + , python3 3 + , fetchFromGitHub 4 + , wrapQtAppsHook 4 5 }: 5 6 6 - buildPythonApplication rec { 7 + python3.pkgs.buildPythonApplication rec { 7 8 pname = "vorta"; 8 - version = "0.7.1"; 9 + version = "0.7.2"; 9 10 10 11 src = fetchFromGitHub { 11 12 owner = "borgbase"; 12 13 repo = "vorta"; 13 14 rev = "v${version}"; 14 - sha256 = "069fq5gv324l2ap3g6m6i12lhq1iqm27dsmaagyc3sva945j0gxw"; 15 + sha256 = "1amq0fz3xrnxplzd6ih2azx6b4k1w496kcr7f8agfp617f5rkwa5"; 15 16 }; 16 17 17 18 postPatch = '' 18 19 sed -i -e '/setuptools_git/d' -e '/pytest-runner/d' setup.cfg 19 20 ''; 20 21 21 - nativeBuildInputs = [ qt5.wrapQtAppsHook ]; 22 + nativeBuildInputs = [ wrapQtAppsHook ]; 22 23 23 - propagatedBuildInputs = [ 24 + propagatedBuildInputs = with python3.pkgs; [ 24 25 paramiko peewee pyqt5 python-dateutil APScheduler psutil qdarkstyle 25 26 secretstorage appdirs setuptools 26 27 ]; ··· 33 34 ''; 34 35 35 36 meta = with lib; { 36 - license = licenses.gpl3; 37 + license = licenses.gpl3Only; 37 38 homepage = "https://vorta.borgbase.com/"; 38 39 maintainers = with maintainers; [ ma27 ]; 39 40 description = "Desktop Backup Client for Borg";
+1 -1
pkgs/top-level/all-packages.nix
··· 3792 3792 3793 3793 volctl = callPackage ../tools/audio/volctl { }; 3794 3794 3795 - vorta = python3Packages.callPackage ../applications/backup/vorta { }; 3795 + vorta = libsForQt5.callPackage ../applications/backup/vorta { }; 3796 3796 3797 3797 utahfs = callPackage ../applications/networking/utahfs { }; 3798 3798