Merge pull request #232845 from nevivurn/feature/pysha3

pythonPackages311.pysha3: replace with safe-pysha3
NixOS · May 20, 2023 · 3fcf68e · 3fcf68e
2 parents 3482b09 + 07f20d6
commit 3fcf68e
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 22 deletions.
diff --git a/pkgs/development/python-modules/eth-hash/default.nix b/pkgs/development/python-modules/eth-hash/default.nix
@@ -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; {

diff --git a/pkgs/development/python-modules/pysha3/default.nix b/pkgs/development/python-modules/pysha3/default.nix
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
@@ -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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
@@ -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 {