Merge master into staging-next

pkgs/by-name/mo/motoc/Cargo.lock

@@ -511,7 +511,7 @@ dependencies = [
 
 [[package]]
 name = "motoc"
-version = "0.3.1"
+version = "0.3.3"
 dependencies = [
  "anyhow",
  "bindgen 0.70.1",

pkgs/by-name/mo/motoc/package.nix

@@ -8,13 +8,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "motoc";
-  version = "0.3.1";
+  version = "0.3.3";
 
   src = fetchFromGitHub {
     owner = "galister";
     repo = "motoc";
     rev = "refs/tags/v${version}";
-    hash = "sha256-119RWsAM5kKjsxA6wGdjhB99G31QaYlZBRaFCg5TtmI=";
+    hash = "sha256-AmHTnCUTHoeLsOJrD35BooU9mZr5ctoCJmjW5CaTYBY=";
   };
 
   cargoLock = {

pkgs/development/python-modules/insightface/default.nix

@@ -7,16 +7,18 @@
   fetchPypi,
   insightface,
   matplotlib,
-  mxnet,
   numpy,
   onnx,
   onnxruntime,
   opencv4,
+  pillow,
   prettytable,
   pythonOlder,
+  requests,
+  setuptools,
+  scipy,
   scikit-image,
   scikit-learn,
-  tensorboard,
   testers,
   tqdm,
   stdenv,
@@ -34,22 +36,26 @@ buildPythonPackage rec {
     hash = "sha256-8ZH3GWEuuzcBj0GTaBRQBUTND4bm/NZ2wCPzVMZo3fc=";
   };
 
-  build-system = [ cython ];
+  build-system = [
+    cython
+    setuptools
+  ];
 
   dependencies = [
+    albumentations
     easydict
     matplotlib
-    mxnet
     numpy
     onnx
     onnxruntime
     opencv4
+    pillow
+    prettytable
+    requests
     scikit-learn
     scikit-image
-    tensorboard
+    scipy
     tqdm
-    albumentations
-    prettytable
   ];
 
   pythonImportsCheck = [