From a1dab95d7e1490d2af6e0b4abbbd39127b74e9e2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 15 Jul 2022 11:05:53 +0200 Subject: [PATCH 1/2] python310Packages.dicttoxml2: init at 2.0.0 --- .../python-modules/dicttoxml2/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/dicttoxml2/default.nix diff --git a/pkgs/development/python-modules/dicttoxml2/default.nix b/pkgs/development/python-modules/dicttoxml2/default.nix new file mode 100644 index 000000000000..5f407d61b67b --- /dev/null +++ b/pkgs/development/python-modules/dicttoxml2/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: + +buildPythonPackage rec { + pname = "dicttoxml2"; + version = "2.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-8/Zbv8WxDP5Bn4hgd7hTstmYv7amTlTxhQoKvzYrG/I="; + }; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "dicttoxml2" + ]; + + meta = with lib;{ + description = "Converts a Python dictionary or other native data type into a valid XML string"; + homepage = "https://pypi.org/project/dicttoxml2/"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 34cced4ec221..6d16359d29f1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2280,6 +2280,8 @@ in { dicttoxml = callPackage ../development/python-modules/dicttoxml { }; + dicttoxml2 = callPackage ../development/python-modules/dicttoxml2 { }; + diff-cover = callPackage ../development/python-modules/diff-cover { }; diff-match-patch = callPackage ../development/python-modules/diff-match-patch { }; From c52d46e7d0461acd2c55f56035f5c6bdcaa7d183 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 15 Jul 2022 11:16:29 +0200 Subject: [PATCH 2/2] python310Packages.pyialarm: 2.0.0 -> 2.2.0 --- pkgs/development/python-modules/pyialarm/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pyialarm/default.nix b/pkgs/development/python-modules/pyialarm/default.nix index 501f1497a3a7..db4bf7eb3c5e 100644 --- a/pkgs/development/python-modules/pyialarm/default.nix +++ b/pkgs/development/python-modules/pyialarm/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, dicttoxml +, dicttoxml2 , fetchFromGitHub , pythonOlder , xmltodict @@ -8,25 +8,27 @@ buildPythonPackage rec { pname = "pyialarm"; - version = "2.0.0"; + version = "2.2.0"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "RyuzakiKK"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rJS6KgEy4iuiY6QRue6K6woyGefuTN7/4RLCu8cb8M4="; + hash = "sha256-rOdeYewjoFVbHdNPHN6ZC2g6X5yr84/JFE6tGSDIoRU="; }; propagatedBuildInputs = [ - dicttoxml + dicttoxml2 xmltodict ]; # Project has no tests doCheck = false; - pythonImportsCheck = [ "pyialarm" ]; + pythonImportsCheck = [ + "pyialarm" + ]; meta = with lib; { description = "Python library to interface with Antifurto365 iAlarm systems";