From e619c23e3fc3b24b3c0a549f6fac4ff458da1ceb Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 13 Aug 2023 13:49:38 +0100 Subject: [PATCH 1/2] python3Packages.pymdown-extensions: add patch for CVE-2023-32309 --- .../pymdown-extensions/default.nix | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/pkgs/development/python-modules/pymdown-extensions/default.nix b/pkgs/development/python-modules/pymdown-extensions/default.nix index 05da3476ea61..d4d1a75b9b6f 100644 --- a/pkgs/development/python-modules/pymdown-extensions/default.nix +++ b/pkgs/development/python-modules/pymdown-extensions/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , hatchling , pytestCheckHook , markdown @@ -48,6 +49,28 @@ buildPythonPackage rec { hash = "sha256-ld3NuBTjDJUN4ZK+eTwmmfzcB8XCtg8xaLMECo95+Cg="; }; + patches = [ + (fetchpatch { + name = "CVE-2023-32309.part-1.patch"; + url = "https://github.com/facelessuser/pymdown-extensions/commit/b7bb4878d6017c03c8dc97c42d8d3bb6ee81db9d.patch"; + excludes = [ + "docs/src/markdown/about/changelog.md" + "docs/src/markdown/extensions/snippets.md" + "pymdownx/__meta__.py" + ]; + hash = "sha256-JQRgtTfcy9Hrzj84dIxvz7Fpzv3JYKbil6B3BUPIkMw="; + }) + (fetchpatch { + name = "CVE-2023-32309.part-2.patch"; + url = "https://github.com/facelessuser/pymdown-extensions/commit/7c13bda5b7793b172efd1abb6712e156a83fe07d.patch"; + excludes = [ + "docs/src/markdown/about/changelog.md" + "pymdownx/__meta__.py" + ]; + hash = "sha256-3lVz2Ezw0fM2QVA6dfKllwpfDbEKl+YSoy2DHuUGIjY="; + }) + ]; + nativeBuildInputs = [ hatchling ]; propagatedBuildInputs = [ markdown pygments ]; From 91bd58b0e8f27e00ffd24f464e96220363020915 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 12 Aug 2023 13:53:51 +0100 Subject: [PATCH 2/2] python3Packages.pymdown-extensions: add key reverse dependencies to passthru.tests (cherry picked from commit 4de2a329dbc84b69806d0a13f47f1f11f23a7cac) --- .../python-modules/pymdown-extensions/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/python-modules/pymdown-extensions/default.nix b/pkgs/development/python-modules/pymdown-extensions/default.nix index d4d1a75b9b6f..6eda0a4f8092 100644 --- a/pkgs/development/python-modules/pymdown-extensions/default.nix +++ b/pkgs/development/python-modules/pymdown-extensions/default.nix @@ -7,6 +7,12 @@ , markdown , pyyaml , pygments + +# for passthru.tests +, mkdocstrings +, mkdocs-material +, mkdocs-mermaid2-plugin +, hydrus }: let @@ -82,6 +88,10 @@ buildPythonPackage rec { pythonImportsCheck = map (ext: "pymdownx.${ext}") extensions; + passthru.tests = { + inherit mkdocstrings mkdocs-material mkdocs-mermaid2-plugin hydrus; + }; + meta = with lib; { description = "Extensions for Python Markdown"; homepage = "https://facelessuser.github.io/pymdown-extensions/";