From 08c4e5c4dabc806383a7e99ea937470379ebb0eb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 21 Aug 2022 10:48:33 +0200 Subject: [PATCH 1/7] python310Packages.pyric: init at 0.1.6 --- .../python-modules/pyric/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/pyric/default.nix diff --git a/pkgs/development/python-modules/pyric/default.nix b/pkgs/development/python-modules/pyric/default.nix new file mode 100644 index 00000000000..19eb1c06515 --- /dev/null +++ b/pkgs/development/python-modules/pyric/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pyric"; + version = "0.1.6"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "wraith-wireless"; + repo = pname; + rev = version; + hash = "sha256-NAuGgYViMYxzJDQw666cT1WaaNNKh3Ik/tNYJ/tPjbY="; + }; + + # Tests are outdated + doCheck = false; + + pythonImportsCheck = [ + "pyric" + ]; + + meta = with lib; { + description = "Python Radio Interface Controller"; + homepage = "https://github.com/wraith-wireless/PyRIC"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9ce3dca2f6d..0ddf53c6654 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8228,6 +8228,8 @@ in { pyres = callPackage ../development/python-modules/pyres { }; + pyric = callPackage ../development/python-modules/pyric { }; + pyrisco = callPackage ../development/python-modules/pyrisco { }; pyrituals = callPackage ../development/python-modules/pyrituals { }; From 3bd2646e02a25f0585fa25a28bb108e2f1f58a21 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 21 Aug 2022 10:52:06 +0200 Subject: [PATCH 2/7] python310Packages.btsocket: init at 0.2.0 --- .../python-modules/btsocket/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/btsocket/default.nix diff --git a/pkgs/development/python-modules/btsocket/default.nix b/pkgs/development/python-modules/btsocket/default.nix new file mode 100644 index 00000000000..560707ce1cb --- /dev/null +++ b/pkgs/development/python-modules/btsocket/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "btsocket"; + version = "0.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "ukBaz"; + repo = "python-btsocket"; + rev = "v${version}"; + hash = "sha256-IqlbFYbEyJPlcmT3DIQIwsjQEAGeIGRtFNx4jWwNtjE="; + }; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "btsocket" + ]; + + meta = with lib; { + description = "Library to interact with the Bluez Bluetooth Management API"; + homepage = "https://github.com/ukBaz/python-btsocket"; + 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 0ddf53c6654..b53856abbd8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1516,6 +1516,8 @@ in { btrfsutil = toPythonModule (pkgs.btrfs-progs.override { python3 = self.python; }); + btsocket = callPackage ../development/python-modules/btsocket { }; + bucketstore = callPackage ../development/python-modules/bucketstore { }; bugsnag = callPackage ../development/python-modules/bugsnag { }; From 5948687c29c747cbaf267ad661113894f61fc5ec Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 21 Aug 2022 11:10:26 +0200 Subject: [PATCH 3/7] python310Packages.pyric: 0.1.6 -> 0.1.6.3 --- .../python-modules/pyric/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pyric/default.nix b/pkgs/development/python-modules/pyric/default.nix index 19eb1c06515..8ee447f0f0c 100644 --- a/pkgs/development/python-modules/pyric/default.nix +++ b/pkgs/development/python-modules/pyric/default.nix @@ -1,23 +1,27 @@ { lib , buildPythonPackage -, fetchFromGitHub +, fetchPypi , pythonOlder }: buildPythonPackage rec { pname = "pyric"; - version = "0.1.6"; + version = "0.1.6.3"; format = "setuptools"; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "wraith-wireless"; - repo = pname; - rev = version; - hash = "sha256-NAuGgYViMYxzJDQw666cT1WaaNNKh3Ik/tNYJ/tPjbY="; + src = fetchPypi { + pname = "PyRIC"; + inherit version; + hash = "sha256-tTmwHK/r0kBsAAl/lFJeoPjs0d2S93MfQ+rA7xbCzMk="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "__version__ = '0.0.3'" "__version__ = '${version}'" + ''; + # Tests are outdated doCheck = false; From a5ab47173e29e73ce2331f68d6da954316972af3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 21 Aug 2022 11:11:15 +0200 Subject: [PATCH 4/7] python310Packages.bluetooth-auto-recovery: init at 0.1.0 --- .../bluetooth-auto-recovery/default.nix | 55 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 57 insertions(+) create mode 100644 pkgs/development/python-modules/bluetooth-auto-recovery/default.nix diff --git a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix new file mode 100644 index 00000000000..33cf213ac15 --- /dev/null +++ b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix @@ -0,0 +1,55 @@ +{ lib +, async-timeout +, btsocket +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pyric +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "bluetooth-auto-recovery"; + version = "0.1.0"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "Bluetooth-Devices"; + repo = pname; + rev = "v${version}"; + hash = "sha256-TeE/s7DU3KI7TiQqayJbdhJdh7XvdNV17I8bwB+bvJ0="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + async-timeout + btsocket + pyric + ]; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=bluetooth_auto_recovery --cov-report=term-missing:skip-covered" "" + ''; + + pythonImportsCheck = [ + "bluetooth_auto_recovery" + ]; + + meta = with lib; { + description = "Library for recovering Bluetooth adapters"; + homepage = "https://github.com/Bluetooth-Devices/bluetooth-auto-recovery"; + 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 b53856abbd8..e5b65cc2e96 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1403,6 +1403,8 @@ in { bluetooth-adapters = callPackage ../development/python-modules/bluetooth-adapters { }; + bluetooth-auto-recovery = callPackage ../development/python-modules/bluetooth-auto-recovery { }; + bluetooth-data-tools= callPackage ../development/python-modules/bluetooth-data-tools { }; bluetooth-sensor-state-data = callPackage ../development/python-modules/bluetooth-sensor-state-data { }; From 336cc6be9857622b23eecb9ab03b1e05fcdf6eb3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 21 Aug 2022 11:26:00 +0200 Subject: [PATCH 5/7] python310Packages.bluetooth-auto-recovery: 0.1.0 -> 0.2.0 --- .../python-modules/bluetooth-auto-recovery/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix index 33cf213ac15..3453e4116dc 100644 --- a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix +++ b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "bluetooth-auto-recovery"; - version = "0.1.0"; + version = "0.2.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-TeE/s7DU3KI7TiQqayJbdhJdh7XvdNV17I8bwB+bvJ0="; + hash = "sha256-ESQvzQHWtloUQCj2FAdNWGwCMGTZwy2IlgyAFLmpn+A="; }; nativeBuildInputs = [ From 17629b61971ffbafd0bb18724040d6931980daf3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 21 Aug 2022 11:26:36 +0200 Subject: [PATCH 6/7] python310Packages.bluetooth-auto-recovery: 0.2.0 -> 0.2.1 --- .../python-modules/bluetooth-auto-recovery/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix index 3453e4116dc..70504278d8c 100644 --- a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix +++ b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "bluetooth-auto-recovery"; - version = "0.2.0"; + version = "0.2.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-ESQvzQHWtloUQCj2FAdNWGwCMGTZwy2IlgyAFLmpn+A="; + hash = "sha256-EJxiI10zggFxIHI9NymRkojq3xHfWntPqA6cD/QGOxg="; }; nativeBuildInputs = [ From 821e5c653c28bd184c55ef1d335b69e05c61756c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 21 Aug 2022 11:26:44 +0200 Subject: [PATCH 7/7] python310Packages.bluetooth-auto-recovery: 0.2.1 -> 0.2.2 --- .../python-modules/bluetooth-auto-recovery/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix index 70504278d8c..d6cc52d5d99 100644 --- a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix +++ b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "bluetooth-auto-recovery"; - version = "0.2.1"; + version = "0.2.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-EJxiI10zggFxIHI9NymRkojq3xHfWntPqA6cD/QGOxg="; + hash = "sha256-Td7LT5C7ho/fIT2gnkPA0LLXHtzDjbYAopE4ECTfFKQ="; }; nativeBuildInputs = [