diff --git a/pkgs/applications/networking/maestral-qt/default.nix b/pkgs/applications/networking/maestral-qt/default.nix index 3c30bc4fd3f6..0027fe8804de 100644 --- a/pkgs/applications/networking/maestral-qt/default.nix +++ b/pkgs/applications/networking/maestral-qt/default.nix @@ -1,16 +1,17 @@ -{ lib -, fetchFromGitHub -, python3 -, qtbase -, qtsvg -, qtwayland -, nixosTests -, wrapQtAppsHook +{ + lib, + fetchFromGitHub, + python3, + qtbase, + qtsvg, + qtwayland, + nixosTests, + wrapQtAppsHook, }: python3.pkgs.buildPythonApplication rec { pname = "maestral-qt"; - version = "1.9.3"; + version = "1.9.4"; pyproject = true; disabled = python3.pythonOlder "3.7"; @@ -19,12 +20,10 @@ python3.pkgs.buildPythonApplication rec { owner = "SamSchott"; repo = "maestral-qt"; rev = "refs/tags/v${version}"; - hash = "sha256-7Lt0Neobtofd1JDoz8BhGn+nFKaMLbM/6z0QQmtEKpA="; + hash = "sha256-VkJOKKYnoXux3WjD1JwINGWwv1SMIXfidyV2ITE7dJc="; }; - build-system = with python3.pkgs; [ - setuptools - ]; + build-system = with python3.pkgs; [ setuptools ]; dependencies = with python3.pkgs; [ click @@ -37,12 +36,10 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ qtwayland qtbase - qtsvg # Needed for the systray icon + qtsvg # Needed for the systray icon ]; - nativeBuildInputs = [ - wrapQtAppsHook - ]; + nativeBuildInputs = [ wrapQtAppsHook ]; dontWrapQtApps = true; @@ -67,7 +64,10 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://maestral.app"; changelog = "https://github.com/samschott/maestral/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ peterhoeg sfrijters ]; + maintainers = with maintainers; [ + peterhoeg + sfrijters + ]; platforms = platforms.linux; mainProgram = "maestral_qt"; }; diff --git a/pkgs/development/python-modules/maestral/default.nix b/pkgs/development/python-modules/maestral/default.nix index 6f1aa28e9f0c..11750dd12b0f 100644 --- a/pkgs/development/python-modules/maestral/default.nix +++ b/pkgs/development/python-modules/maestral/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "maestral"; - version = "1.9.3"; + version = "1.9.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "SamSchott"; repo = "maestral"; rev = "refs/tags/v${version}"; - hash = "sha256-h7RDaCVICi3wl6/b1s01cINhFirDOpOXoxTPZIBH3jE="; + hash = "sha256-akh0COltpUU4Z4kfubg6A7k6W8ICoqVYkmFpMkTC8H8="; }; build-system = [ setuptools ]; @@ -67,14 +67,6 @@ buildPythonPackage rec { xattr ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ rubicon-objc ]; - patches = [ - (fetchpatch { - name = "upgrade-dropbox-version-bounds"; - url = "https://github.com/samschott/maestral/commit/8fd581fa503391534913afbc33a61132ff2e21ce.patch"; - hash = "sha256-2Dke9iF/5Ptsf3CSRHUkjdFRrmdKY+L3sILRMyYrUH0="; - }) - ]; - makeWrapperArgs = [ # Add the installed directories to the python path so the daemon can find them "--prefix PYTHONPATH : ${makePythonPath dependencies}"