opshin: 0.24.1 -> 0.24.2 (#402433)

authored by Peder Bergebakken Sundt and committed by GitHub ff96e54b 5b630168

+51 -16
+15 -9
pkgs/by-name/op/opshin/package.nix
··· 4 4 python3, 5 5 }: 6 6 7 - python3.pkgs.buildPythonApplication rec { 7 + let 8 + python3' = python3.override { 9 + self = python3; 10 + packageOverrides = ( 11 + final: prev: { 12 + cbor2 = prev.cbor2WithoutCExtensions; 13 + } 14 + ); 15 + }; 16 + in 17 + 18 + python3'.pkgs.buildPythonApplication rec { 8 19 pname = "opshin"; 9 - version = "0.24.1"; 20 + version = "0.24.2"; 10 21 11 22 format = "pyproject"; 12 23 ··· 14 25 owner = "OpShin"; 15 26 repo = "opshin"; 16 27 tag = version; 17 - hash = "sha256-+uuTEszA5p/qhvthM3Uje6yX3urbIUAKKfDZ4JXEYYQ="; 28 + hash = "sha256-L0vWEXlghXssT9oUw5AYG3/4ALoB/NH90JV8Kdl2n30="; 18 29 }; 19 30 20 - propagatedBuildInputs = with python3.pkgs; [ 31 + propagatedBuildInputs = with python3'.pkgs; [ 21 32 setuptools 22 33 poetry-core 23 34 uplc ··· 26 37 frozenlist2 27 38 astunparse 28 39 ordered-set 29 - ]; 30 - 31 - pythonRelaxDeps = [ 32 - "pluthon" 33 - "uplc" 34 40 ]; 35 41 36 42 meta = with lib; {
+10
pkgs/development/python-modules/cbor2/default.nix
··· 4 4 fetchPypi, 5 5 pythonOlder, 6 6 7 + withCExtensions ? true, 8 + 7 9 # build-system 8 10 setuptools, 9 11 setuptools-scm, ··· 38 40 pytest-cov-stub 39 41 pytestCheckHook 40 42 ]; 43 + 44 + env = lib.optionalAttrs (!withCExtensions) { 45 + CBOR2_BUILD_C_EXTENSION = "0"; 46 + }; 47 + 48 + passthru = { 49 + inherit withCExtensions; 50 + }; 41 51 42 52 meta = with lib; { 43 53 changelog = "https://github.com/agronholm/cbor2/releases/tag/${version}";
+2 -2
pkgs/development/python-modules/pluthon/default.nix
··· 12 12 13 13 buildPythonPackage rec { 14 14 pname = "pluthon"; 15 - version = "1.0.0"; 15 + version = "1.1.0"; 16 16 17 17 format = "pyproject"; 18 18 ··· 20 20 owner = "OpShin"; 21 21 repo = "pluthon"; 22 22 rev = version; 23 - hash = "sha256-IYpkb/RXRu53HoeVKik7Jog5FyXwrWItrxSla9dN0s4="; 23 + hash = "sha256-t8KWm2eBq6CzFPAWN9pgbpF62hvNNZWCpphJsY5T2OQ="; 24 24 }; 25 25 26 26 propagatedBuildInputs = [
+7 -3
pkgs/development/python-modules/pycardano/default.nix
··· 25 25 }: 26 26 27 27 let 28 - cose_0_9_dev8 = cose.overridePythonAttrs (old: rec { 28 + cose_0_9_dev8 = (cose.override { inherit cbor2; }).overridePythonAttrs (old: rec { 29 29 version = "0.9.dev8"; 30 30 src = ( 31 31 old.src.override { ··· 38 38 in 39 39 buildPythonPackage rec { 40 40 pname = "pycardano"; 41 - version = "0.12.3"; 41 + version = "0.14.0"; 42 42 pyproject = true; 43 43 44 44 src = fetchFromGitHub { 45 45 owner = "Python-Cardano"; 46 46 repo = "pycardano"; 47 47 tag = "v${version}"; 48 - hash = "sha256-jxgskdQ7Us+utndUgFYK7G2IW/e5QbeXytOsxQfFiJI="; 48 + hash = "sha256-W5N254tND7mI0oR82YhMFWn4zVVs3ygYOqXOBMO3sXY="; 49 49 }; 50 50 51 51 build-system = [ ··· 88 88 homepage = "https://github.com/Python-Cardano/pycardano"; 89 89 license = lib.licenses.mit; 90 90 maintainers = with lib.maintainers; [ t4ccer ]; 91 + # https://github.com/Python-Cardano/pycardano/blob/v0.13.2/Makefile#L26-L39 92 + # cbor2 with C extensions fail tests due to differences in used sized vs unsized arrays 93 + # more info: https://github.com/NixOS/nixpkgs/pull/402433#issuecomment-2916520286 94 + broken = cbor2.withCExtensions; # consider overriding cbor2 with cbor2WithoutCExtensions 91 95 }; 92 96 }
+13 -2
pkgs/development/python-modules/uplc/default.nix
··· 8 8 setuptools, 9 9 poetry-core, 10 10 frozendict, 11 + cbor2WithoutCExtensions, 11 12 cbor2, 12 13 rply, 13 14 pycardano, 15 + uplc, 14 16 }: 15 17 16 18 buildPythonPackage rec { 17 19 pname = "uplc"; 18 - version = "1.0.7"; 20 + version = "1.0.10"; 19 21 20 22 format = "pyproject"; 21 23 ··· 23 25 owner = "OpShin"; 24 26 repo = "uplc"; 25 27 tag = version; 26 - hash = "sha256-xK2k0XLybWqyP5Qa2Oby8YBgiiswR++yVK7NPgpdSa0="; 28 + hash = "sha256-Owo4W4jChrdYnz11BbWQdm2SiwFwOJlqjYutuRyjpxs="; 27 29 }; 28 30 29 31 propagatedBuildInputs = [ ··· 37 39 python-secp256k1-cardano 38 40 ]; 39 41 42 + # Support cbor2 without C extensions 43 + postPatch = lib.optionalString (!cbor2.withCExtensions) '' 44 + substituteInPlace uplc/ast.py --replace-fail 'from _cbor2' 'from cbor2' 45 + ''; 46 + 40 47 pythonImportsCheck = [ "uplc" ]; 48 + 49 + passthru.tests.withoutCExtensions = uplc.override { 50 + cbor2 = cbor2WithoutCExtensions; 51 + }; 41 52 42 53 meta = with lib; { 43 54 description = "Python implementation of untyped plutus language core";
+4
pkgs/top-level/python-packages.nix
··· 2300 2300 2301 2301 cbor2 = callPackage ../development/python-modules/cbor2 { }; 2302 2302 2303 + cbor2WithoutCExtensions = callPackage ../development/python-modules/cbor2 { 2304 + withCExtensions = false; 2305 + }; 2306 + 2303 2307 cccolutils = callPackage ../development/python-modules/cccolutils { krb5-c = pkgs.krb5; }; 2304 2308 2305 2309 cdcs = callPackage ../development/python-modules/cdcs { };