diff --git a/pkgs/tools/misc/mpremote/default.nix b/pkgs/by-name/mp/mpremote/package.nix similarity index 69% rename from pkgs/tools/misc/mpremote/default.nix rename to pkgs/by-name/mp/mpremote/package.nix index e71a89e492a9..d8cb1ade3e61 100644 --- a/pkgs/tools/misc/mpremote/default.nix +++ b/pkgs/by-name/mp/mpremote/package.nix @@ -1,14 +1,9 @@ { lib, - buildPythonApplication, + python3Packages, fetchFromGitHub, - hatchling, - hatch-requirements-txt, - hatch-vcs, - pyserial, - importlib-metadata, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "mpremote"; version = "1.25.0"; @@ -21,24 +16,24 @@ buildPythonApplication rec { sourceRoot = "${src.name}/tools/mpremote"; format = "pyproject"; - nativeBuildInputs = [ + nativeBuildInputs = with python3Packages; [ hatchling hatch-requirements-txt hatch-vcs ]; - propagatedBuildInputs = [ + dependencies = with python3Packages; [ pyserial importlib-metadata ]; pythonImportsCheck = [ "mpremote" ]; - meta = with lib; { + meta = { description = "Integrated set of utilities to remotely interact with and automate a MicroPython device over a serial connection"; homepage = "https://github.com/micropython/micropython/blob/master/tools/mpremote/README.md"; - platforms = platforms.unix; - license = licenses.mit; - maintainers = with maintainers; [ _999eagle ]; + platforms = lib.platforms.unix; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ _999eagle ]; mainProgram = "mpremote"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ef4b544dfa94..f301c4d1eeaf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1108,8 +1108,6 @@ with pkgs; mkosi-full = mkosi.override { withQemu = true; }; - mpremote = python3Packages.callPackage ../tools/misc/mpremote { }; - mpy-utils = python3Packages.callPackage ../tools/misc/mpy-utils { }; networkd-notify = python3Packages.callPackage ../tools/networking/networkd-notify {