public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pythonPackages.maestral: 1.2.1 -> 1.3.0

This commit is contained in:
Stefan Frijters 2020-12-08 16:31:36 +01:00
parent 48b2d18ff6
commit cedb9654c4
No known key found for this signature in database
GPG Key ID: 7619A6BC6E7DFA6F
2 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/python-modules/maestral/default.nix
View File

@ -3,20 +3,22 @@
, fetchFromGitHub , fetchFromGitHub
, pythonOlder , pythonOlder
, python , 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 , dbus-next
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "maestral"; pname = "maestral";
version = "1.2.1"; version = "1.3.0";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "SamSchott"; owner = "SamSchott";
repo = "maestral"; repo = "maestral";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-kh3FYBSVOU4ywrYl6ONEIbLbkSuZmexNJC9dB+JtUjM="; sha256 = "sha256-jAkSLWGv1UpdZslAast3Z5TnDCnxx5wNTxW4kvoH8GE=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -34,7 +36,12 @@ buildPythonPackage rec {
setuptools setuptools
sdnotify sdnotify
sqlalchemy sqlalchemy
survey
watchdog watchdog
] ++ stdenv.lib.optionals (pythonOlder "3.8") [
importlib-metadata
] ++ stdenv.lib.optionals (pythonOlder "3.9") [
importlib-resources
] ++ stdenv.lib.optionals stdenv.isLinux [ ] ++ stdenv.lib.optionals stdenv.isLinux [
dbus-next dbus-next
]; ];

19
pkgs/top-level/python-packages.nix
View File

@ -3646,7 +3646,24 @@ in {
macropy = callPackage ../development/python-modules/macropy { }; 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 { }; magic = callPackage ../development/python-modules/magic { };