Unverified Commit 3fcf68e8 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #232845 from nevivurn/feature/pysha3 

pythonPackages311.pysha3: replace with safe-pysha3
parents 3482b099 07f20d65

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

+1 −2
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 
, buildPythonPackage

, pythonOlder

, pytest

, pysha3

, safe-pysha3

, pycryptodome

}:
@@ -32,7 +31,7 @@ buildPythonPackage rec { 


  passthru.optional-dependencies = {

    pycryptodome = [ pycryptodome ];

    pysha3 = if pythonOlder "3.9" then [ pysha3 ] else [ safe-pysha3 ];

    pysha3 = [ safe-pysha3 ];

  };



  meta = with lib; {

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

deleted100644 → 0
+0 −18
Original line number Diff line number Diff line 
{ lib, buildPythonPackage, fetchPypi, pythonOlder }:



buildPythonPackage rec {

  pname = "pysha3";

  version = "1.0.2";

  disabled = pythonOlder "2.7";



  src = fetchPypi {

    inherit pname version;

    sha256 = "17kkjapv6sr906ib0r5wpldmzw7scza08kv241r98vffy9rqx67y";

  };



  meta = {

    description = "Backport of hashlib.sha3 for 2.7 to 3.5";

    homepage = "https://github.com/tiran/pysha3";

    license = lib.licenses.psfl;

  };

}

pkgs/top-level/python-aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -225,6 +225,7 @@ mapAliases ({ 
  Pyro4 = pyro4; # added 2023-02-19

  Pyro5 = pyro5; # added 2023-02-19

  PyRSS2Gen = pyrss2gen; # added 2023-02-19

  pysha3 = throw "pysha3 has been removed, use safe-pysha3 instead"; # added 2023-05-20

  pysmart-smartx = pysmart; # added 2021-10-22

  pysparse = throw "pysparse has been abandoned upstream."; # added 2023-02-28

  pyspotify = throw "pyspotify has been removed because Spotify stopped supporting libspotify"; # added 2022-05-29

pkgs/top-level/python-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -9215,8 +9215,6 @@ self: super: with self; { 


  pysftp = callPackage ../development/python-modules/pysftp { };



  pysha3 = callPackage ../development/python-modules/pysha3 { };



  pyshp = callPackage ../development/python-modules/pyshp { };



  pyside2-tools = toPythonModule (callPackage ../development/python-modules/pyside2-tools {