From 55cc3cec7c3f1a9153d74e45f2b9c2f667c66535 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 16 Jan 2021 14:59:27 +0100 Subject: [PATCH 1/2] python3Packages.base36: init at 0.1.1 --- .../python-modules/base36/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/base36/default.nix diff --git a/pkgs/development/python-modules/base36/default.nix b/pkgs/development/python-modules/base36/default.nix new file mode 100644 index 00000000000..348422e31fa --- /dev/null +++ b/pkgs/development/python-modules/base36/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "base36"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "tonyseek"; + repo = "python-base36"; + rev = "v${version}"; + sha256 = "076nmk9s0zkmgs2zqzkaqij5cmzhf4mrhivbb9n6cvz52i1mppr5"; + }; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "[pytest]" "[tool:pytest]" \ + --replace "--pep8 --cov" "" + ''; + + checkInputs = [ pytestCheckHook ]; + + pytestFlagsArray = [ "test_base36.py" ]; + pythonImportsCheck = [ "base36" ]; + + meta = with lib; { + description = "Python implementation for the positional numeral system using 36 as the radix"; + homepage = "https://github.com/tonyseek/python-base36"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cb786ff781e..0c2d620ffd5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -832,6 +832,8 @@ in { baron = callPackage ../development/python-modules/baron { }; + base36 = callPackage ../development/python-modules/base36 { }; + base58 = callPackage ../development/python-modules/base58 { }; baselines = callPackage ../development/python-modules/baselines { }; From 30018b651b892440bc33eb3abd7621d7f3e910a2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 16 Jan 2021 15:00:31 +0100 Subject: [PATCH 2/2] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 861b53765ba..749dc88c689 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -350,7 +350,7 @@ "hlk_sw16" = ps: with ps; [ ]; # missing inputs: hlk-sw16 "home_connect" = ps: with ps; [ aiohttp-cors ]; # missing inputs: homeconnect "homeassistant" = ps: with ps; [ ]; - "homekit" = ps: with ps; [ HAP-python pyqrcode aiohttp-cors ha-ffmpeg zeroconf ]; # missing inputs: PyTurboJPEG base36 fnvhash + "homekit" = ps: with ps; [ HAP-python pyqrcode aiohttp-cors base36 ha-ffmpeg zeroconf ]; # missing inputs: PyTurboJPEG fnvhash "homekit_controller" = ps: with ps; [ aiohttp-cors zeroconf ]; # missing inputs: aiohomekit "homematic" = ps: with ps; [ pyhomematic ]; "homematicip_cloud" = ps: with ps; [ ]; # missing inputs: homematicip