From 85eb38677ba96ad02a9a6e4413337090f23e14fa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 16 Apr 2022 23:00:47 +0200 Subject: [PATCH 01/19] nuclei: 2.6.7 -> 2.6.8 --- pkgs/tools/security/nuclei/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix index 149f2fe6c3a2..cc24c3114af8 100644 --- a/pkgs/tools/security/nuclei/default.nix +++ b/pkgs/tools/security/nuclei/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nuclei"; - version = "2.6.7"; + version = "2.6.8"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lW9QTk9TBXf/W483hGny9p2isoiDl3z0+UecDm9VLOs="; + sha256 = "sha256-XVABgsmPRNseWN+iNfbjicoNuHyZSrrlVOV3YEX7DPU="; }; - vendorSha256 = "sha256-oiRpxCAdxDjlUUHqRmpAHypmESQJpziOmBtTwKig7nk="; + vendorSha256 = "sha256-Mibn93EviweuEsMF2d1kQAJtss/ELlJQIZTM7To2dkg="; modRoot = "./v2"; subPackages = [ From 20319182ada632cb039916ef3b0d150d6308e97f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 16 Apr 2022 23:33:22 +0200 Subject: [PATCH 02/19] python3Packages.mailchecker: 4.1.13 -> 4.1.15 --- pkgs/development/python-modules/mailchecker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mailchecker/default.nix b/pkgs/development/python-modules/mailchecker/default.nix index ab609b597a4e..61e4c3d21f07 100644 --- a/pkgs/development/python-modules/mailchecker/default.nix +++ b/pkgs/development/python-modules/mailchecker/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "mailchecker"; - version = "4.1.13"; + version = "4.1.15"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-4ez18K9ksVGjzspHHcw/Ja6hxoKTkYLBFn65m7VBWYk="; + hash = "sha256-DOtLJKNvmj5dlveZX9sScfJZa3SY7GH7xfZHhIsybVQ="; }; # Module has no tests From 3feca9381d0653aaff903c089acbfe6736d22481 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Apr 2022 00:55:19 +0000 Subject: [PATCH 03/19] python310Packages.types-requests: 2.27.16 -> 2.27.19 --- pkgs/development/python-modules/types-requests/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix index b29a0792ae8f..deda83411fed 100644 --- a/pkgs/development/python-modules/types-requests/default.nix +++ b/pkgs/development/python-modules/types-requests/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.27.16"; + version = "2.27.19"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-yAEMGLKRp++2CxRS2+ElMLwlaT3WV+cMYoA/zcS//ps="; + sha256 = "sha256-eV43gRcIjR5L9BosAaFTtz1upAqp18CsdTq96EwNOo8="; }; propagatedBuildInputs = [ From 0e531c29af03538f4ecaebc76595a6b8a4baf133 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Apr 2022 02:03:59 +0000 Subject: [PATCH 04/19] python310Packages.lxmf: 0.1.4 -> 0.1.5 --- pkgs/development/python-modules/lxmf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/lxmf/default.nix b/pkgs/development/python-modules/lxmf/default.nix index 9650c5d89572..c6044844a62f 100644 --- a/pkgs/development/python-modules/lxmf/default.nix +++ b/pkgs/development/python-modules/lxmf/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "lxmf"; - version = "0.1.4"; + version = "0.1.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,8 +15,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "markqvist"; repo = "lxmf"; - rev = version; - hash = "sha256-kWawKlEAnn/uNjM2TT2aVW2V4M0+S/1Ysrw/muJhC0s="; + rev = "refs/tags/${version}"; + hash = "sha256-9JG/EnL7vW4P7QiT6Xa0GLfmu1JeM0dlFSp3VRE47NI="; }; propagatedBuildInputs = [ From 122330cfd2e261e3a28c288535c9a6f11095a608 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Apr 2022 03:36:00 +0000 Subject: [PATCH 05/19] python310Packages.types-urllib3: 1.26.11 -> 1.26.13 --- pkgs/development/python-modules/types-urllib3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-urllib3/default.nix b/pkgs/development/python-modules/types-urllib3/default.nix index 235535ce9716..45b6dd97c2d8 100644 --- a/pkgs/development/python-modules/types-urllib3/default.nix +++ b/pkgs/development/python-modules/types-urllib3/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-urllib3"; - version = "1.26.11"; + version = "1.26.13"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-JNZORBFohR6wXx0CLeGK4xVY9WScjxEX44TC6F4xMVs="; + hash = "sha256-QPj7XozX1X6K797j/dXpMKoaG7QXnNrdVSJs6liK95A="; }; # Module doesn't have tests From 072d6270cab89b2e824c37646244bf41c6e6b6b0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Apr 2022 08:30:20 +0000 Subject: [PATCH 06/19] python310Packages.aenum: 3.1.8 -> 3.1.11 --- pkgs/development/python-modules/aenum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aenum/default.nix b/pkgs/development/python-modules/aenum/default.nix index a360959a9a73..8ebed55e1bc7 100644 --- a/pkgs/development/python-modules/aenum/default.nix +++ b/pkgs/development/python-modules/aenum/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "aenum"; - version = "3.1.8"; + version = "3.1.11"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "8dbe15f446eb8264b788dfeca163fb0a043d408d212152397dc11377b851e4ae"; + sha256 = "sha256-rtLCc1R65yoNXuhpcZwCpkPaFr9QfICVj6rcfgOOP3M="; }; checkInputs = [ From 21b306c7fbbbd9c6d0b5b84b0d2f2f1c509fcdd8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Apr 2022 09:11:28 +0000 Subject: [PATCH 07/19] python310Packages.policyuniverse: 1.5.0.20220414 -> 1.5.0.20220416 --- pkgs/development/python-modules/policyuniverse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/policyuniverse/default.nix b/pkgs/development/python-modules/policyuniverse/default.nix index 79459070b31c..77b38f7a3180 100644 --- a/pkgs/development/python-modules/policyuniverse/default.nix +++ b/pkgs/development/python-modules/policyuniverse/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "policyuniverse"; - version = "1.5.0.20220414"; + version = "1.5.0.20220416"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-BtNxU5NdOJfJejN4RpsUJJytWkQxJxbNjnY8hLPb3q0="; + sha256 = "sha256-RGXOqhXPsEQR5wcXDWz00J6KcdJOY5ZXSLVXT18wDDk="; }; # Tests are not shipped and there are no GitHub tags From 45c9af19f4c1be64b3ea67d9a3f08e32614a68f7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Apr 2022 09:21:53 +0000 Subject: [PATCH 08/19] python310Packages.types-decorator: 5.1.4 -> 5.1.5 --- pkgs/development/python-modules/types-decorator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-decorator/default.nix b/pkgs/development/python-modules/types-decorator/default.nix index f8dc74c00f98..8d6d2038b3b2 100644 --- a/pkgs/development/python-modules/types-decorator/default.nix +++ b/pkgs/development/python-modules/types-decorator/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-decorator"; - version = "5.1.4"; + version = "5.1.5"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "463c04b192108e2b3f409df8a3eaaf8d44e3e98965c11e473ed2a97da591798b"; + sha256 = "sha256-CrPgAZyBGRIrXzD0IlUkcbkc8xOLPI69krQb1d3h3QI="; }; # Modules doesn't have tests From 03b2a0221cec97b8e1e8158f12d98c4f9cd1e87f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Apr 2022 09:48:10 +0000 Subject: [PATCH 09/19] python310Packages.types-dateutil: 2.8.10 -> 2.8.11 --- pkgs/development/python-modules/types-dateutil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-dateutil/default.nix b/pkgs/development/python-modules/types-dateutil/default.nix index 4cefc57ed594..39fb824bdcdc 100644 --- a/pkgs/development/python-modules/types-dateutil/default.nix +++ b/pkgs/development/python-modules/types-dateutil/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-python-dateutil"; - version = "2.8.10"; + version = "2.8.11"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-a886rnJC5Xk7r9eyvPtOJV63srMUSs0N8OGC3OWMytM="; + sha256 = "sha256-7cBdC5MgGSirC1/ysxRBPdPSsk6xLEcCl++Sned8k+8="; }; pythonImportsCheck = [ "dateutil-stubs" ]; From b4129b277ec6580b1cde7c58d502ecabd692f4cc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Apr 2022 09:53:37 +0000 Subject: [PATCH 10/19] python310Packages.asyncssh: 2.10.0 -> 2.10.1 --- pkgs/development/python-modules/asyncssh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix index 3d00805537fe..bb6ce96ea588 100644 --- a/pkgs/development/python-modules/asyncssh/default.nix +++ b/pkgs/development/python-modules/asyncssh/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "asyncssh"; - version = "2.10.0"; + version = "2.10.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-WF5JmDzHlXFB4D7p9IvRU2pepXFdCqHOnM4Ecobmaws="; + sha256 = "sha256-SZuDbPWKnxknrStaQMPL0N042+CNLfj6is1TjCj8j6k="; }; propagatedBuildInputs = [ From 4489718d8ff8c5f584160113d8482f8546c14804 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Sun, 3 Apr 2022 19:28:23 +0200 Subject: [PATCH 11/19] emacsWrapper: preload autoloads MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commits changes the Emacs wrapper, in order to preload all autoload definitions when built with additional packages. The list of all definitions is generated at build-time. Packages do not need to be (require)d for them to work. Before this change, a code like ```sh nix-shell -I "nixpkgs=$PWD" -p "emacs.pkgs.withPackages(e:[e.magit])" \ --run "emacs -Q -nw -f magit" ``` will fail with the message `Symbol’s function definition is void: magit` After the change, the same code above will open Emacs with magit enabled. A slightly longer startup time of ~10ms was detected in local, informal experiments. More information on autoloading: https://www.gnu.org/software/emacs/manual/html_node/eintr/Autoload.html --- pkgs/build-support/emacs/wrapper.nix | 9 +++++++-- pkgs/build-support/emacs/wrapper.sh | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix index 2aa61d6d2f62..207908fb606f 100644 --- a/pkgs/build-support/emacs/wrapper.nix +++ b/pkgs/build-support/emacs/wrapper.nix @@ -135,9 +135,14 @@ runCommand ''} } + siteAutoloads="$out/share/emacs/site-lisp/nix-generated-autoload.el" + touch $siteAutoloads + # Iterate over the array of inputs (avoiding nix's own interpolation) for pkg in "''${requires[@]}"; do linkEmacsPackage $pkg + find $pkg -name "*-autoloads.el" \ + -exec echo \(load \"{}\" \'noerror \'nomessage\) \; >> $siteAutoloads done siteStart="$out/share/emacs/site-lisp/site-start.el" @@ -174,12 +179,12 @@ runCommand > "$subdirs" # Byte-compiling improves start-up time only slightly, but costs nothing. - $emacs/bin/emacs --batch -f batch-byte-compile "$siteStart" "$subdirs" + $emacs/bin/emacs --batch -f batch-byte-compile "$siteStart" "$subdirs" "$siteAutoloads" ${optionalString nativeComp '' $emacs/bin/emacs --batch \ --eval "(add-to-list 'native-comp-eln-load-path \"$out/share/emacs/native-lisp/\")" \ - -f batch-native-compile "$siteStart" "$subdirs" + -f batch-native-compile "$siteStart" "$subdirs" "$siteAutoloads" ''} ''; diff --git a/pkgs/build-support/emacs/wrapper.sh b/pkgs/build-support/emacs/wrapper.sh index e8eecb8c8696..6c5a5aee2a8f 100644 --- a/pkgs/build-support/emacs/wrapper.sh +++ b/pkgs/build-support/emacs/wrapper.sh @@ -44,4 +44,4 @@ export emacsWithPackages_siteLisp=@wrapperSiteLisp@ export EMACSNATIVELOADPATH="${newNativeLoadPath[*]}" export emacsWithPackages_siteLispNative=@wrapperSiteLispNative@ -exec @prog@ "$@" +exec @prog@ -l cl-loaddefs -l nix-generated-autoload "$@" From 8aeebf202ff3d293babf4488b74386a65d08b902 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Apr 2022 12:58:04 +0000 Subject: [PATCH 12/19] python310Packages.types-paramiko: 2.8.17 -> 2.8.19 --- pkgs/development/python-modules/types-paramiko/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-paramiko/default.nix b/pkgs/development/python-modules/types-paramiko/default.nix index 5b87e8079a5e..4405a02770a2 100644 --- a/pkgs/development/python-modules/types-paramiko/default.nix +++ b/pkgs/development/python-modules/types-paramiko/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "types-paramiko"; - version = "2.8.17"; + version = "2.8.19"; src = fetchPypi { inherit pname version; - sha256 = "sha256-1toFPkau9cYpvE6lvatWZwhlNerg/P2N6EBpQ7g00uY="; + sha256 = "sha256-UhkthDZk73wfh7n+Bpe7u1qPgS5DAWlEz+q+x93spCM="; }; pythonImportsCheck = [ From 4ad5ab71ab4621cf8d2f7d3e70bb3f5f41c5eb19 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Apr 2022 13:50:49 +0000 Subject: [PATCH 13/19] python310Packages.types-cryptography: 3.3.19 -> 3.3.20 --- .../development/python-modules/types-cryptography/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-cryptography/default.nix b/pkgs/development/python-modules/types-cryptography/default.nix index 508824720366..449ab50117cc 100644 --- a/pkgs/development/python-modules/types-cryptography/default.nix +++ b/pkgs/development/python-modules/types-cryptography/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "types-cryptography"; - version = "3.3.19"; + version = "3.3.20"; src = fetchPypi { inherit pname version; - sha256 = "sha256-+VcTjwczMrnAfq2wgx76pXj9tgTlU6w41yxGeutLfCM="; + sha256 = "sha256-u+9bZpcllvPNYbMJFxn8k14IHzu6h+zqVhvA27Fnh1M="; }; pythonImportsCheck = [ From da0be8f6e5fd6c65ace972cbd42748a7e27df4ad Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Apr 2022 16:17:06 +0000 Subject: [PATCH 14/19] python310Packages.types-tabulate: 0.8.6 -> 0.8.7 --- pkgs/development/python-modules/types-tabulate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-tabulate/default.nix b/pkgs/development/python-modules/types-tabulate/default.nix index 6d7ceade85c9..1fc11aeede94 100644 --- a/pkgs/development/python-modules/types-tabulate/default.nix +++ b/pkgs/development/python-modules/types-tabulate/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "types-tabulate"; - version = "0.8.6"; + version = "0.8.7"; src = fetchPypi { inherit pname version; - hash = "sha256-P037eVRJwheO1cIU7FEUwESx7t1xrQoQA7xnDwnYcQo="; + hash = "sha256-Cs0ClYZuXy3i6Qc4/wvBIBdR4d0Ci9MMv6Qap6Zpkp4="; }; # Module doesn't have tests From a6a8731dc75b967d7e8b0f21a901623e8202b472 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 17 Apr 2022 16:05:13 +0300 Subject: [PATCH 15/19] curl: enable ca-bundle if activated http3 protocol --- pkgs/tools/networking/curl/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index a7cac48d52d7..7c7f301552e7 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -110,7 +110,8 @@ stdenv.mkDerivation rec { "--disable-manual" # Disable default CA bundle, use NIX_SSL_CERT_FILE or fallback # to nss-cacert from the default profile. - "--without-ca-bundle" + # https://github.com/curl/curl/issues/8696 - fallback is not supported by HTTP3 + (if http3Support then "--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" else "--without-ca-bundle") "--without-ca-path" (lib.enableFeature c-aresSupport "ares") (lib.enableFeature ldapSupport "ldap") From e9055d047fc6cc1444dfc6af8c6d0609ff6c483f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 17 Apr 2022 17:01:45 +0000 Subject: [PATCH 16/19] python3Packages.pytomorrowio: init at 0.2.1 --- .../python-modules/pytomorrowio/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/pytomorrowio/default.nix diff --git a/pkgs/development/python-modules/pytomorrowio/default.nix b/pkgs/development/python-modules/pytomorrowio/default.nix new file mode 100644 index 000000000000..2c695fc7e05a --- /dev/null +++ b/pkgs/development/python-modules/pytomorrowio/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, aiohttp +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pytomorrowio"; + version = "0.2.1"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "aabb41436fb5834b687d73b334d95be07a18d5943d27a1fd06271b749558ba0e"; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "pytomorrowio" ]; + + meta = { + description = "Async Python package to access the Tomorrow.io API"; + homepage = "https://github.com/raman325/pytomorrowio"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2b0b2d0848e8..7ae4d285476c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6374,6 +6374,8 @@ in { pythonfinder = callPackage ../development/python-modules/pythonfinder { }; + pytomorrowio = callPackage ../development/python-modules/pytomorrowio { }; + pyutil = callPackage ../development/python-modules/pyutil { }; pyzbar = callPackage ../development/python-modules/pyzbar { }; From ab62ad49ec68ce4412dc40adf348f680644a55df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 17 Apr 2022 17:05:47 +0000 Subject: [PATCH 17/19] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 8 ++++++-- pkgs/servers/home-assistant/tests.nix | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 3088fd368c28..ca1fd3f5c6d4 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -382,7 +382,8 @@ ]; "climacell" = ps: with ps; [ pyclimacell - ]; # missing inputs: pytomorrowio + pytomorrowio + ]; "climate" = ps: with ps; [ ]; "cloud" = ps: with ps; [ @@ -2696,7 +2697,8 @@ "tomato" = ps: with ps; [ ]; "tomorrowio" = ps: with ps; [ - ]; # missing inputs: pytomorrowio + pytomorrowio + ]; "toon" = ps: with ps; [ pyturbojpeg aiohttp-cors @@ -3191,6 +3193,7 @@ "canary" "cast" "cert_expiry" + "climacell" "climate" "cloud" "cloudflare" @@ -3642,6 +3645,7 @@ "todoist" "tolo" "tomato" + "tomorrowio" "toon" "totalconnect" "tplink" diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix index 58bb1670e5a0..720f3bf2d3c4 100644 --- a/pkgs/servers/home-assistant/tests.nix +++ b/pkgs/servers/home-assistant/tests.nix @@ -14,6 +14,7 @@ let lovelace = [ PyChromecast ]; nest = [ av ]; onboarding = [ pymetno radios rpi-bad-power ]; + tomorrowio = [ pyclimacell ]; version = [ aioaseko ]; voicerss = [ mutagen ]; yandextts = [ mutagen ]; From 7aa71eb389b59ed021c90bf5f52e0d6009222e3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 17 Apr 2022 17:15:11 +0000 Subject: [PATCH 18/19] python3Packages.stookalert: init at 0.1.4 --- .../python-modules/stookalert/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/stookalert/default.nix diff --git a/pkgs/development/python-modules/stookalert/default.nix b/pkgs/development/python-modules/stookalert/default.nix new file mode 100644 index 000000000000..82552ca44bb3 --- /dev/null +++ b/pkgs/development/python-modules/stookalert/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, requests +}: + +buildPythonPackage rec { + pname = "stookalert"; + version = "0.1.4"; + + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "38c479e2fb7668f9b37aff0f9ffdd7bfd1ee9393528f2d3d36b5911b40da70a1"; + }; + + propagatedBuildInputs = [ + requests + ]; + + # upstream has no tests + doCheck = false; + + pythonImportsCheck = [ "stookalert" ]; + + meta = { + description = "Python package for the RIVM Stookalert"; + homepage = "https://github.com/fwestenberg/stookalert"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2b0b2d0848e8..c6269576b70d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9737,6 +9737,8 @@ in { stone = callPackage ../development/python-modules/stone { }; + stookalert = callPackage ../development/python-modules/stookalert { }; + stopit = callPackage ../development/python-modules/stopit { }; strategies = callPackage ../development/python-modules/strategies { }; From f613f4648899a0fca1455eccc7b10b20dc3557b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 17 Apr 2022 17:21:15 +0000 Subject: [PATCH 19/19] home-assistant: support stookalert component --- pkgs/servers/home-assistant/component-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 3088fd368c28..c0d991e3afce 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2518,7 +2518,8 @@ pymodbus ]; # missing inputs: pystiebeleltron "stookalert" = ps: with ps; [ - ]; # missing inputs: stookalert + stookalert + ]; "stream" = ps: with ps; [ pyturbojpeg aiohttp-cors @@ -3607,6 +3608,7 @@ "statistics" "statsd" "steamist" + "stookalert" "stream" "stt" "subaru"