Merge master into staging-next

2 files changed, 59 insertions, 2 deletions

diff --git a/pkgs/by-name/mo/modelscan/package.nix b/pkgs/by-name/mo/modelscan/package.nix
new file mode 100644
index 000000000000..9784cd769f9d
--- /dev/null
+++ b/pkgs/by-name/mo/modelscan/package.nix
@@ -0,0 +1,57 @@
+{
+  lib,
+  python3,
+  fetchFromGitHub,
+}:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "modelscan";
+  version = "0.8.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "protectai";
+    repo = "modelscan";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-G+jBbDiDiQr3E5JuUdNvfIjVpoVCpsDQRoZ7L659BF0=";
+  };
+
+  build-system = with python3.pkgs; [
+    poetry-core
+    poetry-dynamic-versioning
+  ];
+
+  dependencies = with python3.pkgs; [
+    click
+    numpy
+    rich
+    tomlkit
+  ];
+
+  optional-dependencies = with python3.pkgs; {
+    h5py = [ h5py ];
+    # tensorflow = [ tensorflow ];
+  };
+
+  nativeCheckInputs =
+    with python3.pkgs;
+    [
+      dill
+      pytestCheckHook
+    ]
+    ++ lib.flatten (builtins.attrValues optional-dependencies);
+
+  # tensorflow doesn0t support Python 3.12
+  doCheck = false;
+
+  pythonImportsCheck = [ "modelscan" ];
+
+  meta = with lib; {
+    description = "Protection against Model Serialization Attacks";
+    homepage = "https://github.com/protectai/modelscan";
+    changelog = "https://github.com/protectai/modelscan/releases/tag/v${version}";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ fab ];
+    mainProgram = "modelscan";
+  };
+}
diff --git a/pkgs/by-name/mo/mov-cli/package.nix b/pkgs/by-name/mo/mov-cli/package.nix
index e840f9e56da9..91c0c13f4382 100644
--- a/pkgs/by-name/mo/mov-cli/package.nix
+++ b/pkgs/by-name/mo/mov-cli/package.nix
@@ -8,7 +8,7 @@
 
 let
   pname = "mov-cli";
-  version = "4.4.8";
+  version = "4.4.12";
 in
 python3.pkgs.buildPythonPackage {
   inherit pname version;
@@ -18,7 +18,7 @@ python3.pkgs.buildPythonPackage {
     owner = "mov-cli";
     repo = "mov-cli";
     rev = "refs/tags/${version}";
-    hash = "sha256-MpSwSYsHsrG7ceXXJnFMg1bgadOhe23eNVCNMxlY0pQ=";
+    hash = "sha256-S8IB2TRmzoSKKeTKhESWstPPbSIL8LwqV5Y2+9F0KMo=";
   };
 
   propagatedBuildInputs = with python3.pkgs; [