From 20581e0cc9350b2bddb2b99543094372f9079ddf Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 15 May 2022 22:35:37 +0300 Subject: [PATCH 1/6] python*Packages.pymdown-extensions: 9.1 -> 9.4 --- .../pymdown-extensions/default.nix | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/pymdown-extensions/default.nix b/pkgs/development/python-modules/pymdown-extensions/default.nix index 94a73fd8211..068c3196952 100644 --- a/pkgs/development/python-modules/pymdown-extensions/default.nix +++ b/pkgs/development/python-modules/pymdown-extensions/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch +, hatchling , pytestCheckHook , markdown , pyyaml @@ -38,26 +38,17 @@ let in buildPythonPackage rec { pname = "pymdown-extensions"; - version = "9.1"; + version = "9.4"; format = "pyproject"; src = fetchFromGitHub { owner = "facelessuser"; repo = "pymdown-extensions"; rev = version; - sha256 = "sha256-II8Po8144h3wPFrzMbOB/qiCm2HseYrcZkyIZFGT+ek="; + sha256 = "sha256-9oYLDerz6ZcE4QyLO4mFPuHws8oZoXX8LcSV209MFec="; }; - patches = [ - # this patch is needed to allow tests to pass for later versions of the - # markdown dependency - # - # it can be removed after the next pymdown-extensions release - (fetchpatch { - url = "https://github.com/facelessuser/pymdown-extensions/commit/8ee5b5caec8f9373e025f50064585fb9d9b71f86.patch"; - sha256 = "sha256-jTHNcsV0zL0EkSTSj8zCGXXtpUaLnNPldmL+krZj3Gk="; - }) - ]; + nativeBuildInputs = [ hatchling ]; propagatedBuildInputs = [ markdown pygments ]; From 36c7b97ebf49d371f87851cff81a960e40df3373 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 15 May 2022 23:11:40 +0300 Subject: [PATCH 2/6] python*Packages.mkdocs-material: 8.2.11 -> 8.2.15 --- pkgs/development/python-modules/mkdocs-material/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mkdocs-material/default.nix b/pkgs/development/python-modules/mkdocs-material/default.nix index a0df1000892..feed177a9af 100644 --- a/pkgs/development/python-modules/mkdocs-material/default.nix +++ b/pkgs/development/python-modules/mkdocs-material/default.nix @@ -13,7 +13,7 @@ buildPythonApplication rec { pname = "mkdocs-material"; - version = "8.2.11"; + version = "8.2.15"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonApplication rec { owner = "squidfunk"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-YAXdIA36QWwdQxTux6Sy/F0j8lprSO+5/VezFcsGQYg="; + hash = "sha256-6x3ENFPGmtRDMV6YRGlTLCYusmX49LrGBDwicg8sDB0="; }; propagatedBuildInputs = [ From 681f4c49e9ca1b71e3580db619c891c07973fcaa Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 15 May 2022 23:20:48 +0300 Subject: [PATCH 3/6] apache-airflow: mark broken It doesn't build and probably won't any time soon, as it still depends on pre-2.0 Flask. --- pkgs/development/python-modules/apache-airflow/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/apache-airflow/default.nix b/pkgs/development/python-modules/apache-airflow/default.nix index 948fae7893b..c753458fb7e 100644 --- a/pkgs/development/python-modules/apache-airflow/default.nix +++ b/pkgs/development/python-modules/apache-airflow/default.nix @@ -243,5 +243,7 @@ buildPythonPackage rec { homepage = "https://airflow.apache.org/"; license = licenses.asl20; maintainers = with maintainers; [ bhipple costrouc ingenieroariel ]; + # requires extremely outdated versions of multiple dependencies + broken = true; }; } From b50d94a3f27ce81ba39068c2450084460c627886 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 16 May 2022 00:41:07 +0300 Subject: [PATCH 4/6] python*Packages.djangorestframework: add missing dependency --- .../python-modules/djangorestframework/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/djangorestframework/default.nix b/pkgs/development/python-modules/djangorestframework/default.nix index 131be8781b3..f8de884a24f 100644 --- a/pkgs/development/python-modules/djangorestframework/default.nix +++ b/pkgs/development/python-modules/djangorestframework/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, django, isPy27 }: +{ lib, buildPythonPackage, fetchFromGitHub, django, pytz, isPy27 }: buildPythonPackage rec { version = "3.12.4"; @@ -15,7 +15,7 @@ buildPythonPackage rec { # Test settings are missing doCheck = false; - propagatedBuildInputs = [ django ]; + propagatedBuildInputs = [ django pytz ]; meta = with lib; { description = "Web APIs for Django, made easy"; From a4c0d2b344721ad37667776ba5388271ca756e01 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 16 May 2022 00:41:07 +0300 Subject: [PATCH 5/6] netbox: fix build, drop overrides, update Django --- pkgs/servers/web-apps/netbox/default.nix | 33 ++---------------------- 1 file changed, 2 insertions(+), 31 deletions(-) diff --git a/pkgs/servers/web-apps/netbox/default.nix b/pkgs/servers/web-apps/netbox/default.nix index 988076947bc..ee868397ee7 100644 --- a/pkgs/servers/web-apps/netbox/default.nix +++ b/pkgs/servers/web-apps/netbox/default.nix @@ -9,36 +9,7 @@ let py = python3.override { packageOverrides = self: super: { - django = super.django_3; - jsonschema = super.jsonschema.overridePythonAttrs (old: rec { - version = "3.2.0"; - src = self.fetchPypi { - pname = old.pname; - inherit version; - sha256 = "c8a85b28d377cc7737e46e2d9f2b4f44ee3c0e1deac6bf46ddefc7187d30797a"; - }; - }); - lxml = super.lxml.overridePythonAttrs (old: rec { - version = "4.6.5"; - src = self.fetchPypi { - pname = old.pname; - inherit version; - sha256 = "6e84edecc3a82f90d44ddee2ee2a2630d4994b8471816e226d2b771cda7ac4ca"; - }; - }); - werkzeug = super.werkzeug.overridePythonAttrs (old: rec { - version = "2.0.3"; - src = self.fetchPypi { - pname = "Werkzeug"; - inherit version; - sha256 = "sha256-uGP4/wV8UiFktgZ8niiwQRYbS+W6TQ2s7qpQoWOCLTw="; - }; - }); - sentry-sdk = super.sentry-sdk.overridePythonAttrs (old: rec { - disabledTestPaths = old.disabledTestPaths ++ [ - "tests/integrations/flask/test_flask.py" - ]; - }); + django = super.django_4; }; }; @@ -64,7 +35,7 @@ py.pkgs.buildPythonApplication rec { ]; propagatedBuildInputs = with py.pkgs; [ - django_3 + django_4 django-cors-headers django-debug-toolbar django-filter From 016facb869ed894692bee9963d580d77b45d146b Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 16 May 2022 11:40:25 +0300 Subject: [PATCH 6/6] hyperkitty: backport patch fixing Python 3.10 support --- pkgs/servers/mail/mailman/hyperkitty.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/servers/mail/mailman/hyperkitty.nix b/pkgs/servers/mail/mailman/hyperkitty.nix index d1e4581789e..b84e78e323d 100644 --- a/pkgs/servers/mail/mailman/hyperkitty.nix +++ b/pkgs/servers/mail/mailman/hyperkitty.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, fetchpatch , fetchPypi , pythonOlder @@ -40,6 +41,15 @@ buildPythonPackage rec { sha256 = "sha256-gmkiK8pIHfubbbxNdm/D6L2o722FptxYgINYdIUOn4Y="; }; + patches = [ + # FIXME: backport Python 3.10 support fix, remove for next release + (fetchpatch { + url = "https://gitlab.com/mailman/hyperkitty/-/commit/551a44a76e46931fc5c1bcb341235d8f579820be.patch"; + sha256 = "sha256-5XCrvyrDEqH3JryPMoOXSlVVDLQ+PdYBqwGYxkExdvk="; + includes = [ "hyperkitty/*" ]; + }) + ]; + postPatch = '' # isort is a development dependency sed -i '/isort/d' setup.py