diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix index 98f2f16b1f74..fe6ee9f8f9ba 100644 --- a/pkgs/development/python-modules/autobahn/default.nix +++ b/pkgs/development/python-modules/autobahn/default.nix @@ -4,25 +4,14 @@ fetchFromGitHub, attrs, argon2-cffi, - base58, cbor2, cffi, - click, cryptography, - ecdsa, - eth-abi, - eth-account, flatbuffers, - jinja2, - hkdf, hyperlink, - mnemonic, mock, msgpack, passlib, - py-ecc, - # , py-eth-sig-utils - py-multihash, py-ubjson, pynacl, pygobject3, @@ -32,19 +21,11 @@ python-snappy, pytestCheckHook, pythonOlder, - # , pytrie - rlp, service-identity, setuptools, - spake2, twisted, txaio, ujson, - # , web3 - # , wsaccel - # , xbr - yapf, - # , zlmdb zope-interface, }@args: @@ -71,13 +52,11 @@ buildPythonPackage rec { txaio ]; - nativeCheckInputs = - [ - mock - pytest-asyncio - pytestCheckHook - ] - ++ optional-dependencies.scram ++ optional-dependencies.serialization ++ optional-dependencies.xbr; + nativeCheckInputs = [ + mock + pytest-asyncio + pytestCheckHook + ] ++ optional-dependencies.scram ++ optional-dependencies.serialization; preCheck = '' # Run asyncio tests (requires twisted) @@ -92,7 +71,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "autobahn" ]; optional-dependencies = rec { - all = accelerate ++ compress ++ encryption ++ nvx ++ serialization ++ scram ++ twisted ++ ui ++ xbr; + all = accelerate ++ compress ++ encryption ++ nvx ++ serialization ++ scram ++ twisted ++ ui; accelerate = [ # wsaccel ]; @@ -122,22 +101,6 @@ buildPythonPackage rec { zope-interface ]; ui = [ pygobject3 ]; - xbr = [ - base58 - cbor2 - click - ecdsa - eth-abi - jinja2 - hkdf - mnemonic - py-ecc # py-eth-sig-utils - py-multihash - rlp - spake2 - twisted # web3 xbr - yapf # zlmdb - ]; }; meta = with lib; { diff --git a/pkgs/development/python-modules/hkdf/default.nix b/pkgs/development/python-modules/hkdf/default.nix deleted file mode 100644 index f04e486fd73c..000000000000 --- a/pkgs/development/python-modules/hkdf/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - nose, - setuptools, -}: - -buildPythonPackage { - pname = "hkdf"; - version = "0.0.3"; - pyproject = true; - - src = fetchFromGitHub { - owner = "casebeer"; - repo = "python-hkdf"; - rev = "cc3c9dbf0a271b27a7ac5cd04cc1485bbc3b4307"; - hash = "sha256-i3vJzUI7dpZbgZkz7Agd5RAeWisNWftdk/mkJBZkkLg="; - }; - - build-system = [ setuptools ]; - - pythonImportsCheck = [ "hkdf" ]; - - nativeCheckInputs = [ nose ]; - - checkPhase = '' - runHook preCheck - - nosetests - - runHook postCheck - ''; - - meta = with lib; { - description = "HMAC-based Extract-and-Expand Key Derivation Function (HKDF)"; - homepage = "https://github.com/casebeer/python-hkdf"; - license = licenses.bsd2; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 1898c65622b1..d590c94b5cdf 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -258,6 +258,7 @@ mapAliases ({ hcs_utils = hcs-utils; # added 2024-01-06 hdlparse = throw "hdlparse has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18 hglib = python-hglib; # added 2023-10-13 + hkdf = throw "hkdf has been removed, as it is no longer maintained upstream."; # added 2024-10-04 homeassistant-bring-api = bring-api; # added 2024-04-11 homeassistant-pyozw = throw "homeassistant-pyozw has been removed, as it was packaged for home-assistant which has removed it as a dependency."; # added 2024-01-05 htmllaundry = throw "htmllaundry has been removed because it is abandoned"; # added 2024-06-04 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 247dae388924..8ef48f81ed57 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5714,8 +5714,6 @@ self: super: with self; { hkavr = callPackage ../development/python-modules/hkavr { }; - hkdf = callPackage ../development/python-modules/hkdf { }; - hledger-utils = callPackage ../development/python-modules/hledger-utils { }; hlk-sw16 = callPackage ../development/python-modules/hlk-sw16 { };