about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMartin Weinelt <mweinelt@users.noreply.github.com>2022-12-28 22:30:25 +0100
committerGitHub <noreply@github.com>2022-12-28 22:30:25 +0100
commit0eac96c810a7e3163209886f7498a94162eb2026 (patch)
treecfb699c5c1f671867d463c9a236d33c870fc45c3
parent94970cfb77746fd1f988bc85c742bc41aaf05277 (diff)
parentdbeea53715caf8730d6acf7d8b6a38d589daf12f (diff)
Merge pull request #206453 from SFrijters/maestral-1.6.4
-rw-r--r--pkgs/applications/networking/maestral-qt/default.nix4
-rw-r--r--pkgs/development/python-modules/maestral/default.nix15
2 files changed, 10 insertions, 9 deletions
diff --git a/pkgs/applications/networking/maestral-qt/default.nix b/pkgs/applications/networking/maestral-qt/default.nix
index 62f44f6f134a3..cc19511d87cc9 100644
--- a/pkgs/applications/networking/maestral-qt/default.nix
+++ b/pkgs/applications/networking/maestral-qt/default.nix
@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "maestral-qt";
-  version = "1.6.3";
+  version = "1.6.5";
   disabled = python3.pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "SamSchott";
     repo = "maestral-qt";
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-Fvr5WhrhxPBeAMsrVj/frg01qgt2SeWgrRJYgBxRFHc=";
+    hash = "sha256-yKsCM8LZ/GR/bc2WW+Ml1vSroB4iaxh09Az/B+aIVBU=";
   };
 
   format = "pyproject";
diff --git a/pkgs/development/python-modules/maestral/default.nix b/pkgs/development/python-modules/maestral/default.nix
index c69dac5176796..3effa92825622 100644
--- a/pkgs/development/python-modules/maestral/default.nix
+++ b/pkgs/development/python-modules/maestral/default.nix
@@ -9,24 +9,25 @@
 , desktop-notifier
 , dropbox
 , fasteners
+, importlib-metadata
 , keyring
 , keyrings-alt
 , packaging
 , pathspec
 , Pyro5
 , requests
+, rich
 , setuptools
-, sdnotify
 , survey
+, typing-extensions
 , watchdog
-, importlib-metadata
 , pytestCheckHook
 , nixosTests
 }:
 
 buildPythonPackage rec {
   pname = "maestral";
-  version = "1.6.3";
+  version = "1.6.5";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -35,7 +36,7 @@ buildPythonPackage rec {
     owner = "SamSchott";
     repo = "maestral";
     rev = "refs/tags/v${version}";
-    hash = "sha256-JVzaWwdHAn5JOruLEN9Z2/5eV1oh3J2NQffNI3RqYfA=";
+    hash = "sha256-YCPMPkvMaZ0uzTiiCbXFDpgDS0yGlfF0wKK2HhYmH+Y=";
   };
 
   propagatedBuildInputs = [
@@ -44,18 +45,18 @@ buildPythonPackage rec {
     dbus-python
     dropbox
     fasteners
+    importlib-metadata
     keyring
     keyrings-alt
     packaging
     pathspec
     Pyro5
     requests
+    rich
     setuptools
-    sdnotify
     survey
+    typing-extensions
     watchdog
-  ] ++ lib.optionals (pythonOlder "3.8") [
-    importlib-metadata
   ];
 
   makeWrapperArgs = [