From 08a1cfec3c4aad18e31695c39d92abd55492f16a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthis=20G=C3=B6rdel?= Date: Wed, 14 Jun 2023 13:40:13 +0200 Subject: [PATCH 1/3] maintainers: add fwc --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 20b2c80841c..2a8e0201971 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5572,6 +5572,11 @@ githubId = 17859309; name = "Fuzen"; }; + fwc = { + github = "fwc"; + githubId = 29337229; + name = "mtths"; + }; fxfactorial = { email = "edgar.factorial@gmail.com"; github = "fxfactorial"; From 70ef85e778674b973b8a42e643a3d4727f38d761 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthis=20G=C3=B6rdel?= Date: Wed, 14 Jun 2023 13:41:12 +0200 Subject: [PATCH 2/3] python3Packages.enochecker-core: init at 0.10.0 --- .../enochecker-core/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/enochecker-core/default.nix diff --git a/pkgs/development/python-modules/enochecker-core/default.nix b/pkgs/development/python-modules/enochecker-core/default.nix new file mode 100644 index 00000000000..806bd4a14e9 --- /dev/null +++ b/pkgs/development/python-modules/enochecker-core/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: + +buildPythonPackage rec { + pname = "enochecker-core"; + version = "0.10.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit version; + pname = "enochecker_core"; + hash = "sha256-N41p2XRCp55rcPXLpA4rPIARsva/dQzK8qafjzXtavI="; + }; + + + pythonImportsCheck = [ + "enochecker_core" + ]; + + # no tests upstream + doCheck = false; + + meta = with lib; { + description = "Base library for enochecker libs"; + homepage = "https://github.com/enowars/enochecker_core"; + changelog = "https://github.com/enowars/enochecker_core/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fwc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fd5c9b3b1f0..3d2cb4afa94 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3242,6 +3242,8 @@ self: super: with self; { enocean = callPackage ../development/python-modules/enocean { }; + enochecker-core = callPackage ../development/python-modules/enochecker-core { }; + enrich = callPackage ../development/python-modules/enrich { }; entrance = callPackage ../development/python-modules/entrance { From 5de79e7e62e219dbdfd6061d9234b5cd1ce6c259 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthis=20G=C3=B6rdel?= Date: Wed, 14 Jun 2023 13:41:36 +0200 Subject: [PATCH 3/3] enochecker-test: init at 0.9.0 --- .../tools/enochecker-test/default.nix | 69 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 71 insertions(+) create mode 100644 pkgs/development/tools/enochecker-test/default.nix diff --git a/pkgs/development/tools/enochecker-test/default.nix b/pkgs/development/tools/enochecker-test/default.nix new file mode 100644 index 00000000000..ae1fb411861 --- /dev/null +++ b/pkgs/development/tools/enochecker-test/default.nix @@ -0,0 +1,69 @@ +{ lib +, buildPythonApplication +, fetchPypi +, pythonOlder +, pythonRelaxDepsHook + +, certifi +, charset-normalizer +, enochecker-core +, exceptiongroup +, idna +, iniconfig +, jsons +, packaging +, pluggy +, pytest +, requests +, tomli +, typish +, urllib3 +}: + +buildPythonApplication rec { + pname = "enochecker-test"; + version = "0.9.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit version; + pname = "enochecker_test"; + hash = "sha256-M0RTstFePU7O51YVEncVDuuR6F7R8mfdKbO0j7k/o8Q="; + }; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = true; + + propagatedBuildInputs = [ + certifi + charset-normalizer + enochecker-core + exceptiongroup + idna + iniconfig + jsons + packaging + pluggy + pytest + requests + tomli + typish + urllib3 + ]; + + # tests require network access + doCheck = false; + + meta = with lib; { + description = "Automatically test services/checker using the enochecker API"; + homepage = "https://github.com/enowars/enochecker_test"; + changelog = "https://github.com/enowars/enochecker_test/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fwc ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4bbe10cf5a2..169809c9349 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -565,6 +565,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + enochecker-test = with python3Packages; callPackage ../development/tools/enochecker-test { }; + enumer = callPackage ../tools/misc/enumer { }; evans = callPackage ../development/tools/evans { };