diff --git a/pkgs/by-name/op/opshin/package.nix b/pkgs/by-name/op/opshin/package.nix index dc2b6486dbc0..242c9044439c 100644 --- a/pkgs/by-name/op/opshin/package.nix +++ b/pkgs/by-name/op/opshin/package.nix @@ -6,7 +6,7 @@ python3.pkgs.buildPythonApplication rec { pname = "opshin"; - version = "0.23.0"; + version = "0.24.0"; format = "pyproject"; @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { owner = "OpShin"; repo = "opshin"; tag = version; - hash = "sha256-H6tuSJYV9bAwXu/5Y8g6aFbbQFCpq2aqcmRaDq2cAEg="; + hash = "sha256-5IzPxzNvH9nlOYBCbc8kC7yzf8L8LPA5Wq9agqg9kng="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/development/python-modules/blockfrost-python/default.nix b/pkgs/development/python-modules/blockfrost-python/default.nix index 0c0582290b7e..661ffa326891 100644 --- a/pkgs/development/python-modules/blockfrost-python/default.nix +++ b/pkgs/development/python-modules/blockfrost-python/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch2, # Python deps requests, setuptools, @@ -10,8 +11,7 @@ buildPythonPackage rec { pname = "blockfrost-python"; version = "0.6.0"; - - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "blockfrost"; @@ -20,11 +20,22 @@ buildPythonPackage rec { hash = "sha256-mN26QXxizDR+o2V5C2MlqVEbRns1BTmwZdUnnHNcFzw="; }; - propagatedBuildInputs = [ - requests + patches = [ + (fetchpatch2 { + name = "blockfrost-python-fix-version"; + url = "https://github.com/blockfrost/blockfrost-python/commit/02fdc67ff6d1333c0855e740114585852bbfa0bc.patch?full_index=1"; + hash = "sha256-070tnWxOnVNsCYXmBFo39JUgQDqphdpqx3A9OIuC94U="; + }) + ]; + + build-system = [ setuptools ]; + dependencies = [ + requests + ]; + pythonImportsCheck = [ "blockfrost" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/cardano-tools/default.nix b/pkgs/development/python-modules/cardano-tools/default.nix new file mode 100644 index 000000000000..d6b1af66af58 --- /dev/null +++ b/pkgs/development/python-modules/cardano-tools/default.nix @@ -0,0 +1,37 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + poetry-core, + # Python deps + requests, + pexpect, +}: + +buildPythonPackage rec { + pname = "cardano-tools"; + version = "2.1.0"; + pyproject = true; + + src = fetchPypi { + pname = "cardano_tools"; + inherit version; + hash = "sha256-RFyKXHafV+XgRJSsTjASCCw9DxvZqertf4NNN616Bp4="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ + requests + pexpect + ]; + + pythonImportsCheck = [ "cardano_tools" ]; + + meta = with lib; { + description = "Python module for interfacing with the Cardano blockchain"; + homepage = "https://gitlab.com/viperscience/cardano-tools"; + license = licenses.asl20; + maintainers = with maintainers; [ t4ccer ]; + }; +} diff --git a/pkgs/development/python-modules/ogmios/default.nix b/pkgs/development/python-modules/ogmios/default.nix new file mode 100644 index 000000000000..0d412dc76b30 --- /dev/null +++ b/pkgs/development/python-modules/ogmios/default.nix @@ -0,0 +1,49 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + hatchling, + setuptools, + # Python deps + cachetools, + cardano-tools, + coloredlogs, + orjson, + pydantic, + websockets, +}: + +buildPythonPackage rec { + pname = "ogmios"; + version = "1.3.0"; + pyproject = true; + + src = fetchPypi { + pname = "ogmios"; + inherit version; + hash = "sha256-b5L1J9lqHEQmlw7alv5HnpXM0gpE26cGkddEKH5cSU0="; + }; + + build-system = [ + hatchling + setuptools + ]; + + dependencies = [ + cachetools + cardano-tools + coloredlogs + orjson + pydantic + websockets + ]; + + pythonImportsCheck = [ "ogmios" ]; + + meta = with lib; { + description = "Python client for Ogmios"; + homepage = "https://gitlab.com/viperscience/ogmios-python"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ t4ccer ]; + }; +} diff --git a/pkgs/development/python-modules/pycardano/default.nix b/pkgs/development/python-modules/pycardano/default.nix index 973b84f4c035..d06543c29d56 100644 --- a/pkgs/development/python-modules/pycardano/default.nix +++ b/pkgs/development/python-modules/pycardano/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + pytestCheckHook, # Python deps blockfrost-python, cachetools, @@ -12,12 +13,15 @@ frozendict, frozenlist, mnemonic, + ogmios, poetry-core, pprintpp, pynacl, + requests, setuptools, typeguard, websocket-client, + websockets, }: let @@ -34,18 +38,21 @@ let in buildPythonPackage rec { pname = "pycardano"; - version = "0.11.1"; - - format = "pyproject"; + version = "0.12.3"; + pyproject = true; src = fetchFromGitHub { owner = "Python-Cardano"; repo = "pycardano"; - rev = "v${version}"; - hash = "sha256-OWm6ztt3s3DUbxDZqpvwTO6XwdY/57AI6Bc6x6kxH7k="; + tag = "v${version}"; + hash = "sha256-jxgskdQ7Us+utndUgFYK7G2IW/e5QbeXytOsxQfFiJI="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ blockfrost-python cachetools cbor2 @@ -55,15 +62,21 @@ buildPythonPackage rec { frozendict frozenlist mnemonic + ogmios poetry-core pprintpp pynacl - setuptools + requests typeguard websocket-client + websockets ]; - pythonRelaxDeps = [ "typeguard" ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonRelaxDeps = [ "websockets" ]; pythonImportsCheck = [ "pycardano" ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9867ff038b73..958af9668ac3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2102,6 +2102,8 @@ self: super: with self; { carbon = callPackage ../development/python-modules/carbon { }; + cardano-tools = callPackage ../development/python-modules/cardano-tools { }; + cardimpose = callPackage ../development/python-modules/cardimpose { }; cart = callPackage ../development/python-modules/cart { }; @@ -9730,6 +9732,8 @@ self: super: with self; { oemthermostat = callPackage ../development/python-modules/oemthermostat { }; + ogmios = callPackage ../development/python-modules/ogmios { }; + okonomiyaki = callPackage ../development/python-modules/okonomiyaki { }; okta = callPackage ../development/python-modules/okta { };