From b24c70a82f5789098c3baa224ad5495379038d0f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Jan 2026 02:22:10 +0000 Subject: [PATCH 1/6] python3Packages.dom-toml: 2.1.0 -> 2.2.0 --- pkgs/development/python-modules/dom-toml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dom-toml/default.nix b/pkgs/development/python-modules/dom-toml/default.nix index 3c54e8023d70..3783eff3b2fa 100644 --- a/pkgs/development/python-modules/dom-toml/default.nix +++ b/pkgs/development/python-modules/dom-toml/default.nix @@ -9,13 +9,13 @@ }: buildPythonPackage rec { pname = "dom-toml"; - version = "2.1.0"; + version = "2.2.0"; pyproject = true; src = fetchPypi { inherit version; pname = "dom_toml"; - hash = "sha256-XMDdEM4lZtNbwdlKbvFsBilx/wMYxvNwWADWHSB1raw="; + hash = "sha256-CY0Btma605qj2M2Rbuocc8Qxpp5iFRHTEZwAFgTyfZ8="; }; build-system = [ flit-core ]; From 1761d1595233a5f97dc0a35bb685d0546ce648d0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 4 Jan 2026 18:19:30 +0100 Subject: [PATCH 2/6] python313Packages.dom-toml: add changelog to meta --- pkgs/development/python-modules/dom-toml/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/dom-toml/default.nix b/pkgs/development/python-modules/dom-toml/default.nix index 3783eff3b2fa..fb58f3b2ca42 100644 --- a/pkgs/development/python-modules/dom-toml/default.nix +++ b/pkgs/development/python-modules/dom-toml/default.nix @@ -30,6 +30,7 @@ buildPythonPackage rec { meta = { description = "Dom's tools for Tom's Obvious, Minimal Language"; homepage = "https://github.com/domdfcoding/dom_toml"; + changelog = "https://github.com/domdfcoding/dom_toml/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ tyberius-prime ]; }; From 057788eb36f0cb41ea82ff63652201760d5779d0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 4 Jan 2026 18:22:33 +0100 Subject: [PATCH 3/6] python313Packages.dom-toml: add pythonImportsCheck --- pkgs/development/python-modules/dom-toml/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/dom-toml/default.nix b/pkgs/development/python-modules/dom-toml/default.nix index fb58f3b2ca42..bf9be3167422 100644 --- a/pkgs/development/python-modules/dom-toml/default.nix +++ b/pkgs/development/python-modules/dom-toml/default.nix @@ -27,6 +27,8 @@ buildPythonPackage rec { tomli ]; + pythonImportsCheck = [ "dom_toml" ]; + meta = { description = "Dom's tools for Tom's Obvious, Minimal Language"; homepage = "https://github.com/domdfcoding/dom_toml"; From a63c2cd5e6175a50c6e418eb1a646e3d74785480 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 5 Jan 2026 01:09:52 +0100 Subject: [PATCH 4/6] python313Packages.coincidence: init 0.6.6 Helper functions for pytest https://github.com/python-coincidence/coincidence --- .../python-modules/coincidence/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/coincidence/default.nix diff --git a/pkgs/development/python-modules/coincidence/default.nix b/pkgs/development/python-modules/coincidence/default.nix new file mode 100644 index 000000000000..d0649f5ceaf1 --- /dev/null +++ b/pkgs/development/python-modules/coincidence/default.nix @@ -0,0 +1,45 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytest-regressions, + pytest-timeout, + pytestCheckHook, + toml, + typing-extensions, + whey, +}: + +buildPythonPackage rec { + pname = "coincidence"; + version = "0.6.6"; + pyproject = true; + + src = fetchFromGitHub { + owner = "python-coincidence"; + repo = "coincidence"; + tag = "v${version}"; + hash = "sha256-ktSuUzAwMych6Y2eJWMUfG1a3mGypg8L20f/105RFXc="; + }; + + build-system = [ whey ]; + + dependencies = [ typing-extensions ]; + + nativeCheckInputs = [ + pytest-regressions + pytest-timeout + pytestCheckHook + toml + ]; + + pythonImportsCheck = [ "coincidence" ]; + + meta = { + description = "Helper functions for pytest"; + homepage = "https://github.com/python-coincidence/coincidence"; + changelog = "https://github.com/python-coincidence/coincidence/releases/tag/${src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b9f0fc43bfae..21bc493f9498 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2892,6 +2892,8 @@ self: super: with self; { coinbase-advanced-py = callPackage ../development/python-modules/coinbase-advanced-py { }; + coincidence = callPackage ../development/python-modules/coincidence { }; + coincurve = callPackage ../development/python-modules/coincurve { inherit (pkgs) secp256k1; }; coinmetrics-api-client = callPackage ../development/python-modules/coinmetrics-api-client { }; From 0cd78a32fc783c45f86941d3ddeffa8fdf5f5d05 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 5 Jan 2026 01:12:01 +0100 Subject: [PATCH 5/6] python313Packages.whey: add changelog to meta --- pkgs/development/python-modules/whey/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/whey/default.nix b/pkgs/development/python-modules/whey/default.nix index 415bd2a09023..894572461032 100644 --- a/pkgs/development/python-modules/whey/default.nix +++ b/pkgs/development/python-modules/whey/default.nix @@ -76,6 +76,7 @@ buildPythonPackage rec { meta = { description = "Simple Python wheel builder for simple projects"; homepage = "https://github.com/repo-helper/whey"; + changelog = "https://github.com/repo-helper/whey/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ tyberius-prime ]; }; From f4dcbabb741b2a25374c9b7e395466c0fea3d6d5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 5 Jan 2026 01:22:00 +0100 Subject: [PATCH 6/6] python313Packages.dom-toml: refactor - add optional-dependencies - don't run tests --- .../python-modules/dom-toml/default.nix | 43 ++++++++++++------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/dom-toml/default.nix b/pkgs/development/python-modules/dom-toml/default.nix index bf9be3167422..8b94a193f4bd 100644 --- a/pkgs/development/python-modules/dom-toml/default.nix +++ b/pkgs/development/python-modules/dom-toml/default.nix @@ -1,38 +1,51 @@ { - buildPythonPackage, - fetchPypi, lib, - flit-core, - setuptools, + attrs, + buildPythonPackage, domdf-python-tools, - tomli, + fetchFromGitHub, + flit-core, + pytestCheckHook, + setuptools, + tomli-w, }: + buildPythonPackage rec { pname = "dom-toml"; version = "2.2.0"; pyproject = true; - src = fetchPypi { - inherit version; - pname = "dom_toml"; - hash = "sha256-CY0Btma605qj2M2Rbuocc8Qxpp5iFRHTEZwAFgTyfZ8="; + src = fetchFromGitHub { + owner = "domdfcoding"; + repo = "dom_toml"; + tag = "v${version}"; + hash = "sha256-2kO/6spc+y/ltHf493JkSKI0vGuJu2a29fqsW/EDFxE="; }; build-system = [ flit-core ]; - nativeBuildInputs = [ setuptools ]; + dependencies = [ domdf-python-tools ]; - dependencies = [ - domdf-python-tools - tomli - ]; + optional-dependencies = { + all = [ + attrs + tomli-w + ]; + config = [ + attrs + tomli-w + ]; + }; + + # Circular dependency whey -> domdf-python-tools -> coincidence + doCheck = false; pythonImportsCheck = [ "dom_toml" ]; meta = { description = "Dom's tools for Tom's Obvious, Minimal Language"; homepage = "https://github.com/domdfcoding/dom_toml"; - changelog = "https://github.com/domdfcoding/dom_toml/releases/tag/v${version}"; + changelog = "https://github.com/domdfcoding/dom_toml/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ tyberius-prime ]; };