From 117982d52e36d2ce0870be6074f1b33de4ccd948 Mon Sep 17 00:00:00 2001 From: t4ccer Date: Thu, 18 Jul 2024 02:34:40 -0600 Subject: [PATCH 1/5] python3Packages.mnemonic: 0.20 -> 0.21 --- pkgs/development/python-modules/mnemonic/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/mnemonic/default.nix b/pkgs/development/python-modules/mnemonic/default.nix index 839367cc8e31..4250e048430e 100644 --- a/pkgs/development/python-modules/mnemonic/default.nix +++ b/pkgs/development/python-modules/mnemonic/default.nix @@ -3,20 +3,23 @@ buildPythonPackage, fetchFromGitHub, pytestCheckHook, + poetry-core, }: buildPythonPackage rec { pname = "mnemonic"; - version = "0.20"; - format = "setuptools"; + version = "0.21"; + pyproject = true; src = fetchFromGitHub { owner = "trezor"; - repo = "python-${pname}"; + repo = "python-mnemonic"; rev = "v${version}"; - hash = "sha256-YYgWlYfVd1iALOziaUI8uVYjJDCIVk/dXcUmJd2jcvQ="; + hash = "sha256-D1mS/JQhefYmwrShfWR9SdiGsBUM+jmuCkfWix9tDOU="; }; + build-system = [ poetry-core ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "mnemonic" ]; From 2e57a18f03311bea59078f486c5f862d03c271b0 Mon Sep 17 00:00:00 2001 From: t4ccer Date: Thu, 18 Jul 2024 02:34:07 -0600 Subject: [PATCH 2/5] python3Packages.pycardano: 0.10.0 -> 0.11.1 --- pkgs/development/python-modules/pycardano/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pycardano/default.nix b/pkgs/development/python-modules/pycardano/default.nix index cc1f79c9b2c5..973b84f4c035 100644 --- a/pkgs/development/python-modules/pycardano/default.nix +++ b/pkgs/development/python-modules/pycardano/default.nix @@ -7,6 +7,7 @@ cachetools, cbor2, cose, + docker, ecpy, frozendict, frozenlist, @@ -33,7 +34,7 @@ let in buildPythonPackage rec { pname = "pycardano"; - version = "0.10.0"; + version = "0.11.1"; format = "pyproject"; @@ -41,15 +42,15 @@ buildPythonPackage rec { owner = "Python-Cardano"; repo = "pycardano"; rev = "v${version}"; - hash = "sha256-LP/W8IC2del476fGFq10VMWwMrbAoCCcZOngA8unBM0="; + hash = "sha256-OWm6ztt3s3DUbxDZqpvwTO6XwdY/57AI6Bc6x6kxH7k="; }; - propagatedBuildInputs = [ blockfrost-python cachetools cbor2 cose_0_9_dev8 + docker ecpy frozendict frozenlist From b80d996cf4f76eb70488f612ea1b4797c442fba1 Mon Sep 17 00:00:00 2001 From: t4ccer Date: Thu, 18 Jul 2024 02:33:35 -0600 Subject: [PATCH 3/5] python3Packages.uplc: 0.6.9 -> 1.0.4 --- pkgs/development/python-modules/uplc/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/uplc/default.nix b/pkgs/development/python-modules/uplc/default.nix index 8d93cd592626..bc2111a78ca5 100644 --- a/pkgs/development/python-modules/uplc/default.nix +++ b/pkgs/development/python-modules/uplc/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "uplc"; - version = "0.6.9"; + version = "1.0.4"; format = "pyproject"; @@ -23,10 +23,9 @@ buildPythonPackage rec { owner = "OpShin"; repo = "uplc"; rev = version; - hash = "sha256-djJMNXijMVzMVzw8NZSe3YFRGyAPqdvr0P374Za5XkU="; + hash = "sha256-Mio6VVgQKy1GMeHNk0DITks9Nhr3lA1t7zewu9734j4="; }; - propagatedBuildInputs = [ setuptools poetry-core From 9d4361fa7ab3ab9fc4f12a4f9face7ab3d95925a Mon Sep 17 00:00:00 2001 From: t4ccer Date: Thu, 18 Jul 2024 02:34:27 -0600 Subject: [PATCH 4/5] python3Packages.pluthon: 0.4.6 -> 0.5.3 --- .../development/python-modules/pluthon/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pluthon/default.nix b/pkgs/development/python-modules/pluthon/default.nix index 537eebe52a50..3467d9b21314 100644 --- a/pkgs/development/python-modules/pluthon/default.nix +++ b/pkgs/development/python-modules/pluthon/default.nix @@ -1,6 +1,7 @@ { lib, fetchFromGitHub, + fetchpatch2, buildPythonPackage, setuptools, pythonOlder, @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "pluthon"; - version = "0.4.6"; + version = "0.5.3"; format = "pyproject"; @@ -20,9 +21,18 @@ buildPythonPackage rec { owner = "OpShin"; repo = "pluthon"; rev = version; - hash = "sha256-ZmBkbglSbBfVhA4yP0tJdwpJiFpJ7vX0A321ldQF0lA="; + hash = "sha256-pX/XPZJQZaSY06nLLEvhf+1LEqYG3CdgPV/3Q6XOzTs="; }; + patches = [ + (fetchpatch2 { + name = "pluthon-bump-uplc.patch"; + # https://github.com/OpShin/pluthon/pull/21 + url = "https://github.com/OpShin/pluthon/commit/4b0a40223f253643056cab12231264c5beffc666.patch?full_index=1"; + hash = "sha256-dO9JaIpkugZFKsr3Hd0cFCy7K+cmf77UfrdkZ+sGQtA="; + }) + ]; + propagatedBuildInputs = [ setuptools uplc From 785d212637a4e7845fe5dace85305b6c20b53866 Mon Sep 17 00:00:00 2001 From: t4ccer Date: Thu, 18 Jul 2024 02:34:54 -0600 Subject: [PATCH 5/5] opshin: 0.20.0 -> 0.21.2 --- pkgs/by-name/op/opshin/package.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/op/opshin/package.nix b/pkgs/by-name/op/opshin/package.nix index d7fdf72a8163..7a1a9801eb1f 100644 --- a/pkgs/by-name/op/opshin/package.nix +++ b/pkgs/by-name/op/opshin/package.nix @@ -1,11 +1,12 @@ -{ lib -, fetchFromGitHub -, python3 +{ + lib, + fetchFromGitHub, + python3, }: python3.pkgs.buildPythonApplication rec { pname = "opshin"; - version = "0.20.0"; + version = "0.21.2"; format = "pyproject"; @@ -13,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { owner = "OpShin"; repo = "opshin"; rev = version; - hash = "sha256-fJlPeVAuEf80FVxdXnaKASLmjMEgz6ysXenUY72+sos="; + hash = "sha256-YBdYF04iKUwIZncqyEDalU+YN6/qwlx/vQDzZ19GaPU="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -27,6 +28,11 @@ python3.pkgs.buildPythonApplication rec { ordered-set ]; + pythonRelaxDeps = [ + "pluthon" + "uplc" + ]; + meta = with lib; { description = "Simple pythonic programming language for Smart Contracts on Cardano"; homepage = "https://opshin.dev";