From f3dacb35803807205984f36aa246e8d44cd4806f Mon Sep 17 00:00:00 2001 From: elseym Date: Tue, 1 Jan 2019 20:49:22 +0100 Subject: [PATCH 1/4] pythonPackages.srptools: init at 0.2.0 --- .../python-modules/srptools/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/python-modules/srptools/default.nix diff --git a/pkgs/development/python-modules/srptools/default.nix b/pkgs/development/python-modules/srptools/default.nix new file mode 100644 index 00000000000..2df3397f625 --- /dev/null +++ b/pkgs/development/python-modules/srptools/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi, six, pytest, pytestrunner }: + +buildPythonPackage rec { + pname = "srptools"; + version = "0.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0g0jdkblnd3wv5xgb33g6sfgqnhdcs8a3gqzp5gshq2vawdh8p37"; + }; + + propagatedBuildInputs = [ six ]; + + checkInputs = [ pytest pytestrunner ]; + + meta = with stdenv.lib; { + description = "Python-Tools to implement Secure Remote Password (SRP) authentication"; + homepage = https://github.com/idlesign/srptools; + license = licenses.bsd3; + maintainers = with maintainers; [ elseym ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 53260622240..818678e52da 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5139,6 +5139,8 @@ in { importlib-resources = callPackage ../development/python-modules/importlib-resources {}; + srptools = callPackage ../development/python-modules/srptools { }; + }); in fix' (extends overrides packages) From a0dcbd94df86d767542200f176bacfc31a005ef5 Mon Sep 17 00:00:00 2001 From: elseym Date: Thu, 22 Nov 2018 23:15:37 +0100 Subject: [PATCH 2/4] pythonPackages.curve25519-donna: init at 1.3 --- .../curve25519-donna/default.nix | 18 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/python-modules/curve25519-donna/default.nix diff --git a/pkgs/development/python-modules/curve25519-donna/default.nix b/pkgs/development/python-modules/curve25519-donna/default.nix new file mode 100644 index 00000000000..789fc7488fa --- /dev/null +++ b/pkgs/development/python-modules/curve25519-donna/default.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "curve25519-donna"; + version = "1.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "1w0vkjyh4ki9n98lr2hg09f1lr1g3pz48kshrlic01ba6pasj60q"; + }; + + meta = with stdenv.lib; { + description = "Python wrapper for the portable curve25519-donna implementation"; + homepage = http://code.google.com/p/curve25519-donna/; + license = licenses.bsd3; + maintainers = with maintainers; [ elseym ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 818678e52da..a9ead916140 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5141,6 +5141,8 @@ in { srptools = callPackage ../development/python-modules/srptools { }; + curve25519-donna = callPackage ../development/python-modules/curve25519-donna { }; + }); in fix' (extends overrides packages) From 1bf2801567d47a59c8ca59299253b8c21539c6fa Mon Sep 17 00:00:00 2001 From: elseym Date: Thu, 22 Nov 2018 23:16:50 +0100 Subject: [PATCH 3/4] pythonPackages.pyatv: init at 0.3.12 --- .../python-modules/pyatv/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/python-modules/pyatv/default.nix diff --git a/pkgs/development/python-modules/pyatv/default.nix b/pkgs/development/python-modules/pyatv/default.nix new file mode 100644 index 00000000000..783a36dd2de --- /dev/null +++ b/pkgs/development/python-modules/pyatv/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi, srptools, aiohttp, zeroconf +, ed25519, cryptography, curve25519-donna, pytest, pytestrunner +, netifaces, asynctest, virtualenv, toml, filelock, tox }: + +buildPythonPackage rec { + pname = "pyatv"; + version = "0.3.12"; + + src = fetchPypi { + inherit pname version; + sha256 = "135xvy1nn0x5knc7l05amfs837xkx2gcg3lpp69ya9kqs8j6brgp"; + }; + + propagatedBuildInputs = [ srptools aiohttp zeroconf ed25519 cryptography curve25519-donna tox ]; + + checkInputs = [ pytest pytestrunner netifaces asynctest virtualenv toml filelock ]; + + meta = with stdenv.lib; { + description = "A python client library for the Apple TV"; + homepage = https://github.com/postlund/pyatv; + license = licenses.mit; + maintainers = with maintainers; [ elseym ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a9ead916140..9120d992154 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5143,6 +5143,8 @@ in { curve25519-donna = callPackage ../development/python-modules/curve25519-donna { }; + pyatv = callPackage ../development/python-modules/curve25519-donna { }; + }); in fix' (extends overrides packages) From 0f12423566e41dd94067e08cf2172bc42d475b70 Mon Sep 17 00:00:00 2001 From: elseym Date: Tue, 1 Jan 2019 21:07:03 +0100 Subject: [PATCH 4/4] home-assistant: add apple_tv dependency pyatv --- pkgs/servers/home-assistant/component-packages.nix | 6 +++--- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index fbea4ceff6a..53642bdd36d 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -44,7 +44,7 @@ "android_ip_webcam" = ps: with ps; [ ]; "apcupsd" = ps: with ps; [ ]; "api" = ps: with ps; [ aiohttp-cors ]; - "apple_tv" = ps: with ps; [ ]; + "apple_tv" = ps: with ps; [ pyatv ]; "aqualogic" = ps: with ps; [ ]; "arduino" = ps: with ps; [ ]; "arlo" = ps: with ps; [ ]; @@ -658,7 +658,7 @@ "media_extractor" = ps: with ps; [ aiohttp-cors youtube-dl-light ]; "media_player" = ps: with ps; [ aiohttp-cors ]; "media_player.anthemav" = ps: with ps; [ ]; - "media_player.apple_tv" = ps: with ps; [ ]; + "media_player.apple_tv" = ps: with ps; [ pyatv ]; "media_player.aquostv" = ps: with ps; [ ]; "media_player.blackbird" = ps: with ps; [ ]; "media_player.bluesound" = ps: with ps; [ xmltodict ]; @@ -850,7 +850,7 @@ "recorder.util" = ps: with ps; [ ]; "remember_the_milk" = ps: with ps; [ httplib2 ]; "remote" = ps: with ps; [ ]; - "remote.apple_tv" = ps: with ps; [ ]; + "remote.apple_tv" = ps: with ps; [ pyatv ]; "remote.demo" = ps: with ps; [ ]; "remote.harmony" = ps: with ps; [ ]; "remote.itach" = ps: with ps; [ ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9120d992154..29d9c965d88 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5143,7 +5143,7 @@ in { curve25519-donna = callPackage ../development/python-modules/curve25519-donna { }; - pyatv = callPackage ../development/python-modules/curve25519-donna { }; + pyatv = callPackage ../development/python-modules/pyatv { }; });