From 42601e6f1c756e2780c5984e3a00df35c8bd127b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 27 Jul 2023 23:54:40 -0700 Subject: [PATCH 1/6] python310Packages.mistune: 2.0.5 -> 3.0.1 Changelog: https://github.com/lepture/mistune/blob/v3.0.1/docs/changes.rst --- pkgs/development/python-modules/mistune/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mistune/default.nix b/pkgs/development/python-modules/mistune/default.nix index 8025fbd48628..2023b478cb85 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 = [ From 98152f67b96fe3af4993f3026c139501dabf3ebf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 1 Aug 2023 23:12:06 -0700 Subject: [PATCH 2/6] mailman-hyperkitty: pin mistune at 2.0.5 --- pkgs/servers/mail/mailman/python.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/mail/mailman/python.nix b/pkgs/servers/mail/mailman/python.nix index 8549cb7150d2..7c6edbd5e9ea 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; From 19657c7fd67be5c6967c4d7413ce90b84de1397a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 12 Sep 2023 22:23:43 -0700 Subject: [PATCH 3/6] lektor: pin mistune at 2.0.5 --- pkgs/tools/misc/lektor/default.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/lektor/default.nix b/pkgs/tools/misc/lektor/default.nix index b9c6cd4a69de..638ce2ee3ce7 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"; From 9a3403ba4153266e8c068496b5a552225d7a06ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 12 Sep 2023 22:26:45 -0700 Subject: [PATCH 4/6] python310Packages.schema-salad: mark broken It is incompatible with mistune v3. --- pkgs/development/python-modules/schema-salad/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/schema-salad/default.nix b/pkgs/development/python-modules/schema-salad/default.nix index b61a5e2e7bce..39a35038fb0a 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"; }; } From 7338ab600fd2d326d4a92f8ce36d9f632fe32e50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 12 Sep 2023 22:29:57 -0700 Subject: [PATCH 5/6] python310Packages.md2gemini: mark broken It is incompatible with mistune v3. --- pkgs/development/python-modules/md2gemini/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/md2gemini/default.nix b/pkgs/development/python-modules/md2gemini/default.nix index 9c4215940aa5..e50c405334c1 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"; }; } From 7e70581f8b949103f05678245cfe63563c6ca294 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 15 Sep 2023 09:35:02 -0700 Subject: [PATCH 6/6] iredis: 1.13.1 -> 1.13.2 Changelog: https://github.com/laixintao/iredis/raw/v1.13.2/CHANGELOG.md --- pkgs/tools/admin/iredis/default.nix | 30 +++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/admin/iredis/default.nix b/pkgs/tools/admin/iredis/default.nix index d8b8e634fb3f..bc38b606b2e7 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 ];