From 6a0149df08722ae8647b26327a0493df58eeb98e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 6 Sep 2020 11:10:21 +0200 Subject: vorta: 0.6.26 -> 0.7.0 https://github.com/borgbase/vorta/releases/tag/v0.7.0 --- pkgs/applications/backup/vorta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/backup/vorta/default.nix') diff --git a/pkgs/applications/backup/vorta/default.nix b/pkgs/applications/backup/vorta/default.nix index f1c0b056c82..1a233b3d93e 100644 --- a/pkgs/applications/backup/vorta/default.nix +++ b/pkgs/applications/backup/vorta/default.nix @@ -5,13 +5,13 @@ buildPythonApplication rec { pname = "vorta"; - version = "0.6.26"; + version = "0.7.0"; src = fetchFromGitHub { owner = "borgbase"; repo = "vorta"; rev = "v${version}"; - sha256 = "189kzwdmissg9142cd7wvxa1rvc2y7lysgr7if99zc7ks59mv6dq"; + sha256 = "1hz19c0lphwql881n7w0ls39bbl63lccx57c3klwfyzgsxcgdy2j"; }; postPatch = '' -- cgit 1.4.1 From 195842dd869182d86e3bd2c29f741ea2c457188d Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 10 Sep 2020 23:37:00 +0200 Subject: vorta: 0.7.0 -> 0.7.1 https://github.com/borgbase/vorta/releases/tag/v0.7.1 --- pkgs/applications/backup/vorta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/backup/vorta/default.nix') diff --git a/pkgs/applications/backup/vorta/default.nix b/pkgs/applications/backup/vorta/default.nix index 1a233b3d93e..3c6a9587a65 100644 --- a/pkgs/applications/backup/vorta/default.nix +++ b/pkgs/applications/backup/vorta/default.nix @@ -5,13 +5,13 @@ buildPythonApplication rec { pname = "vorta"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "borgbase"; repo = "vorta"; rev = "v${version}"; - sha256 = "1hz19c0lphwql881n7w0ls39bbl63lccx57c3klwfyzgsxcgdy2j"; + sha256 = "069fq5gv324l2ap3g6m6i12lhq1iqm27dsmaagyc3sva945j0gxw"; }; postPatch = '' -- cgit 1.4.1 From 883b21debe5e223038715917a527395a4f794bdb Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 8 Oct 2020 18:21:40 +0300 Subject: vorta: Fix double wrapping --- pkgs/applications/backup/vorta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/backup/vorta/default.nix') diff --git a/pkgs/applications/backup/vorta/default.nix b/pkgs/applications/backup/vorta/default.nix index 3c6a9587a65..fc7e6c0fc35 100644 --- a/pkgs/applications/backup/vorta/default.nix +++ b/pkgs/applications/backup/vorta/default.nix @@ -28,8 +28,8 @@ buildPythonApplication rec { # QT setup in tests broken. doCheck = false; - postFixup = '' - wrapQtApp $out/bin/vorta + preFixup = '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") ''; meta = with lib; { -- cgit 1.4.1 From 621342dec94e74a5116e60c59fa4f58f160ce220 Mon Sep 17 00:00:00 2001 From: Robert Schütz Date: Sun, 31 Jan 2021 10:56:45 +0100 Subject: vorta: 0.7.1 -> 0.7.2 --- pkgs/applications/backup/vorta/default.nix | 19 ++++++++++--------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 11 insertions(+), 10 deletions(-) (limited to 'pkgs/applications/backup/vorta/default.nix') diff --git a/pkgs/applications/backup/vorta/default.nix b/pkgs/applications/backup/vorta/default.nix index fc7e6c0fc35..a1b5944a51e 100644 --- a/pkgs/applications/backup/vorta/default.nix +++ b/pkgs/applications/backup/vorta/default.nix @@ -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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 172406ec710..185c84a9180 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; -- cgit 1.4.1 From 0972cacdbea723d18be210190bda56ccbecb87d4 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 18 Feb 2021 15:44:52 +0100 Subject: vorta: 0.7.2 -> 0.7.3 ChangeLog: https://github.com/borgbase/vorta/releases/tag/v0.7.3 --- pkgs/applications/backup/vorta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/backup/vorta/default.nix') diff --git a/pkgs/applications/backup/vorta/default.nix b/pkgs/applications/backup/vorta/default.nix index a1b5944a51e..690a25d6b4d 100644 --- a/pkgs/applications/backup/vorta/default.nix +++ b/pkgs/applications/backup/vorta/default.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "vorta"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "borgbase"; repo = "vorta"; rev = "v${version}"; - sha256 = "1amq0fz3xrnxplzd6ih2azx6b4k1w496kcr7f8agfp617f5rkwa5"; + sha256 = "sha256-nnnGqkT4sAunaT7GPysYQGeV34ZrRFaHK/gJRafvR3U="; }; postPatch = '' -- cgit 1.4.1 From 84ed14ac60803aba29e38ac2b1307b9d406bc6f4 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 26 Feb 2021 10:24:30 +0100 Subject: vorta: 0.7.3 -> 0.7.4 ChangeLog: https://github.com/borgbase/vorta/releases/tag/v0.7.4 --- pkgs/applications/backup/vorta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/backup/vorta/default.nix') diff --git a/pkgs/applications/backup/vorta/default.nix b/pkgs/applications/backup/vorta/default.nix index 690a25d6b4d..1809777ed54 100644 --- a/pkgs/applications/backup/vorta/default.nix +++ b/pkgs/applications/backup/vorta/default.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "vorta"; - version = "0.7.3"; + version = "0.7.4"; src = fetchFromGitHub { owner = "borgbase"; repo = "vorta"; rev = "v${version}"; - sha256 = "sha256-nnnGqkT4sAunaT7GPysYQGeV34ZrRFaHK/gJRafvR3U="; + sha256 = "sha256-+WQ3p2ddyQpJqCLc1HqFZlKK85VkX2Iv2eXEcVkBs6g="; }; postPatch = '' -- cgit 1.4.1 From d4821a48929dc885fc44a91879189e211bcb702e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 3 Mar 2021 14:39:27 +0100 Subject: vorta: 0.7.4 -> 0.7.5 ChangeLog: https://github.com/borgbase/vorta/releases/tag/v0.7.5 --- pkgs/applications/backup/vorta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/backup/vorta/default.nix') diff --git a/pkgs/applications/backup/vorta/default.nix b/pkgs/applications/backup/vorta/default.nix index 1809777ed54..c37bf0f20f7 100644 --- a/pkgs/applications/backup/vorta/default.nix +++ b/pkgs/applications/backup/vorta/default.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "vorta"; - version = "0.7.4"; + version = "0.7.5"; src = fetchFromGitHub { owner = "borgbase"; repo = "vorta"; rev = "v${version}"; - sha256 = "sha256-+WQ3p2ddyQpJqCLc1HqFZlKK85VkX2Iv2eXEcVkBs6g="; + sha256 = "sha256-qPO8qmXYDDFwV+8hAUyfF4Ins0vkwEJbw4JPguUSYOw="; }; postPatch = '' -- cgit 1.4.1 From 226cbcbaf7c809aa3f571488ad146acf40158adc Mon Sep 17 00:00:00 2001 From: Robert Schütz Date: Fri, 7 May 2021 13:22:55 +0200 Subject: vorta: add borgbackup to $PATH --- pkgs/applications/backup/vorta/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'pkgs/applications/backup/vorta/default.nix') diff --git a/pkgs/applications/backup/vorta/default.nix b/pkgs/applications/backup/vorta/default.nix index c37bf0f20f7..fc56d6c5400 100644 --- a/pkgs/applications/backup/vorta/default.nix +++ b/pkgs/applications/backup/vorta/default.nix @@ -2,6 +2,7 @@ , python3 , fetchFromGitHub , wrapQtAppsHook +, borgbackup }: python3.pkgs.buildPythonApplication rec { @@ -30,7 +31,10 @@ python3.pkgs.buildPythonApplication rec { doCheck = false; preFixup = '' - makeWrapperArgs+=("''${qtWrapperArgs[@]}") + makeWrapperArgs+=( + "''${qtWrapperArgs[@]}" + --prefix PATH : ${lib.makeBinPath [ borgbackup ]} + ) ''; meta = with lib; { -- cgit 1.4.1 From 7e6776d373e613566f61eccc0be86b1a8f43af8c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 9 Jun 2021 10:42:09 +0200 Subject: vorta: 0.7.5 -> 0.7.6 ChangeLog: https://github.com/borgbase/vorta/releases/tag/v0.7.6 --- pkgs/applications/backup/vorta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/backup/vorta/default.nix') diff --git a/pkgs/applications/backup/vorta/default.nix b/pkgs/applications/backup/vorta/default.nix index fc56d6c5400..4cb21e5267d 100644 --- a/pkgs/applications/backup/vorta/default.nix +++ b/pkgs/applications/backup/vorta/default.nix @@ -7,13 +7,13 @@ python3.pkgs.buildPythonApplication rec { pname = "vorta"; - version = "0.7.5"; + version = "0.7.6"; src = fetchFromGitHub { owner = "borgbase"; repo = "vorta"; rev = "v${version}"; - sha256 = "sha256-qPO8qmXYDDFwV+8hAUyfF4Ins0vkwEJbw4JPguUSYOw="; + sha256 = "sha256-bzhabRVgl1eLTS4KtFkn4xw2KDTZJyFU6zCJdHW5IGE="; }; postPatch = '' -- cgit 1.4.1 From 5244b041dcec13766c35d3c3e8276f552761644b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 21 Jun 2021 09:42:30 +0200 Subject: vorta: 0.7.6 -> 0.7.7 ChangeLog: https://github.com/borgbase/vorta/releases/tag/v0.7.7 --- pkgs/applications/backup/vorta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/backup/vorta/default.nix') diff --git a/pkgs/applications/backup/vorta/default.nix b/pkgs/applications/backup/vorta/default.nix index 4cb21e5267d..347a0de0503 100644 --- a/pkgs/applications/backup/vorta/default.nix +++ b/pkgs/applications/backup/vorta/default.nix @@ -7,13 +7,13 @@ python3.pkgs.buildPythonApplication rec { pname = "vorta"; - version = "0.7.6"; + version = "0.7.7"; src = fetchFromGitHub { owner = "borgbase"; repo = "vorta"; rev = "v${version}"; - sha256 = "sha256-bzhabRVgl1eLTS4KtFkn4xw2KDTZJyFU6zCJdHW5IGE="; + sha256 = "sha256-AH9CvoWAaNLPLC+NL+VXtYq9CNCMt0AFtC1ZGXSlcHQ="; }; postPatch = '' -- cgit 1.4.1 From eaf590d941ddb5aa3538774ec428ed428ddebde0 Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 24 Jun 2021 02:26:45 +0300 Subject: vorta: enable tests and install the desktop file --- pkgs/applications/backup/vorta/default.nix | 69 +++++++++++++++++++++++++----- 1 file changed, 58 insertions(+), 11 deletions(-) (limited to 'pkgs/applications/backup/vorta/default.nix') diff --git a/pkgs/applications/backup/vorta/default.nix b/pkgs/applications/backup/vorta/default.nix index 347a0de0503..dc02e65bb7b 100644 --- a/pkgs/applications/backup/vorta/default.nix +++ b/pkgs/applications/backup/vorta/default.nix @@ -1,11 +1,12 @@ { lib -, python3 +, python3Packages , fetchFromGitHub , wrapQtAppsHook , borgbackup +, qt5 }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "vorta"; version = "0.7.7"; @@ -16,19 +17,34 @@ python3.pkgs.buildPythonApplication rec { sha256 = "sha256-AH9CvoWAaNLPLC+NL+VXtYq9CNCMt0AFtC1ZGXSlcHQ="; }; - postPatch = '' - sed -i -e '/setuptools_git/d' -e '/pytest-runner/d' setup.cfg - ''; - nativeBuildInputs = [ wrapQtAppsHook ]; - propagatedBuildInputs = with python3.pkgs; [ - paramiko peewee pyqt5 python-dateutil APScheduler psutil qdarkstyle - secretstorage appdirs setuptools + propagatedBuildInputs = with python3Packages; [ + paramiko + peewee + pyqt5 + python-dateutil + APScheduler + psutil + qdarkstyle + secretstorage + appdirs + setuptools ]; - # QT setup in tests broken. - doCheck = false; + postPatch = '' + substituteInPlace setup.cfg \ + --replace setuptools_git "" \ + --replace pytest-runner "" + + substituteInPlace src/vorta/assets/metadata/com.borgbase.Vorta.desktop \ + --replace Exec=vorta "Exec=$out/bin/vorta" \ + --replace com.borgbase.Vorta "com.borgbase.Vorta-symbolic" + ''; + + postInstall = '' + install -Dm644 src/vorta/assets/metadata/com.borgbase.Vorta.desktop $out/share/applications/com.borgbase.Vorta.desktop + ''; preFixup = '' makeWrapperArgs+=( @@ -37,6 +53,37 @@ python3.pkgs.buildPythonApplication rec { ) ''; + checkInputs = with python3Packages; [ + pytest-qt + pytest-mock + pytestCheckHook + ]; + + preCheck = '' + export HOME=$(mktemp -d) + # For tests/test_misc.py::test_autostart + mkdir -p $HOME/.config/autostart + export QT_PLUGIN_PATH="${qt5.qtbase.bin}/${qt5.qtbase.qtPluginPrefix}" + export QT_QPA_PLATFORM=offscreen + ''; + + disabledTestPaths = [ + "tests/test_archives.py" + "tests/test_borg.py" + "tests/test_lock.py" + "tests/test_notifications.py" + ]; + + disabledTests = [ + "diff_archives_dict_issue-Users" + "diff_archives-test" + "test_repo_unlink" + "test_repo_add_success" + "test_ssh_dialog" + "test_create" + "test_scheduler_create_backup" + ]; + meta = with lib; { license = licenses.gpl3Only; homepage = "https://vorta.borgbase.com/"; -- cgit 1.4.1