diff --git a/pkgs/by-name/ad/adafruit-nrfutil/package.nix b/pkgs/by-name/ad/adafruit-nrfutil/package.nix new file mode 100644 index 000000000000..64dc160ff1fb --- /dev/null +++ b/pkgs/by-name/ad/adafruit-nrfutil/package.nix @@ -0,0 +1,47 @@ +{ lib +, python3Packages +, fetchFromGitHub +}: + +python3Packages.buildPythonApplication rec { + pname = "adafruit-nrfutil"; + version = "0.5.3.post17"; + pyproject = true; + + src = fetchFromGitHub { + owner = "adafruit"; + repo = "Adafruit_nRF52_nrfutil"; + rev = "refs/tags/${version}"; + hash = "sha256-mHHKOQE9AGBX8RAyaPOy+JS3fTs98+AFdq9qsVy7go4="; + }; + + nativeBuildInputs = with python3Packages; [ + setuptools + ]; + + propagatedBuildInputs = with python3Packages; [ + click + ecdsa + pyserial + ]; + + nativeCheckInputs = with python3Packages; [ + behave + nose + ]; + + preCheck = '' + mkdir test-reports + ''; + + pythonImportsCheck = [ + "nordicsemi" + ]; + + meta = with lib; { + homepage = "https://github.com/adafruit/Adafruit_nRF52_nrfutil"; + description = "Modified version of Nordic's nrfutil 0.5.x for use with the Adafruit Feather nRF52"; + license = licenses.bsd3; + maintainers = with maintainers; [ stargate01 ]; + }; +} diff --git a/pkgs/development/python-modules/adafruit-nrfutil/default.nix b/pkgs/development/python-modules/adafruit-nrfutil/default.nix deleted file mode 100644 index 0197bf21927f..000000000000 --- a/pkgs/development/python-modules/adafruit-nrfutil/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, fetchpatch -, pythonOlder -, pyserial -, click -, ecdsa -, behave -, nose -}: - -buildPythonPackage rec { - pname = "adafruit-nrfutil"; - version = "1"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; - - src = fetchFromGitHub { - owner = "adafruit"; - repo = "Adafruit_nRF52_nrfutil"; - rev = "refs/tags/appveyor-test-release-${version}"; - hash = "sha256-wsspDg8XwEtJwJye6Z3TXaIN1TcfI7gYDah3L/xiiLo="; - }; - - patches = [ - # Pull a patch which fixes the tests, but is not yet released in a new version: - # https://github.com/adafruit/Adafruit_nRF52_nrfutil/pull/38 - (fetchpatch { - name = "fix-tests.patch"; - url = "https://github.com/adafruit/Adafruit_nRF52_nrfutil/commit/e5fbcc8ee5958041db38c04139ba686bf7d1b845.patch"; - hash = "sha256-0tbJldGtYcDdUzA3wZRv0lenXVn6dqV016U9nMpQ6/w="; - }) - ]; - - propagatedBuildInputs = [ - pyserial - click - ecdsa - ]; - - nativeCheckInputs = [ - behave - nose - ]; - - preCheck = '' - mkdir test-reports - ''; - - pythonImportsCheck = [ - "nordicsemi" - ]; - - meta = with lib; { - homepage = "https://github.com/adafruit/Adafruit_nRF52_nrfutil"; - description = "Modified version of Nordic's nrfutil 0.5.x for use with the Adafruit Feather nRF52"; - license = licenses.bsd3; - maintainers = with maintainers; [ stargate01 ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 6f105d0fcccf..c6514dbdc63c 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -35,6 +35,7 @@ in mapAliases ({ abodepy = jaraco-abode; # added 2023-02-01 acebinf = throw "acebinf has been removed because it is abandoned and broken."; # Added 2023-05-19 + adafruit-nrfutil = throw "adafruit-nrfutil has been promoted to a top-level attribute."; # Added 2023-11-19 aioh2 = throw "aioh2 has been removed because it is abandoned and broken."; # Added 2022-03-30 aionotify = throw "aionotify has been removed because is unmaintained and incompatible with python3.11."; # Added 2023-10-27 aiosenseme = throw "aiosenseme has been removed, because it does no longer work with the latest firmware and has become unmaintained"; # Added 2023-07-05 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4b29edee0ec6..a612e6b98524 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -54,8 +54,6 @@ self: super: with self; { adafruit-io = callPackage ../development/python-modules/adafruit-io { }; - adafruit-nrfutil = callPackage ../development/python-modules/adafruit-nrfutil { }; - adafruit-platformdetect = callPackage ../development/python-modules/adafruit-platformdetect { }; adafruit-pureio = callPackage ../development/python-modules/adafruit-pureio { };