From 7bf55a1a383ab2db1497bee8f932e335831dfe99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 8 Feb 2025 16:13:03 -0800 Subject: [PATCH 1/2] python313Packages.sdjson: init at 0.5.0 --- .../python-modules/sdjson/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/sdjson/default.nix diff --git a/pkgs/development/python-modules/sdjson/default.nix b/pkgs/development/python-modules/sdjson/default.nix new file mode 100644 index 000000000000..9df8b10dc5c1 --- /dev/null +++ b/pkgs/development/python-modules/sdjson/default.nix @@ -0,0 +1,40 @@ +{ + buildPythonPackage, + domdf-python-tools, + fetchFromGitHub, + lib, + typing-extensions, + whey, +}: + +buildPythonPackage rec { + pname = "sdjson"; + version = "0.5.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "domdfcoding"; + repo = "singledispatch-json"; + tag = "v${version}"; + hash = "sha256-7qwmPhij2X2GLtjeaoMCoOyT0qzYt9oFccWrQOq6LXw="; + }; + + build-system = [ whey ]; + + dependencies = [ + domdf-python-tools + typing-extensions + ]; + + pythonImportsCheck = [ "sdjson" ]; + + # missing dependency coincidence + doCheck = false; + + meta = { + description = "Custom JSON Encoder for Python utilising functools.singledispatch"; + homepage = "https://github.com/domdfcoding/singledispatch-json"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8f7554dd90ff..0ce682680942 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14711,6 +14711,8 @@ self: super: with self; { sdds = callPackage ../development/python-modules/sdds { }; + sdjson = callPackage ../development/python-modules/sdjson { }; + sdkmanager = callPackage ../development/python-modules/sdkmanager { }; sdnotify = callPackage ../development/python-modules/sdnotify { }; From 1f2234d6c8684c6a57e146807a1cf4bc49365ef5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 8 Feb 2025 15:58:22 -0800 Subject: [PATCH 2/2] python313Packages.pyproject-parser: specify optional-dependencies --- .../pyproject-parser/default.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/development/python-modules/pyproject-parser/default.nix b/pkgs/development/python-modules/pyproject-parser/default.nix index a3b6ca4b0319..4e8b54aa045a 100644 --- a/pkgs/development/python-modules/pyproject-parser/default.nix +++ b/pkgs/development/python-modules/pyproject-parser/default.nix @@ -5,10 +5,15 @@ setuptools, apeye-core, attrs, + click, + consolekit, + docutils, dom-toml, domdf-python-tools, natsort, packaging, + readme-renderer, + sdjson, shippinglabel, typing-extensions, }: @@ -34,6 +39,20 @@ buildPythonPackage rec { shippinglabel typing-extensions ]; + + optional-dependencies = { + all = lib.flatten (lib.attrValues (lib.filterAttrs (n: v: n != "all") optional-dependencies)); + cli = [ + click + consolekit + sdjson + ]; + readme = [ + docutils + readme-renderer + ] ++ readme-renderer.optional-dependencies.md; + }; + postPatch = '' substituteInPlace pyproject.toml \ --replace-fail '"setuptools!=61.*,<=67.1.0,>=40.6.0"' '"setuptools"'