From 3e2faf724a0cb2de395db02ce5660c912cced219 Mon Sep 17 00:00:00 2001 From: Ivy Fan-Chiang Date: Sat, 29 Mar 2025 21:45:13 -0400 Subject: [PATCH] python312Packages.yara-x: add module to top-level/python-packages.nix and switch to rustPlatform.fetchCargoVendor --- pkgs/development/python-modules/yara-x/default.nix | 8 ++++---- pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/yara-x/default.nix b/pkgs/development/python-modules/yara-x/default.nix index ce7b079d00f2..efbd33f13584 100644 --- a/pkgs/development/python-modules/yara-x/default.nix +++ b/pkgs/development/python-modules/yara-x/default.nix @@ -5,7 +5,7 @@ fetchFromGitHub, pythonOlder, pytestCheckHook, - yara-x, + pkgs, }: buildPythonPackage rec { pname = "yara-x"; @@ -23,9 +23,9 @@ buildPythonPackage rec { buildAndTestSubdir = "py"; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit pname src version; - hash = "sha256-8s8IUblGJGob/y8x8BoPcXJe83zRmqIZHMxs0iQD7R0="; + hash = "sha256-pD4qyw+TTpmcoX1N3C65VelYszYifm9sFOsEkXEysvo="; }; nativeBuildInputs = [ @@ -33,7 +33,7 @@ buildPythonPackage rec { rustPlatform.maturinBuildHook ]; - buildInputs = [ yara-x ]; + buildInputs = [ pkgs.yara-x ]; pythonImportsCheck = [ "yara_x" ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f9e04abda169..b94bfe16ee85 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18825,6 +18825,8 @@ self: super: with self; { yara-python = callPackage ../development/python-modules/yara-python { }; + yara-x = callPackage ../development/python-modules/yara-x { }; + yaramod = callPackage ../development/python-modules/yaramod { }; yarg = callPackage ../development/python-modules/yarg { };