diff --git a/pkgs/development/python-modules/maestral/default.nix b/pkgs/development/python-modules/maestral/default.nix index 125270ef1230..2ae7cdc88cce 100644 --- a/pkgs/development/python-modules/maestral/default.nix +++ b/pkgs/development/python-modules/maestral/default.nix @@ -3,20 +3,22 @@ , fetchFromGitHub , pythonOlder , python -, alembic, bugsnag, click, dropbox, fasteners, keyring, keyrings-alt, packaging, pathspec, Pyro5, requests, setuptools, sdnotify, sqlalchemy, watchdog +, alembic, bugsnag, click, dropbox, fasteners, keyring, keyrings-alt, packaging, pathspec, Pyro5, requests, setuptools, sdnotify, sqlalchemy, survey, watchdog +, importlib-metadata +, importlib-resources , dbus-next }: buildPythonPackage rec { pname = "maestral"; - version = "1.2.1"; + version = "1.3.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "SamSchott"; repo = "maestral"; rev = "v${version}"; - sha256 = "sha256-kh3FYBSVOU4ywrYl6ONEIbLbkSuZmexNJC9dB+JtUjM="; + sha256 = "sha256-jAkSLWGv1UpdZslAast3Z5TnDCnxx5wNTxW4kvoH8GE="; }; propagatedBuildInputs = [ @@ -34,7 +36,12 @@ buildPythonPackage rec { setuptools sdnotify sqlalchemy + survey watchdog + ] ++ stdenv.lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ] ++ stdenv.lib.optionals (pythonOlder "3.9") [ + importlib-resources ] ++ stdenv.lib.optionals stdenv.isLinux [ dbus-next ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1077312cf802..f153d73f4a1a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3646,7 +3646,24 @@ in { macropy = callPackage ../development/python-modules/macropy { }; - maestral = callPackage ../development/python-modules/maestral { }; + maestral = callPackage ../development/python-modules/maestral { + + # https://github.com/SamSchott/maestral/issues/250#issuecomment-739510048 + survey = self.survey.overridePythonAttrs (old: rec { + version = "2.2.1"; + src = old.src.override { + inherit version; + sha256 = "sha256-7ubWkqk1vyaJDLMOuKwUx2Bjziyi3HqpaQq4pKp4Z+0="; + }; + }); + watchdog = self.watchdog.overridePythonAttrs (old: rec { + version = "0.10.3"; + src = old.src.override { + inherit version; + sha256 = "4214e1379d128b0588021880ccaf40317ee156d4603ac388b9adcf29165e0c04"; + }; + }); + }; magic = callPackage ../development/python-modules/magic { };