Merge pull request #245838 from dotlambda/mistune-3.0.1

python310Packages.mistune: 2.0.5 -> 3.0.1

6 files changed, 48 insertions, 18 deletions

diff --git a/pkgs/development/python-modules/md2gemini/default.nix b/pkgs/development/python-modules/md2gemini/default.nix
index 9c4215940aa..e50c405334c 100644
--- a/pkgs/development/python-modules/md2gemini/default.nix
+++ b/pkgs/development/python-modules/md2gemini/default.nix
@@ -19,5 +19,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/makeworld-the-better-one/md2gemini";
     license = licenses.lgpl3Plus;
     maintainers = [ maintainers.kaction ];
+    broken = versionAtLeast mistune.version "3";
   };
 }
diff --git a/pkgs/development/python-modules/mistune/default.nix b/pkgs/development/python-modules/mistune/default.nix
index 8025fbd4862..2023b478cb8 100644
--- a/pkgs/development/python-modules/mistune/default.nix
+++ b/pkgs/development/python-modules/mistune/default.nix
@@ -2,18 +2,21 @@
 , buildPythonPackage
 , fetchPypi
 , pytestCheckHook
+, pythonOlder
 , setuptools
 }:
 
 buildPythonPackage rec {
   pname = "mistune";
-  version = "2.0.5";
+  version = "3.0.1";
+
+  disabled = pythonOlder "3.7";
 
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-AkYRPLJJLbh1xr5Wl0p8iTMzvybNkokchfYxUc7gnTQ=";
+    hash = "sha256-6RIRbBOqCUT53FMNs464j2p3CHqxKPSfhKSPTAXqFjw=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/schema-salad/default.nix b/pkgs/development/python-modules/schema-salad/default.nix
index b61a5e2e7bc..39a35038fb0 100644
--- a/pkgs/development/python-modules/schema-salad/default.nix
+++ b/pkgs/development/python-modules/schema-salad/default.nix
@@ -75,5 +75,7 @@ buildPythonPackage rec {
     changelog = "https://github.com/common-workflow-language/schema_salad/releases/tag/${version}";
     license = with licenses; [ asl20 ];
     maintainers = with maintainers; [ veprbl ];
+    # https://github.com/common-workflow-language/schema_salad/issues/721
+    broken = versionAtLeast mistune.version "2.1";
   };
 }
diff --git a/pkgs/servers/mail/mailman/python.nix b/pkgs/servers/mail/mailman/python.nix
index 8549cb7150d..7c6edbd5e9e 100644
--- a/pkgs/servers/mail/mailman/python.nix
+++ b/pkgs/servers/mail/mailman/python.nix
@@ -1,4 +1,4 @@
-{ python3, lib, overlay ? (_: _: {}) }:
+{ python3, fetchPypi, lib, overlay ? (_: _: {}) }:
 
 python3.override {
   packageOverrides = lib.composeExtensions
@@ -19,6 +19,16 @@ python3.override {
         [2] f931bc81d63f5cfda55ac73d754c87b3fd63b291
       */
       django = super.django_3;
+
+      # https://gitlab.com/mailman/hyperkitty/-/merge_requests/541
+      mistune = super.mistune.overridePythonAttrs (old: rec {
+        version = "2.0.5";
+        src = fetchPypi {
+          inherit (old) pname;
+          inherit version;
+          hash = "sha256-AkYRPLJJLbh1xr5Wl0p8iTMzvybNkokchfYxUc7gnTQ=";
+        };
+      });
     })
 
     overlay;
diff --git a/pkgs/tools/admin/iredis/default.nix b/pkgs/tools/admin/iredis/default.nix
index d8b8e634fb3..bc38b606b2e 100644
--- a/pkgs/tools/admin/iredis/default.nix
+++ b/pkgs/tools/admin/iredis/default.nix
@@ -1,15 +1,19 @@
-{ lib, python3Packages, fetchPypi }:
+{ lib
+, stdenv
+, python3
+, fetchFromGitHub
+}:
 
-with python3Packages;
-
-buildPythonApplication rec {
+python3.pkgs.buildPythonApplication rec {
   pname = "iredis";
-  version = "1.13.1";
+  version = "1.13.2";
   format = "pyproject";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-MWzbmuxUKh0yBgar1gk8QGJQwbHtINsbCsbTM+RLmQo=";
+  src = fetchFromGitHub {
+    owner = "laixintao";
+    repo = "iredis";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-dGOB7emhuP+V0pHlSdS1L1OC4jO3jtf5RFOy0UFYiuY=";
   };
 
   pythonRelaxDeps = [
@@ -19,16 +23,15 @@ buildPythonApplication rec {
     "packaging"
   ];
 
-  nativeBuildInputs = [
+  nativeBuildInputs = with python3.pkgs; [
     poetry-core
     pythonRelaxDepsHook
   ];
 
-  propagatedBuildInputs = [
+  propagatedBuildInputs = with python3.pkgs; [
     pygments
     click
     configobj
-    importlib-resources
     mistune
     packaging
     pendulum
@@ -37,7 +40,7 @@ buildPythonApplication rec {
     wcwidth
   ];
 
-  nativeCheckInputs = [
+  nativeCheckInputs = with python3.pkgs; [
     pytestCheckHook
     pexpect
   ];
@@ -47,7 +50,6 @@ buildPythonApplication rec {
     "--ignore=tests/unittests/test_client.py"
     "--deselect=tests/unittests/test_render_functions.py::test_render_unixtime_config_raw"
     "--deselect=tests/unittests/test_render_functions.py::test_render_time"
-    "--deselect=tests/unittests/test_entry.py::test_command_shell_options_higher_priority"
     # Only execute unittests, because cli tests require a running Redis
     "tests/unittests/"
   ] ++ lib.optionals stdenv.isDarwin [
@@ -59,7 +61,7 @@ buildPythonApplication rec {
 
   meta = with lib; {
     description = "A Terminal Client for Redis with AutoCompletion and Syntax Highlighting";
-    changelog = "https://github.com/laixintao/iredis/raw/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/laixintao/iredis/raw/${src.rev}/CHANGELOG.md";
     homepage = "https://iredis.io/";
     license = licenses.bsd3;
     maintainers = with maintainers; [ marsam ];
diff --git a/pkgs/tools/misc/lektor/default.nix b/pkgs/tools/misc/lektor/default.nix
index b9c6cd4a69d..638ce2ee3ce 100644
--- a/pkgs/tools/misc/lektor/default.nix
+++ b/pkgs/tools/misc/lektor/default.nix
@@ -1,13 +1,25 @@
 { lib
 , fetchFromGitHub
 , fetchNpmDeps
+, fetchPypi
 , nodejs
 , npmHooks
 , python3
 }:
 
 let
-  python = python3;
+  python = python3.override {
+    packageOverrides = self: super: {
+      mistune = super.mistune.overridePythonAttrs (old: rec {
+        version = "2.0.5";
+        src = fetchPypi {
+          inherit (old) pname;
+          inherit version;
+          hash = "sha256-AkYRPLJJLbh1xr5Wl0p8iTMzvybNkokchfYxUc7gnTQ=";
+        };
+      });
+    };
+  };
 in python.pkgs.buildPythonApplication rec {
   pname = "lektor";
   version = "3.4.0b8";