pythonPackages.maestral: 1.3.1 -> 1.4.2

This commit is contained in:
Stefan Frijters 2021-02-15 12:55:29 +01:00
parent a87d941bd7
commit 1c31382a4e
No known key found for this signature in database
GPG key ID: 7619A6BC6E7DFA6F
2 changed files with 8 additions and 20 deletions

View file

@ -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 = [

View file

@ -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";
keyring = self.keyring.overridePythonAttrs (old: rec {
version = "22.0.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";
sha256 = "sha256-mss+FFLtu3VEgisS/SVFkHh2nlYPpR9Bi20Ar6pheN8=";
};
});
};