Merge pull request #113211 from SFrijters/maestral-1.4

This commit is contained in:
Sandro
2021-02-17 23:49:57 +01:00
committed by GitHub
8 changed files with 63 additions and 34 deletions
@@ -0,0 +1,38 @@
{ lib
, buildPythonPackage
, fetchPypi
, pythonOlder
, stdenv
, packaging
, importlib-resources
, dbus-next
}:
buildPythonPackage rec {
pname = "desktop-notifier";
version = "3.2.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-D8/amC6SwXkm8Ao8G2Vn9FNpbqyFJFBUVcngkW5g8k0=";
};
propagatedBuildInputs = [
packaging
] ++ lib.optionals (pythonOlder "3.9") [
importlib-resources
] ++ lib.optionals stdenv.isLinux [
dbus-next
];
# no tests available, do the imports check instead
doCheck = false;
pythonImportsCheck = [ "desktop_notifier" ];
meta = with lib; {
homepage = "https://github.com/samschott/desktop-notifier";
description = "A Python library for cross-platform desktop notifications";
license = licenses.mit;
maintainers = with maintainers; [ sfrijters ];
};
}
@@ -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 = [
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "survey";
version = "3.1.1";
version = "3.4.2";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-R/PfXW/CnqYiOWbCxPAYwneg6j6CLvdIpITZ2eIXn+M=";
sha256 = "sha256-aF7ZS5oxeIOb7mJsrusdc3HefcPE+3OTXcJB/pjJxFY=";
};
propagatedBuildInputs = [
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "watchdog";
version = "1.0.2";
version = "2.0.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-N2y8KjXAOSsP5/8W+8GzA/2Z1N2ZEatVge6daa3IiYI=";
sha256 = "sha256-/UtWz74NDZxPxDGs7KdXAKfxLTc33C6csuwrpkloBCU=";
};
buildInputs = lib.optionals stdenv.isDarwin
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "wrapio";
version = "0.3.8";
version = "1.0.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-jGupLh+xzwil+VBtAjIG+ZYT+dy+QaZOTIfipTQeyWo";
sha256 = "sha256-JWcPsqZy1wM6/mbU3H0W3EkpLg0wrEUUg3pT/QrL+rE=";
};
doCheck = false;