diff options
author | Stefan Frijters <sfrijters@gmail.com> | 2021-02-15 12:55:29 +0100 |
---|---|---|
committer | Stefan Frijters <sfrijters@gmail.com> | 2021-02-17 21:23:52 +0100 |
commit | 1c31382a4ef5214893611a194c8d153a14e6e18d (patch) | |
tree | b30b96286bb451bed49946084c47f2b2aad63725 | |
parent | a87d941bd7faf2b9013d7d20fb2c2c2f573661e5 (diff) | |
download | nixpkgs-1c31382a4ef5214893611a194c8d153a14e6e18d.tar nixpkgs-1c31382a4ef5214893611a194c8d153a14e6e18d.tar.gz nixpkgs-1c31382a4ef5214893611a194c8d153a14e6e18d.tar.bz2 nixpkgs-1c31382a4ef5214893611a194c8d153a14e6e18d.tar.lz nixpkgs-1c31382a4ef5214893611a194c8d153a14e6e18d.tar.xz nixpkgs-1c31382a4ef5214893611a194c8d153a14e6e18d.tar.zst nixpkgs-1c31382a4ef5214893611a194c8d153a14e6e18d.zip |
pythonPackages.maestral: 1.3.1 -> 1.4.2
-rw-r--r-- | pkgs/development/python-modules/maestral/default.nix | 13 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 15 |
2 files changed, 8 insertions, 20 deletions
diff --git a/pkgs/development/python-modules/maestral/default.nix b/pkgs/development/python-modules/maestral/default.nix index 990545e4173..cc9c35bcb92 100644 --- a/pkgs/development/python-modules/maestral/default.nix +++ b/pkgs/development/python-modules/maestral/default.nix @@ -1,30 +1,29 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , pythonOlder , python -, alembic, bugsnag, click, dropbox, fasteners, keyring, keyrings-alt, packaging, pathspec, Pyro5, requests, setuptools, sdnotify, sqlalchemy, survey, watchdog +, alembic, click, desktop-notifier, 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.3.1"; + version = "1.4.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "SamSchott"; repo = "maestral"; rev = "v${version}"; - sha256 = "sha256-SspyTdmAbbmWN3AqVp9bj/QfAKLVgU2bLiiHjZO0aCM="; + sha256 = "sha256-ibAYuaPSty275/aQ0DibyWe2LjPoEpdWgElTnR+MEs8="; }; propagatedBuildInputs = [ alembic - bugsnag click + desktop-notifier dropbox fasteners keyring @@ -42,8 +41,6 @@ buildPythonPackage rec { importlib-metadata ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources - ] ++ lib.optionals stdenv.isLinux [ - dbus-next ]; makeWrapperArgs = [ diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cdb26cfaf4d..df4cfb357c2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3872,20 +3872,11 @@ in { macropy = callPackage ../development/python-modules/macropy { }; 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"; + keyring = self.keyring.overridePythonAttrs (old: rec { + version = "22.0.1"; src = old.src.override { inherit version; - sha256 = "4214e1379d128b0588021880ccaf40317ee156d4603ac388b9adcf29165e0c04"; + sha256 = "sha256-mss+FFLtu3VEgisS/SVFkHh2nlYPpR9Bi20Ar6pheN8="; }; }); }; |