Unverified Commit 0d457c3f authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #233264 from ivan/python38-eth-hash

parents 4aa442ca fcfb25c7

pkgs/development/python-modules/eth-hash/default.nix

+6 −1
Original line number Diff line number Diff line 
{ lib

, fetchFromGitHub

, buildPythonPackage

, pythonAtLeast

, pythonOlder

, pytest

, safe-pysha3
@@ -22,10 +23,14 @@ buildPythonPackage rec { 
  nativeCheckInputs = [

    pytest

  ] ++ passthru.optional-dependencies.pycryptodome

  ++ passthru.optional-dependencies.pysha3;

  # eth-hash can use either safe-pysha3 or pycryptodome;

  # safe-pysha3 requires Python 3.9+ while pycryptodome does not.

  # https://github.com/ethereum/eth-hash/issues/46#issuecomment-1314029211

  ++ lib.optional (pythonAtLeast "3.9") passthru.optional-dependencies.pysha3;



  checkPhase = ''

    pytest tests/backends/pycryptodome/

  '' + lib.optionalString (pythonAtLeast "3.9") ''

    pytest tests/backends/pysha3/

  '';

pkgs/development/python-modules/matplotlib/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ buildPythonPackage rec { 
  pname = "matplotlib";

  format = "pyproject";



  disabled = pythonOlder "3.9";

  disabled = pythonOlder "3.8";



  src = fetchPypi {

    inherit pname version;