diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix index 268952e4747d..338b5fc316e8 100644 --- a/pkgs/applications/misc/electrum/ltc.nix +++ b/pkgs/applications/misc/electrum/ltc.nix @@ -70,17 +70,17 @@ python3.pkgs.buildPythonApplication { aiorpcx attrs bitstring + certifi cryptography dnspython jsonrpclib-pelix matplotlib pbkdf2 protobuf - py-scrypt pysocks qrcode requests - certifi + scrypt # plugins btchip-python ckcc-protocol diff --git a/pkgs/development/python-modules/ciscoconfparse2/default.nix b/pkgs/development/python-modules/ciscoconfparse2/default.nix index 166eaba86ea4..731c78292b68 100644 --- a/pkgs/development/python-modules/ciscoconfparse2/default.nix +++ b/pkgs/development/python-modules/ciscoconfparse2/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "ciscoconfparse2"; - version = "0.8.17"; + version = "0.8.29"; pyproject = true; src = fetchFromGitHub { owner = "mpenning"; repo = "ciscoconfparse2"; tag = version; - hash = "sha256-G6FR2v/FJE0ySpNXJ9603O16UjSqOkRB2+7xNoLBJAM="; + hash = "sha256-Dvryv3VPdyRuvIPksEnSlKnCJU70j2xd2aWpwXUGbUY="; }; pythonRelaxDeps = [ @@ -84,5 +84,7 @@ buildPythonPackage rec { changelog = "https://github.com/mpenning/ciscoconfparse2/blob/${src.tag}/CHANGES.md"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fab ]; + # https://github.com/mpenning/ciscoconfparse2/issues/19 + broken = lib.versionAtLeast hier-config.version "3"; }; } diff --git a/pkgs/development/python-modules/py-scrypt/default.nix b/pkgs/development/python-modules/py-scrypt/default.nix deleted file mode 100644 index bf2bf239145a..000000000000 --- a/pkgs/development/python-modules/py-scrypt/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - openssl, -}: - -buildPythonPackage rec { - pname = "py-scrypt"; - version = "0.8.27"; - format = "setuptools"; - - src = fetchPypi { - pname = "scrypt"; - inherit version; - hash = "sha256-p7Y3hI7VGMHqKzGp7Kqj9JYWWY2EQt6HBs8fAfur8Kc="; - }; - - buildInputs = [ openssl ]; - doCheck = false; - - meta = with lib; { - description = "Bindings for scrypt key derivation function library"; - homepage = "https://pypi.python.org/pypi/scrypt"; - maintainers = [ ]; - license = licenses.bsd2; - }; -} diff --git a/pkgs/development/python-modules/scrypt/default.nix b/pkgs/development/python-modules/scrypt/default.nix index df3ad53ff9cb..d85aaa43cb71 100644 --- a/pkgs/development/python-modules/scrypt/default.nix +++ b/pkgs/development/python-modules/scrypt/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "scrypt"; - version = "0.8.27"; + version = "0.9.4"; pyproject = true; src = fetchFromGitHub { owner = "holgern"; repo = "py-scrypt"; tag = "v${version}"; - hash = "sha256-r5tXRq4VFieqw3Plx6W5imDIeGIldW1BREdm6/Kav3M="; + hash = "sha256-4jVXaPD57RMe4ef1PVgZwPGAhEHL3RGlu2DSC6lGuR4="; }; build-system = [ setuptools ]; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 759d13f186ff..86a82c4d1153 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -616,7 +616,7 @@ mapAliases ({ Pyro5 = pyro5; # added 2023-02-19 PyRSS2Gen = pyrss2gen; # added 2023-02-19 pyruckus = throw "pyruckus has been removed, it was deprecrated in favor of aioruckus."; # added 2023-09-07 - py_scrypt = py-scrypt; # added 2024-01-07 + py-scrypt = scrypt; # added 2025-08-07 pysha3 = throw "pysha3 has been removed, use safe-pysha3 instead"; # added 2023-05-20 pysimplegui = throw "pysimplegui update to v5 broke the package, it now needs a license key to decrypt the source code"; # added 2024-09-16 pysmart-smartx = pysmart; # added 2021-10-22 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fc147660992c..7ec82ca4e3fb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12272,8 +12272,6 @@ self: super: with self; { py-schluter = callPackage ../development/python-modules/py-schluter { }; - py-scrypt = callPackage ../development/python-modules/py-scrypt { }; - py-serializable = callPackage ../development/python-modules/py-serializable { }; py-slvs = callPackage ../development/python-modules/py-slvs { };