From f9e53c5ad6e5e8a6fe5d309827c3d1e9dd5cca4c Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Mon, 15 Feb 2021 12:53:16 +0100 Subject: [PATCH 1/7] pythonPackages.desktop-notifier: init at 3.2.0 --- .../desktop-notifier/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/desktop-notifier/default.nix diff --git a/pkgs/development/python-modules/desktop-notifier/default.nix b/pkgs/development/python-modules/desktop-notifier/default.nix new file mode 100644 index 00000000000..83deaed67a0 --- /dev/null +++ b/pkgs/development/python-modules/desktop-notifier/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9442898c16e..cdb26cfaf4d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -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 { }; From badd0e4b95436faca4517270bb906b9f98a7b954 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Mon, 15 Feb 2021 12:54:21 +0100 Subject: [PATCH 2/7] pythonPackages.survey: 3.1.1 -> 3.4.2 --- pkgs/development/python-modules/survey/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/survey/default.nix b/pkgs/development/python-modules/survey/default.nix index 436127fae9c..99a2d85aaa2 100644 --- a/pkgs/development/python-modules/survey/default.nix +++ b/pkgs/development/python-modules/survey/default.nix @@ -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 = [ From 406c9ecbebfc8d55034201c7f09c075f2bef4933 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Mon, 15 Feb 2021 12:54:40 +0100 Subject: [PATCH 3/7] pythonPackages.wrapio: 0.3.8 -> 1.0.0 --- pkgs/development/python-modules/wrapio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wrapio/default.nix b/pkgs/development/python-modules/wrapio/default.nix index bbbc1917f54..3e6a4372a64 100644 --- a/pkgs/development/python-modules/wrapio/default.nix +++ b/pkgs/development/python-modules/wrapio/default.nix @@ -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; From 963299d8fc7afb7f0401b9e547b21236deab8bbc Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Mon, 15 Feb 2021 12:54:59 +0100 Subject: [PATCH 4/7] pythonPackages.watchdog: 1.0.2 -> 2.0.0 --- pkgs/development/python-modules/watchdog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix index 693cfcce926..6930be7d65a 100644 --- a/pkgs/development/python-modules/watchdog/default.nix +++ b/pkgs/development/python-modules/watchdog/default.nix @@ -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 From a87d941bd7faf2b9013d7d20fb2c2c2f573661e5 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Mon, 15 Feb 2021 16:59:32 +0100 Subject: [PATCH 5/7] markdown-pp: Change to python3 to fix watchdog dependency --- pkgs/tools/text/markdown-pp/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/text/markdown-pp/default.nix b/pkgs/tools/text/markdown-pp/default.nix index 50ef560f6c3..c6e937eab27 100644 --- a/pkgs/tools/text/markdown-pp/default.nix +++ b/pkgs/tools/text/markdown-pp/default.nix @@ -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"; From 1c31382a4ef5214893611a194c8d153a14e6e18d Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Mon, 15 Feb 2021 12:55:29 +0100 Subject: [PATCH 6/7] pythonPackages.maestral: 1.3.1 -> 1.4.2 --- .../python-modules/maestral/default.nix | 13 +++++-------- 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"; + 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="; }; }); }; From 0e5f7c30b2dd374259ff5aae37b4ea04caa59d00 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Mon, 15 Feb 2021 12:55:45 +0100 Subject: [PATCH 7/7] maestral-gui: 1.3.1 -> 1.4.2 --- pkgs/applications/networking/maestral-qt/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/maestral-qt/default.nix b/pkgs/applications/networking/maestral-qt/default.nix index b568775481c..0929c745b21 100644 --- a/pkgs/applications/networking/maestral-qt/default.nix +++ b/pkgs/applications/networking/maestral-qt/default.nix @@ -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