From 939b767fc7f35800ce06849280b09cd72a30e788 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sun, 22 Aug 2021 13:15:32 +0200 Subject: [PATCH 1/5] python3Packages.desktop-notifier: 3.3.1 -> 3.3.2 --- pkgs/development/python-modules/desktop-notifier/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/desktop-notifier/default.nix b/pkgs/development/python-modules/desktop-notifier/default.nix index ee6e1db06aca..51d041e3a808 100644 --- a/pkgs/development/python-modules/desktop-notifier/default.nix +++ b/pkgs/development/python-modules/desktop-notifier/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "desktop-notifier"; - version = "3.3.1"; + version = "3.3.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "SamSchott"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GbsbwCKRTgLk0xK6MGKb1Tp6cd8q3h6OUdJ2f+VPyzk="; + sha256 = "sha256-h7an/Fm9pNnThCHXg9PAKG822dqXE/CUuW8lDJlwMfw="; }; propagatedBuildInputs = [ From 0bff301efb117ea3919a8d02641de843c607b727 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sun, 22 Aug 2021 13:10:49 +0200 Subject: [PATCH 2/5] python3Packages.maestral: 1.4.6 -> 1.4.8 --- pkgs/development/python-modules/maestral/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/maestral/default.nix b/pkgs/development/python-modules/maestral/default.nix index 50180f43b8ed..070030582648 100644 --- a/pkgs/development/python-modules/maestral/default.nix +++ b/pkgs/development/python-modules/maestral/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "maestral"; - version = "1.4.6"; + version = "1.4.8"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "SamSchott"; repo = "maestral"; rev = "v${version}"; - sha256 = "sha256-kaRcM8Z0xeDp3JYputKZmzTfYYq2oKpF7AM6ciFF7I4="; + sha256 = "sha256-sxPogzQW+P8yrqaaJHrQu7e0ztgwWUI0kLikcmrhYoQ="; }; propagatedBuildInputs = [ From 5315bb16390b541bbdf77b41511faffbbe97bbed Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sun, 22 Aug 2021 13:11:08 +0200 Subject: [PATCH 3/5] maestral-gui: 1.4.6 -> 1.4.8 --- pkgs/applications/networking/maestral-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/maestral-qt/default.nix b/pkgs/applications/networking/maestral-qt/default.nix index 18189f64a6d6..cff3e3f13f4c 100644 --- a/pkgs/applications/networking/maestral-qt/default.nix +++ b/pkgs/applications/networking/maestral-qt/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "maestral-qt"; - version = "1.4.6"; + version = "1.4.8"; disabled = python3.pkgs.pythonOlder "3.6"; src = fetchFromGitHub { owner = "SamSchott"; repo = "maestral-qt"; rev = "v${version}"; - sha256 = "sha256-Y4n67LJyNUsLmGMu7B73n888qmCQ9HjxCSM1MlfTbqQ="; + sha256 = "sha256-lP6ASWizIQC3TkkIOHS6cBbgLNoGrSx/sThtl9bMjys="; }; propagatedBuildInputs = with python3.pkgs; [ From 48c079758a4b4d2a50966715571f2d7c9b53c06c Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sun, 22 Aug 2021 22:55:38 +0200 Subject: [PATCH 4/5] python3Packages.maestral: Add tests --- .../python-modules/maestral/default.nix | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/maestral/default.nix b/pkgs/development/python-modules/maestral/default.nix index 070030582648..e1dc687f54fb 100644 --- a/pkgs/development/python-modules/maestral/default.nix +++ b/pkgs/development/python-modules/maestral/default.nix @@ -5,6 +5,7 @@ , python , click, desktop-notifier, dropbox, fasteners, keyring, keyrings-alt, packaging, pathspec, Pyro5, requests, setuptools, sdnotify, survey, watchdog , importlib-metadata +, pytestCheckHook }: buildPythonPackage rec { @@ -44,8 +45,24 @@ buildPythonPackage rec { "--prefix" "PYTHONPATH" ":" "$out/lib/${python.libPrefix}/site-packages" ]; - # no tests - doCheck = false; + checkInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # We don't want to benchmark + "test_performance" + # Requires systemd + "test_autostart" + # Requires network access + "test_check_for_updates" + # Tries to look at /usr + "test_filestatus" + "test_path_exists_case_insensitive" + "test_cased_path_candidates" + ]; + + pythonImportsCheck = [ "maestral" ]; meta = with lib; { description = "Open-source Dropbox client for macOS and Linux"; From 51a14e3340e38fe2568d9f92beb0ca418dc42a64 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sun, 22 Aug 2021 22:56:57 +0200 Subject: [PATCH 5/5] maestral-gui: Add pythonImportsCheck --- pkgs/applications/networking/maestral-qt/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/maestral-qt/default.nix b/pkgs/applications/networking/maestral-qt/default.nix index cff3e3f13f4c..2040aa39cebd 100644 --- a/pkgs/applications/networking/maestral-qt/default.nix +++ b/pkgs/applications/networking/maestral-qt/default.nix @@ -40,6 +40,8 @@ python3.pkgs.buildPythonApplication rec { # no tests doCheck = false; + pythonImportsCheck = [ "maestral_qt" ]; + meta = with lib; { description = "GUI front-end for maestral (an open-source Dropbox client) for Linux"; license = licenses.mit;