From 26501c52687e2a33260bc7b6acf1ef51db76a984 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Mon, 29 Aug 2022 11:48:55 +0100
Subject: python3Packages.markdown2: fix tests to actually run

---
 pkgs/development/python-modules/markdown2/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/markdown2/default.nix b/pkgs/development/python-modules/markdown2/default.nix
index 8b9fa1181452..5793f6336d4f 100644
--- a/pkgs/development/python-modules/markdown2/default.nix
+++ b/pkgs/development/python-modules/markdown2/default.nix
@@ -15,7 +15,13 @@ buildPythonPackage rec {
   checkInputs = [ pygments ];
 
   checkPhase = ''
-    ${python.interpreter} ./test/test.py
+    runHook preCheck
+
+    pushd test
+    ${python.interpreter} ./test.py -- -knownfailure
+    popd  # test
+
+    runHook postCheck
   '';
 
   meta = with lib; {
-- 
cgit v1.2.3


From 7f0b3c288fb128c0681e9bec2098aeb70d71252d Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Mon, 29 Aug 2022 11:39:00 +0100
Subject: python3Packages.markdown2: 2.4.1 -> 2.4.3

---
 pkgs/development/python-modules/markdown2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/markdown2/default.nix b/pkgs/development/python-modules/markdown2/default.nix
index 5793f6336d4f..e4cad4bda031 100644
--- a/pkgs/development/python-modules/markdown2/default.nix
+++ b/pkgs/development/python-modules/markdown2/default.nix
@@ -2,14 +2,14 @@
 
 buildPythonPackage rec {
   pname = "markdown2";
-  version = "2.4.1";
+  version = "2.4.3";
 
   # PyPI does not contain tests, so using GitHub instead.
   src = fetchFromGitHub {
     owner = "trentm";
     repo = "python-markdown2";
     rev = version;
-    sha256 = "0y7kh9jj8ys00qkfmmyqj63y21g7wn7yr715kj0j1nabs6xbp0y7";
+    sha256 = "sha256-zNZ7/dDZbPIwcxSLvf8u5oaAgHLrZ6kk4vXNPUuZs/4=";
   };
 
   checkInputs = [ pygments ];
-- 
cgit v1.2.3


From c64ca0283bce0c57678d2d5422bb3227f5850098 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Mon, 29 Aug 2022 11:47:35 +0100
Subject: python3Packages.markdown2: add patch for xss issue
 SNYK-PYTHON-MARKDOWN2-2606985

---
 pkgs/development/python-modules/markdown2/default.nix | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/markdown2/default.nix b/pkgs/development/python-modules/markdown2/default.nix
index e4cad4bda031..385fa8f89a9d 100644
--- a/pkgs/development/python-modules/markdown2/default.nix
+++ b/pkgs/development/python-modules/markdown2/default.nix
@@ -1,4 +1,10 @@
-{ lib, buildPythonPackage, fetchFromGitHub, python, pygments }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, fetchpatch
+, python
+, pygments
+}:
 
 buildPythonPackage rec {
   pname = "markdown2";
@@ -12,6 +18,14 @@ buildPythonPackage rec {
     sha256 = "sha256-zNZ7/dDZbPIwcxSLvf8u5oaAgHLrZ6kk4vXNPUuZs/4=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "SNYK-PYTHON-MARKDOWN2-2606985-xss.patch";  # no CVE (yet?)
+      url = "https://github.com/trentm/python-markdown2/commit/5898fcc1090ef7cd7783fa1422cc0e53cbca9d1b.patch";
+      sha256 = "sha256-M6kKxjHVC3O0BvDeEF4swzfpFsDO/LU9IHvfjK4hznA=";
+    })
+  ];
+
   checkInputs = [ pygments ];
 
   checkPhase = ''
-- 
cgit v1.2.3