From cb6b93e29963405ce41d3fd3734ffe31f9c0c8c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 24 Jun 2021 00:10:16 +0200 Subject: [PATCH 1/6] python3Packages.python-juicenet: init at 1.0.2 --- .../python-juicenet/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/python-juicenet/default.nix diff --git a/pkgs/development/python-modules/python-juicenet/default.nix b/pkgs/development/python-modules/python-juicenet/default.nix new file mode 100644 index 000000000000..1547c8914617 --- /dev/null +++ b/pkgs/development/python-modules/python-juicenet/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, aiohttp +}: + +buildPythonPackage rec { + pname = "python-juicenet"; + version = "1.0.2"; + + src = fetchFromGitHub { + owner = "jesserockz"; + repo = "python-juicenet"; + rev = "v${version}"; + sha256 = "04547pj51ds31yhyc7ng47v9giz16h2s3wgb6szc8ivhb5rclqz2"; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + # no tests implemented + doCheck = false; + + pythonImportsCheck = [ "pyjuicenet" ]; + + meta = with lib; { + description = "Read and control Juicenet/Juicepoint/Juicebox based EVSE devices"; + homepage = "https://github.com/jesserockz/python-juicenet"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 72af595d3c1f..e4cd9adff946 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5351,6 +5351,8 @@ in { python-izone = callPackage ../development/python-modules/python-izone { }; + python-juicenet = callPackage ../development/python-modules/python-juicenet { }; + python-openems = callPackage ../development/python-modules/python-openems { }; python-openzwave-mqtt = callPackage ../development/python-modules/python-openzwave-mqtt { }; From 968e0987d7e9dc7edac4d49eb9118e19fbd054e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 24 Jun 2021 00:11:16 +0200 Subject: [PATCH 2/6] home-assistant: update component-packages.nix --- 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 b58525d5da46..6bfaad6cb8b8 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -417,7 +417,7 @@ "izone" = ps: with ps; [ python-izone ]; "jewish_calendar" = ps: with ps; [ hdate ]; "joaoapps_join" = ps: with ps; [ ]; # missing inputs: python-join-api - "juicenet" = ps: with ps; [ ]; # missing inputs: python-juicenet + "juicenet" = ps: with ps; [ python-juicenet ]; "kaiterra" = ps: with ps; [ ]; # missing inputs: kaiterra-async-client "kankun" = ps: with ps; [ ]; "keba" = ps: with ps; [ ]; # missing inputs: keba-kecontact From c82cb95a02ed74ba3105a318d13e48acf86f8a5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 24 Jun 2021 00:12:27 +0200 Subject: [PATCH 3/6] home-assistant: test juicenet component --- pkgs/servers/home-assistant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index b6d4229b0189..301ef626cbd0 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -506,6 +506,7 @@ in with py.pkgs; buildPythonApplication rec { "isy994" "izone" "jewish_calendar" + "juicenet" "keenetic_ndms2" "kira" "kmtronic" From 6b0a1dfd4ce13e4f336fec0e7488986fc080edb5 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 27 Jun 2021 20:02:31 +0200 Subject: [PATCH 4/6] epson-escpr2: 1.1.25 -> 1.1.34 --- pkgs/misc/drivers/epson-escpr2/default.nix | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/pkgs/misc/drivers/epson-escpr2/default.nix b/pkgs/misc/drivers/epson-escpr2/default.nix index 04cf6c3d96c2..130be517bb84 100644 --- a/pkgs/misc/drivers/epson-escpr2/default.nix +++ b/pkgs/misc/drivers/epson-escpr2/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, fetchurl, cups, busybox }: +{ lib, stdenv, fetchurl, cups }: stdenv.mkDerivation rec { pname = "epson-inkjet-printer-escpr2"; - version = "1.1.25"; + version = "1.1.34"; src = fetchurl { # To find new versions, visit @@ -11,22 +11,15 @@ stdenv.mkDerivation rec { # version. # NOTE: Don't forget to update the webarchive link too! urls = [ - "https://download3.ebz.epson.net/dsc/f/03/00/12/46/43/e233a3fefeb49723ba4b0a2f357527e3b45bf53a/epson-inkjet-printer-escpr2-1.1.25-1lsb3.2.src.rpm" - "https://web.archive.org/web/20210212220538if_/https://download3.ebz.epson.net/dsc/f/03/00/12/46/43/e233a3fefeb49723ba4b0a2f357527e3b45bf53a/epson-inkjet-printer-escpr2-1.1.25-1lsb3.2.src.rpm" + "https://download3.ebz.epson.net/dsc/f/03/00/12/85/48/fd5de1ecd7270b0398399355e265c99dfd1dbafb/epson-inkjet-printer-escpr2-1.1.34.tar.gz" + "https://web.archive.org/web/20210627160654/https://download3.ebz.epson.net/dsc/f/03/00/12/85/48/fd5de1ecd7270b0398399355e265c99dfd1dbafb/epson-inkjet-printer-escpr2-1.1.34.tar.gz" ]; - sha256 = "sha256-8hgafO/1qOTVdfAdx7FpOOSLqfTl0sBFunuN/2q7KHw="; + sha256 = "sha256-sHBGWbkZ+zolHehyXQR8U2AyKSrgDSPmrkrcfcx/bAs="; }; patches = [ ./cups-filter-ppd-dirs.patch ]; - buildInputs = [ cups busybox ]; - - unpackPhase = '' - rpm2cpio $src | cpio -idmv - - tar xvf ${pname}-${version}-1lsb3.2.tar.gz - cd ${pname}-${version} - ''; + buildInputs = [ cups ]; meta = with lib; { homepage = "http://download.ebz.epson.net/dsc/search/01/search/"; From d4ae12779a74f05b58b4f4432e10ac040331689a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 27 Jun 2021 18:59:02 +0000 Subject: [PATCH 5/6] gpg-tui: 0.6.0 -> 0.6.1 --- pkgs/tools/security/gpg-tui/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/gpg-tui/default.nix b/pkgs/tools/security/gpg-tui/default.nix index 50a014374f1a..f329fe1013b7 100644 --- a/pkgs/tools/security/gpg-tui/default.nix +++ b/pkgs/tools/security/gpg-tui/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "gpg-tui"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "orhun"; repo = "gpg-tui"; rev = "v${version}"; - sha256 = "sha256-aKMO/T7jojlQGdtOqsEqTtnSBkVjyFuXmPxvFjVYl4Y="; + sha256 = "sha256-ajzx54uQFNZraDwqEKG9sdlMquJnluiaCqsR+JT79jw="; }; - cargoSha256 = "sha256-hRpzW2kISPZ2lwun+nqTi8vIv+9j6r/0yI1TjtH+ltw="; + cargoSha256 = "sha256-UjrX+Z8slMBAiKhiFjxSoX74vIiFW9bMww49oPa18ag="; nativeBuildInputs = [ gpgme # for gpgme-config From dcbc095441cda3325c81d98673542f0704000a49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 27 Jun 2021 18:38:36 +0200 Subject: [PATCH 6/6] home-assistant: requires setuptools It's used in homeassistant/util/package.py but not mentioned in setup.py. --- pkgs/servers/home-assistant/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 9492e8f6acfb..fc24a13cbf4d 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -255,6 +255,8 @@ in with py.pkgs; buildPythonApplication rec { voluptuous voluptuous-serialize yarl + # Not in setup.py, but used in homeassistant/util/package.py + setuptools ] ++ lib.optionals (pythonOlder "3.9") [ backports-zoneinfo ] ++ componentBuildInputs ++ extraBuildInputs;