From 21f615785c19a0357415518560e28f72cd823879 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Tue, 8 Dec 2020 16:51:15 +0100 Subject: [PATCH 1/6] pythonPackages.wrapio: init at 0.3.8 --- .../python-modules/wrapio/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/python-modules/wrapio/default.nix diff --git a/pkgs/development/python-modules/wrapio/default.nix b/pkgs/development/python-modules/wrapio/default.nix new file mode 100644 index 00000000000..4289c202072 --- /dev/null +++ b/pkgs/development/python-modules/wrapio/default.nix @@ -0,0 +1,24 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "wrapio"; + version = "0.3.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-jGupLh+xzwil+VBtAjIG+ZYT+dy+QaZOTIfipTQeyWo"; + }; + + doCheck = false; + pythonImportsCheck = [ "wrapio" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/Exahilosys/wrapio"; + description = "Handling event-based streams"; + license = licenses.mit; + maintainers = with maintainers; [ sfrijters ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a316cc2ce91..4eb3c689df7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7801,6 +7801,8 @@ in { wptserve = callPackage ../development/python-modules/wptserve { }; + wrapio = callPackage ../development/python-modules/wrapio { }; + wrapt = callPackage ../development/python-modules/wrapt { }; wrf-python = callPackage ../development/python-modules/wrf-python { }; From 48b2d18ff6dbbdc60e84641ed8f4fdfe2f440b70 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Tue, 8 Dec 2020 16:42:07 +0100 Subject: [PATCH 2/6] pythonPackages.survey: init at 3.1.1 --- .../python-modules/survey/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/python-modules/survey/default.nix diff --git a/pkgs/development/python-modules/survey/default.nix b/pkgs/development/python-modules/survey/default.nix new file mode 100644 index 00000000000..1f5438140e2 --- /dev/null +++ b/pkgs/development/python-modules/survey/default.nix @@ -0,0 +1,29 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, wrapio +}: + +buildPythonPackage rec { + pname = "survey"; + version = "3.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-R/PfXW/CnqYiOWbCxPAYwneg6j6CLvdIpITZ2eIXn+M="; + }; + + propagatedBuildInputs = [ + wrapio + ]; + + doCheck = false; + pythonImportsCheck = [ "survey" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/Exahilosys/survey"; + description = "A simple library for creating beautiful interactive prompts"; + license = licenses.mit; + maintainers = with maintainers; [ sfrijters ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4eb3c689df7..1077312cf80 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7113,6 +7113,8 @@ in { sure = callPackage ../development/python-modules/sure { }; + survey = callPackage ../development/python-modules/survey { }; + suseapi = callPackage ../development/python-modules/suseapi { }; svg2tikz = callPackage ../development/python-modules/svg2tikz { }; From cedb9654c47a9af415dc3e786e1fd032685345a6 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Tue, 8 Dec 2020 16:31:36 +0100 Subject: [PATCH 3/6] pythonPackages.maestral: 1.2.1 -> 1.3.0 --- .../python-modules/maestral/default.nix | 13 ++++++++++--- pkgs/top-level/python-packages.nix | 19 ++++++++++++++++++- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/maestral/default.nix b/pkgs/development/python-modules/maestral/default.nix index 125270ef123..2ae7cdc88cc 100644 --- a/pkgs/development/python-modules/maestral/default.nix +++ b/pkgs/development/python-modules/maestral/default.nix @@ -3,20 +3,22 @@ , fetchFromGitHub , pythonOlder , 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 }: buildPythonPackage rec { pname = "maestral"; - version = "1.2.1"; + version = "1.3.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "SamSchott"; repo = "maestral"; rev = "v${version}"; - sha256 = "sha256-kh3FYBSVOU4ywrYl6ONEIbLbkSuZmexNJC9dB+JtUjM="; + sha256 = "sha256-jAkSLWGv1UpdZslAast3Z5TnDCnxx5wNTxW4kvoH8GE="; }; propagatedBuildInputs = [ @@ -34,7 +36,12 @@ buildPythonPackage rec { setuptools sdnotify sqlalchemy + survey watchdog + ] ++ stdenv.lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ] ++ stdenv.lib.optionals (pythonOlder "3.9") [ + importlib-resources ] ++ stdenv.lib.optionals stdenv.isLinux [ dbus-next ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1077312cf80..f153d73f4a1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3646,7 +3646,24 @@ in { 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 { }; From c326458b4069a1ada8d9ae3efaf818a786d4f467 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Tue, 8 Dec 2020 16:32:04 +0100 Subject: [PATCH 4/6] maestral-qt: 1.2.1 -> 1.3.0 --- pkgs/applications/networking/maestral-qt/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/maestral-qt/default.nix b/pkgs/applications/networking/maestral-qt/default.nix index d4cfd38c50d..7602d59c0ab 100644 --- a/pkgs/applications/networking/maestral-qt/default.nix +++ b/pkgs/applications/networking/maestral-qt/default.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "maestral-qt"; - version = "1.2.1"; + version = "1.3.0"; disabled = python3.pkgs.pythonOlder "3.6"; src = fetchFromGitHub { owner = "SamSchott"; repo = "maestral-qt"; rev = "v${version}"; - sha256 = "sha256-7qpVyQUbT+GChJl1TnKOONSyRDvzQ0M2z9RdN7PNl9U="; + sha256 = "sha256-WkjSIsr048b9iskjx6H36Jmvb+QtUmpW7JsYeVeXnhE="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -24,6 +24,8 @@ python3.pkgs.buildPythonApplication rec { maestral packaging pyqt5 + ] ++ stdenv.lib.optionals (pythonOlder "3.9") [ + importlib-resources ]; nativeBuildInputs = [ wrapQtAppsHook ]; From 44cdbfba3da446265752d849ed5200abc18d38e7 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Tue, 8 Dec 2020 16:56:57 +0100 Subject: [PATCH 5/6] pythonPackages.maestral: 1.3.0 -> 1.3.1 --- pkgs/development/python-modules/maestral/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/maestral/default.nix b/pkgs/development/python-modules/maestral/default.nix index 2ae7cdc88cc..cb7119860f5 100644 --- a/pkgs/development/python-modules/maestral/default.nix +++ b/pkgs/development/python-modules/maestral/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "maestral"; - version = "1.3.0"; + version = "1.3.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "SamSchott"; repo = "maestral"; rev = "v${version}"; - sha256 = "sha256-jAkSLWGv1UpdZslAast3Z5TnDCnxx5wNTxW4kvoH8GE="; + sha256 = "sha256-SspyTdmAbbmWN3AqVp9bj/QfAKLVgU2bLiiHjZO0aCM="; }; propagatedBuildInputs = [ From a86498a355516a5c2b00fbc66195a575734e148d Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Tue, 8 Dec 2020 16:57:18 +0100 Subject: [PATCH 6/6] maestral-qt: 1.3.0 -> 1.3.1 --- pkgs/applications/networking/maestral-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/maestral-qt/default.nix b/pkgs/applications/networking/maestral-qt/default.nix index 7602d59c0ab..41341532637 100644 --- a/pkgs/applications/networking/maestral-qt/default.nix +++ b/pkgs/applications/networking/maestral-qt/default.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "maestral-qt"; - version = "1.3.0"; + version = "1.3.1"; disabled = python3.pkgs.pythonOlder "3.6"; src = fetchFromGitHub { owner = "SamSchott"; repo = "maestral-qt"; rev = "v${version}"; - sha256 = "sha256-WkjSIsr048b9iskjx6H36Jmvb+QtUmpW7JsYeVeXnhE="; + sha256 = "sha256-2S2sa2/HVt3IRsE98PT2XwpONjaYENBzYW+ezBFrJYI="; }; propagatedBuildInputs = with python3.pkgs; [