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

Merge pull request #113211 from SFrijters/maestral-1.4

Browse Source
This commit is contained in:
Sandro 2021-02-17 23:49:57 +01:00 committed by GitHub
commit d2089230cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 63 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/networking/maestral-qt/default.nix
View File

@ -6,18 +6,17 @@
python3.pkgs.buildPythonApplication rec {
pname = "maestral-qt";
version = "1.3.1";
version = "1.4.2";
disabled = python3.pkgs.pythonOlder "3.6";
src = fetchFromGitHub {
owner = "SamSchott";
repo = "maestral-qt";
rev = "v${version}";
sha256 = "sha256-2S2sa2/HVt3IRsE98PT2XwpONjaYENBzYW+ezBFrJYI=";
sha256 = "sha256-cPH0wD7RL3OifDTD48x58I4qeaLALOMFnfWXjE2/lUQ=";
};
propagatedBuildInputs = with python3.pkgs; [
bugsnag
click
markdown2
maestral

38
pkgs/development/python-modules/desktop-notifier/default.nix Normal file
View File

@ -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 ];
};
}

13
pkgs/development/python-modules/maestral/default.nix
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 = [

4
pkgs/development/python-modules/survey/default.nix
View File

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

4
pkgs/development/python-modules/watchdog/default.nix
View File

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

4
pkgs/development/python-modules/wrapio/default.nix
View File

@ -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;

12
pkgs/tools/text/markdown-pp/default.nix
View File

@ -1,13 +1,15 @@
{ fetchFromGitHub, pythonPackages, lib }:
{ lib
, fetchFromGitHub
, python3
}:
with pythonPackages;
buildPythonApplication rec {
python3.pkgs.buildPythonApplication rec {
pname = "MarkdownPP";
version = "1.5.1";
propagatedBuildInputs = [ pillow watchdog ];
propagatedBuildInputs = with python3.pkgs; [ pillow watchdog ];
checkPhase = ''
cd test
PATH=$out/bin:$PATH ${python}/bin/${python.executable} test.py
PATH=$out/bin:$PATH ${python3}/bin/${python3.executable} test.py
'';
src = fetchFromGitHub {
owner = "jreese";

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

@ -1708,6 +1708,8 @@ in {
deskcon = callPackage ../development/python-modules/deskcon { };
desktop-notifier = callPackage ../development/python-modules/desktop-notifier { };
detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04
devolo-home-control-api = callPackage ../development/python-modules/devolo-home-control-api { };
@ -3872,20 +3874,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=";
};
});
};