From 948d12e6ca1fefc5ea64962fea458b96238d229b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sun, 17 Aug 2025 11:35:08 +0200 Subject: [PATCH 01/10] omnissa-horizon-client: switch to libxml2_13 that has patches for 5 CVEs --- .../om/omnissa-horizon-client/package.nix | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/pkgs/by-name/om/omnissa-horizon-client/package.nix b/pkgs/by-name/om/omnissa-horizon-client/package.nix index f33afecb0e96..5521d5bebcec 100644 --- a/pkgs/by-name/om/omnissa-horizon-client/package.nix +++ b/pkgs/by-name/om/omnissa-horizon-client/package.nix @@ -114,22 +114,7 @@ let xorg.libXScrnSaver xorg.libXtst zlib - - # c.f. https://github.com/NixOS/nixpkgs/pull/418543 - (libxml2.overrideAttrs (oldAttrs: rec { - version = "2.13.8"; - src = fetchurl { - url = "mirror://gnome/sources/libxml2/${lib.versions.majorMinor version}/libxml2-${version}.tar.xz"; - hash = "sha256-J3KUyzMRmrcbK8gfL0Rem8lDW4k60VuyzSsOhZoO6Eo="; - }; - meta = oldAttrs.meta // { - knownVulnerabilities = oldAttrs.meta.knownVulnerabilities or [ ] ++ [ - "CVE-2025-49794" - "CVE-2025-49796" - "CVE-2025-6021" - ]; - }; - })) + libxml2_13 (writeTextDir "etc/omnissa/config" configText) ]; From 383b7f36159e6768ba28acb7b66cbd0629863333 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 18 Aug 2025 16:15:26 +0200 Subject: [PATCH 02/10] python313Packages.nocaselist: add missing build requirement --- pkgs/development/python-modules/nocaselist/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/nocaselist/default.nix b/pkgs/development/python-modules/nocaselist/default.nix index c76216939c54..891b78487ca2 100644 --- a/pkgs/development/python-modules/nocaselist/default.nix +++ b/pkgs/development/python-modules/nocaselist/default.nix @@ -5,6 +5,7 @@ pytestCheckHook, pythonOlder, setuptools, + setuptools-scm, six, }: @@ -20,7 +21,10 @@ buildPythonPackage rec { hash = "sha256-+3MG9aPgRVNOc3q37L7uA5ul6br7xbXyMfYW1+khG2U="; }; - build-system = [ setuptools ]; + build-system = [ + setuptools + setuptools-scm + ]; dependencies = [ six ]; From e39d4e6c1619d8420f32ff6d3a4d963a2919cdd3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 18 Aug 2025 18:25:42 +0200 Subject: [PATCH 03/10] python313Packages.schema-salad: update postPatch --- pkgs/development/python-modules/schema-salad/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/schema-salad/default.nix b/pkgs/development/python-modules/schema-salad/default.nix index 872f8073f0ca..66654564b824 100644 --- a/pkgs/development/python-modules/schema-salad/default.nix +++ b/pkgs/development/python-modules/schema-salad/default.nix @@ -36,8 +36,11 @@ buildPythonPackage rec { pythonRelaxDeps = [ "mistune" ]; postPatch = '' + substituteInPlace setup.py \ + --replace-fail 'pytest_runner + ["setuptools_scm>=8.0.4,<9"]' '["setuptools_scm"]' substituteInPlace pyproject.toml \ - --replace-fail "mypy[mypyc]==1.15.0" "mypy" + --replace-fail '"setuptools_scm[toml]>=8.0.4,<9"' '"setuptools_scm[toml]"' \ + --replace-fail "mypy[mypyc]==1.17.0" "mypy" sed -i "/black>=/d" pyproject.toml ''; From ecfbc827492d79192fad200f736d5d32988acdf6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 18 Aug 2025 18:31:55 +0200 Subject: [PATCH 04/10] python313Packages.cwlformat: modernize --- .../development/python-modules/cwlformat/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cwlformat/default.nix b/pkgs/development/python-modules/cwlformat/default.nix index f9a56ad49870..1144d815b03b 100644 --- a/pkgs/development/python-modules/cwlformat/default.nix +++ b/pkgs/development/python-modules/cwlformat/default.nix @@ -6,12 +6,13 @@ pytestCheckHook, pythonOlder, ruamel-yaml, + setuptools, }: buildPythonPackage rec { pname = "cwlformat"; version = "2022.02.18"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -31,12 +32,19 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ ruamel-yaml ]; + build-system = [ setuptools ]; + + dependencies = [ ruamel-yaml ]; nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "cwlformat" ]; + disabledTests = [ + # Test compares output + "test_formatting_battery" + ]; + meta = with lib; { description = "Code formatter for CWL"; homepage = "https://github.com/rabix/cwl-format"; From 9de8eb2c3d64a002771ab4d17efd55b765febd23 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 18 Aug 2025 19:53:30 +0200 Subject: [PATCH 05/10] python313Packages.cymruwhois: disable failing test --- pkgs/development/python-modules/cymruwhois/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cymruwhois/default.nix b/pkgs/development/python-modules/cymruwhois/default.nix index 070dc04cb0d4..5bca7d20f923 100644 --- a/pkgs/development/python-modules/cymruwhois/default.nix +++ b/pkgs/development/python-modules/cymruwhois/default.nix @@ -33,12 +33,15 @@ buildPythonPackage rec { pythonImportsCheck = [ "cymruwhois" ]; disabledTests = [ - # Tests require network access - "test_asn" # AssertionError "test_doctest" ]; + disabledTestPaths = [ + # £Failed: 'yield' keyword is allowed in fixtures, but not in tests (test_common) + "tests/test_common_lookups.py" + ]; + meta = { description = "Python client for the whois.cymru.com service"; homepage = "https://github.com/JustinAzoff/python-cymruwhois"; From b84809fbcaf0bbf2cb078c311a3eef75e6b21305 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 18 Aug 2025 19:57:16 +0200 Subject: [PATCH 06/10] python313Packages.html2image: update build-system --- pkgs/development/python-modules/html2image/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/html2image/default.nix b/pkgs/development/python-modules/html2image/default.nix index bca718a33311..b6990aa5ca9a 100644 --- a/pkgs/development/python-modules/html2image/default.nix +++ b/pkgs/development/python-modules/html2image/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - poetry-core, + hatchling, requests, websocket-client, }: @@ -19,13 +19,7 @@ buildPythonPackage rec { hash = "sha256-qGp6i4fNmduTZfdxNvYJTAQV/Ovm3XFNOJ8uSj6Ipic="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail poetry.masonry.api poetry.core.masonry.api \ - --replace-fail "poetry>=" "poetry-core>=" - ''; - - build-system = [ poetry-core ]; + build-system = [ hatchling ]; dependencies = [ requests From a6c125f516dd0da0463f19daf0e003ec53663ec5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 18 Aug 2025 19:59:14 +0200 Subject: [PATCH 07/10] python313Packages.pytubefix: add missing input --- pkgs/development/python-modules/pytubefix/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/pytubefix/default.nix b/pkgs/development/python-modules/pytubefix/default.nix index 45a8742b4e0b..0051f7669298 100644 --- a/pkgs/development/python-modules/pytubefix/default.nix +++ b/pkgs/development/python-modules/pytubefix/default.nix @@ -1,5 +1,6 @@ { lib, + aiohttp, buildPythonPackage, fetchFromGitHub, setuptools, @@ -20,6 +21,8 @@ buildPythonPackage rec { build-system = [ setuptools ]; + dependencies = [ aiohttp ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTestPaths = [ From 0a4986f35e35292d5a2351e4748eff8368fa6f0f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 18 Aug 2025 20:08:19 +0200 Subject: [PATCH 08/10] python313Packages.ueberzug: refactor - update build-system - update meta - add missing input --- .../python-modules/ueberzug/default.nix | 30 ++++++++++++------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/ueberzug/default.nix b/pkgs/development/python-modules/ueberzug/default.nix index d0169e0f6e39..e10e0b578597 100644 --- a/pkgs/development/python-modules/ueberzug/default.nix +++ b/pkgs/development/python-modules/ueberzug/default.nix @@ -1,13 +1,16 @@ { lib, + attrs, buildPythonPackage, + docopt, fetchPypi, - isPy27, libX11, libXext, - attrs, - docopt, + libXres, + meson-python, + meson, pillow, + pkg-config, psutil, xlib, }: @@ -15,21 +18,27 @@ buildPythonPackage rec { pname = "ueberzug"; version = "18.3.1"; - format = "setuptools"; - - disabled = isPy27; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "sha256-1Lk4E5YwEq2mUnYbIWDhzz9/CCwfXMJ11/TtJ44ugOk="; + hash = "sha256-1Lk4E5YwEq2mUnYbIWDhzz9/CCwfXMJ11/TtJ44ugOk="; }; + build-system = [ + meson + meson-python + ]; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 + libXres libXext ]; - propagatedBuildInputs = [ + dependencies = [ attrs docopt pillow @@ -42,10 +51,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "ueberzug" ]; meta = with lib; { - homepage = "https://github.com/seebye/ueberzug"; description = "Alternative for w3mimgdisplay"; + homepage = "https://github.com/ueber-devel/ueberzug"; + changelog = "https://github.com/ueber-devel/ueberzug/releases/tag/${version}"; + license = licenses.gpl3Only; mainProgram = "ueberzug"; - license = licenses.gpl3; maintainers = with maintainers; [ Br1ght0ne ]; }; } From f0f5597e0326b67098d86f10baedacae389b1383 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 18 Aug 2025 20:18:52 +0200 Subject: [PATCH 09/10] python313Packages.fugashi: relax cython --- pkgs/development/python-modules/fugashi/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/fugashi/default.nix b/pkgs/development/python-modules/fugashi/default.nix index d2d60b3e8143..9dbedb074378 100644 --- a/pkgs/development/python-modules/fugashi/default.nix +++ b/pkgs/development/python-modules/fugashi/default.nix @@ -25,6 +25,11 @@ buildPythonPackage rec { hash = "sha256-rkQskRz7lgVBrqBeyj9kWO2/7POrZ0TaM+Z7mhpZLvM="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "Cython~=3.0.11" "Cython" + ''; + nativeBuildInputs = [ cython mecab From 670aba8ce0b66ab7d931b907d67cc3ddf7571749 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 18 Aug 2025 20:36:09 +0200 Subject: [PATCH 10/10] python313Packages.fugashi: refactor --- pkgs/development/python-modules/fugashi/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/fugashi/default.nix b/pkgs/development/python-modules/fugashi/default.nix index 9dbedb074378..b2e5997ace6b 100644 --- a/pkgs/development/python-modules/fugashi/default.nix +++ b/pkgs/development/python-modules/fugashi/default.nix @@ -1,7 +1,6 @@ { lib, fetchFromGitHub, - pythonOlder, pytestCheckHook, buildPythonPackage, cython, @@ -15,8 +14,7 @@ buildPythonPackage rec { pname = "fugashi"; version = "1.5.1"; - format = "pyproject"; - disabled = pythonOlder "3.9"; + pyproject = true; src = fetchFromGitHub { owner = "polm"; @@ -30,7 +28,7 @@ buildPythonPackage rec { --replace-fail "Cython~=3.0.11" "Cython" ''; - nativeBuildInputs = [ + build-system = [ cython mecab setuptools-scm @@ -56,7 +54,7 @@ buildPythonPackage rec { meta = with lib; { description = "Cython MeCab wrapper for fast, pythonic Japanese tokenization and morphological analysis"; homepage = "https://github.com/polm/fugashi"; - changelog = "https://github.com/polm/fugashi/releases/tag/${version}"; + changelog = "https://github.com/polm/fugashi/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ laurent-f1z1 ]; };