From 60578704388a4d144dbfd4e1fb4addc2c07b88e5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 3 Aug 2025 08:34:10 +0200 Subject: [PATCH 1/6] python313Packages.scrypt: 0.8.27 -> 0.8.29 Diff: https://github.com/holgern/py-scrypt/compare/refs/tags/v0.8.27...refs/tags/v0.8.29 Changelog: https://github.com/holgern/py-scrypt/releases/tag/v0.8.29 --- pkgs/development/python-modules/scrypt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scrypt/default.nix b/pkgs/development/python-modules/scrypt/default.nix index df3ad53ff9cb..431d1e0da634 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.8.29"; pyproject = true; src = fetchFromGitHub { owner = "holgern"; repo = "py-scrypt"; tag = "v${version}"; - hash = "sha256-r5tXRq4VFieqw3Plx6W5imDIeGIldW1BREdm6/Kav3M="; + hash = "sha256-vO7TLLF+TMp8sr55sLaUWA9erwaHj5YipqchmIX6EOE="; }; build-system = [ setuptools ]; From c61812a5df18e5df810fa5252e4ea3cd2b896aab Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 7 Aug 2025 13:08:56 +0200 Subject: [PATCH 2/6] python312Packages.ciscoconfparse2: 0.8.17 -> 0.8.29 Diff: https://github.com/mpenning/ciscoconfparse2/compare/refs/tags/0.8.17...refs/tags/0.8.29 Changelog: https://github.com/mpenning/ciscoconfparse2/blob/0.8.29/CHANGES.md --- pkgs/development/python-modules/ciscoconfparse2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ciscoconfparse2/default.nix b/pkgs/development/python-modules/ciscoconfparse2/default.nix index 166eaba86ea4..3134599b8b40 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 = [ From 8c34ca893accb7a77529616e5f8228c50411cacb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 7 Aug 2025 13:11:16 +0200 Subject: [PATCH 3/6] python313Packages.ciscoconfparse2: mark as broken Missing support for hier_config > 3 https://github.com/mpenning/ciscoconfparse2/issues/19 --- pkgs/development/python-modules/ciscoconfparse2/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/ciscoconfparse2/default.nix b/pkgs/development/python-modules/ciscoconfparse2/default.nix index 3134599b8b40..731c78292b68 100644 --- a/pkgs/development/python-modules/ciscoconfparse2/default.nix +++ b/pkgs/development/python-modules/ciscoconfparse2/default.nix @@ -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"; }; } From d214d34b9c8b7b2a53399f502a70da4820351dea Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 7 Aug 2025 13:12:49 +0200 Subject: [PATCH 4/6] python313Packages.scrypt: 0.8.29 -> 0.9.4 Diff: https://github.com/holgern/py-scrypt/compare/refs/tags/v0.8.29...refs/tags/v0.9.4 Changelog: https://github.com/holgern/py-scrypt/releases/tag/v0.9.4 --- pkgs/development/python-modules/scrypt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scrypt/default.nix b/pkgs/development/python-modules/scrypt/default.nix index 431d1e0da634..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.29"; + version = "0.9.4"; pyproject = true; src = fetchFromGitHub { owner = "holgern"; repo = "py-scrypt"; tag = "v${version}"; - hash = "sha256-vO7TLLF+TMp8sr55sLaUWA9erwaHj5YipqchmIX6EOE="; + hash = "sha256-4jVXaPD57RMe4ef1PVgZwPGAhEHL3RGlu2DSC6lGuR4="; }; build-system = [ setuptools ]; From 8bd00446aea504e12ac8e9a0c54e3d25079006c9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 7 Aug 2025 13:15:55 +0200 Subject: [PATCH 5/6] electrum-ltc: rename py-scrypt to scrypt --- pkgs/applications/misc/electrum/ltc.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From 3629b64b8c5728320d0111dd0ef9737276805580 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 7 Aug 2025 13:18:49 +0200 Subject: [PATCH 6/6] python313Packages.py-scrypt: remove Duplicate package --- .../python-modules/py-scrypt/default.nix | 28 ------------------- pkgs/top-level/python-aliases.nix | 2 +- pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 pkgs/development/python-modules/py-scrypt/default.nix 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/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 307b307774ff..4faa55fe87a1 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -615,7 +615,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 1e5e4e2af05d..b50faa2a12b0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12256,8 +12256,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 { };