From 3eebbbde10d69a0502b6a12efa3c32c37e62c7d8 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Sat, 3 Dec 2022 23:56:56 -0800 Subject: [PATCH] python310Packages.pyocd: move from all-packages --- pkgs/development/{embedded => python-modules}/pyocd/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 3 insertions(+), 1 deletion(-) rename pkgs/development/{embedded => python-modules}/pyocd/default.nix (100%) diff --git a/pkgs/development/embedded/pyocd/default.nix b/pkgs/development/python-modules/pyocd/default.nix similarity index 100% rename from pkgs/development/embedded/pyocd/default.nix rename to pkgs/development/python-modules/pyocd/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 550a07a09112..191cc12287b6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10721,7 +10721,7 @@ with pkgs; pympress = callPackage ../applications/office/pympress { }; - pyocd = python3Packages.callPackage ../development/embedded/pyocd { }; + pyocd = with python3Packages; toPythonApplication pyocd; pypass = with python3Packages; toPythonApplication pypass; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5c357d23bfc9..0f22e1761ccf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8264,6 +8264,8 @@ self: super: with self; { pyobihai = callPackage ../development/python-modules/pyobihai { }; + pyocd = callPackage ../development/python-modules/pyocd { }; + pyocr = callPackage ../development/python-modules/pyocr { tesseract = pkgs.tesseract4; };