diff --git a/pkgs/development/python-modules/iocsearcher/default.nix b/pkgs/development/python-modules/iocsearcher/default.nix index 42cc79000e17..059ca673e773 100644 --- a/pkgs/development/python-modules/iocsearcher/default.nix +++ b/pkgs/development/python-modules/iocsearcher/default.nix @@ -17,18 +17,19 @@ python-magic, readabilipy, setuptools, + solders, }: buildPythonPackage rec { pname = "iocsearcher"; - version = "2.5.7"; + version = "2.7.2"; pyproject = true; src = fetchFromGitHub { owner = "malicialab"; repo = "iocsearcher"; tag = "v${version}"; - hash = "sha256-qykPMtdGjys6d1cdP6cM/lmtU5WR/jk9tc9g+8uc31E="; + hash = "sha256-XoBb3V/2ZMrGV+i0abt7+/xEFqv6f0y99scaw8aav04="; }; build-system = [ setuptools ]; @@ -48,6 +49,7 @@ buildPythonPackage rec { phonenumbers python-magic readabilipy + solders ] ++ eth-hash.optional-dependencies.pycryptodome; diff --git a/pkgs/development/python-modules/jsonalias/default.nix b/pkgs/development/python-modules/jsonalias/default.nix new file mode 100644 index 000000000000..20f58b3e20f3 --- /dev/null +++ b/pkgs/development/python-modules/jsonalias/default.nix @@ -0,0 +1,34 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, +}: + +buildPythonPackage (finalAttrs: { + pname = "jsonalias"; + version = "0.1.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "kevinheavey"; + repo = "jsonalias"; + tag = finalAttrs.version; + hash = "sha256-1Pb0VpwnAZiv3z+Ur6FS0LV4D9xKvrfAdUtulvr6ACg="; + }; + + build-system = [ poetry-core ]; + + pythonImportsCheck = [ "jsonalias" ]; + + # Module has no tests + doCheck = false; + + meta = { + description = "Library that defines a Json type alias for Python"; + homepage = "https://github.com/kevinheavey/jsonalias"; + changelog = "https://github.com/kevinheavey/jsonalias/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + }; +}) diff --git a/pkgs/development/python-modules/solders/default.nix b/pkgs/development/python-modules/solders/default.nix new file mode 100644 index 000000000000..ec0e8d023f4c --- /dev/null +++ b/pkgs/development/python-modules/solders/default.nix @@ -0,0 +1,70 @@ +{ + lib, + buildPythonPackage, + cargo, + pkgs, + fetchFromGitHub, + jsonalias, + openssl, + pkg-config, + rustc, + rustPlatform, + typing-extensions, +}: + +buildPythonPackage (finalAttrs: { + pname = "solders"; + version = "0.27.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "kevinheavey"; + repo = "solders"; + tag = "v${finalAttrs.version}"; + hash = "sha256-a3G3mMJvnO24w6WEJnEkYUNinXWHR26KupIlq5eik8A="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (finalAttrs) pname version src; + hash = "sha256-+8iaA1Cs+7qiDfQpwPAWSZ1HuF85WaDZB3MN57QOodI="; + }; + + pythonRelaxDeps = [ "jsonalias" ]; + + build-system = [ + cargo + pkg-config + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook + rustc + ]; + + buildInputs = [ + openssl + pkgs.zstd + ]; + + dependencies = [ + jsonalias + typing-extensions + ]; + + env = { + OPENSSL_NO_VENDOR = true; + ZSTD_SYS_USE_PKG_CONFIG = true; + PKG_CONFIG_PATH = lib.makeSearchPathOutput "dev" "lib/pkgconfig" [ + openssl + pkgs.zstd + ]; + }; + + pythonImportsCheck = [ "solders" ]; + + meta = { + description = "Python toolkit for Solana"; + homepage = "https://github.com/kevinheavey/solders"; + changelog = "https://github.com/kevinheavey/solders/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; + }; +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 19766c3d076b..f8bd6bc284fd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7979,6 +7979,8 @@ self: super: with self; { jsonable = callPackage ../development/python-modules/jsonable { }; + jsonalias = callPackage ../development/python-modules/jsonalias { }; + jsonargparse = callPackage ../development/python-modules/jsonargparse { }; jsonconversion = callPackage ../development/python-modules/jsonconversion { }; @@ -18064,6 +18066,8 @@ self: super: with self; { solc-select = callPackage ../development/python-modules/solc-select { }; + solders = callPackage ../development/python-modules/solders { }; + solidpython2 = callPackage ../development/python-modules/solidpython2 { }; solo-python = callPackage ../development/python-modules/solo-python { };