From c3241eec3c1f3071288bf67f1a46f8c67cb67366 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Jun 2026 05:24:23 +0000 Subject: [PATCH 1/2] python3Packages.marko: 2.2.2 -> 2.2.3 --- pkgs/development/python-modules/marko/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/marko/default.nix b/pkgs/development/python-modules/marko/default.nix index e85ca6a0caf1..b2bfef6a1175 100644 --- a/pkgs/development/python-modules/marko/default.nix +++ b/pkgs/development/python-modules/marko/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "marko"; - version = "2.2.2"; + version = "2.2.3"; pyproject = true; src = fetchFromGitHub { owner = "frostming"; repo = "marko"; tag = "v${version}"; - hash = "sha256-gJmxYURSvh8Gd3pboGJGkPhIBeViX0apvummoDhPqfk="; + hash = "sha256-EuLir4Nws39B3onmWnnvEzp5W8934K89/WHOVHxVVKM="; }; build-system = [ From cf9e74000287703fc0908628a11d2e57d6168a25 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 5 Jun 2026 10:20:31 +0200 Subject: [PATCH 2/2] python3Packages.marko: migrate to finalAttrs --- .../python-modules/marko/default.nix | 35 +++++++------------ 1 file changed, 12 insertions(+), 23 deletions(-) diff --git a/pkgs/development/python-modules/marko/default.nix b/pkgs/development/python-modules/marko/default.nix index b2bfef6a1175..87c8886c0792 100644 --- a/pkgs/development/python-modules/marko/default.nix +++ b/pkgs/development/python-modules/marko/default.nix @@ -2,14 +2,14 @@ lib, buildPythonPackage, fetchFromGitHub, + objprint, pdm-backend, pygments, - objprint, - python-slugify, pytestCheckHook, + python-slugify, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "marko"; version = "2.2.3"; pyproject = true; @@ -17,41 +17,30 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "frostming"; repo = "marko"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-EuLir4Nws39B3onmWnnvEzp5W8934K89/WHOVHxVVKM="; }; - build-system = [ - pdm-backend - ]; + build-system = [ pdm-backend ]; optional-dependencies = { - codehilite = [ - pygments - ]; - repr = [ - objprint - ]; - toc = [ - python-slugify - ]; + codehilite = [ pygments ]; + repr = [ objprint ]; + toc = [ python-slugify ]; }; - pythonImportsCheck = [ - "marko" - ]; + pythonImportsCheck = [ "marko" ]; nativeCheckInputs = [ pytestCheckHook ] - ++ optional-dependencies.toc - ++ optional-dependencies.codehilite; + ++ lib.flatten (builtins.attrValues finalAttrs.passthru.optional-dependencies); meta = { - changelog = "https://github.com/frostming/marko/blob/${src.tag}/CHANGELOG.md"; description = "Markdown parser with high extensibility"; homepage = "https://github.com/frostming/marko"; + changelog = "https://github.com/frostming/marko/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = [ ]; }; -} +})