From 529a1fc31812b1cd93236dc2e59bcd22ba889ed2 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 28 Jun 2026 14:35:36 +0300 Subject: [PATCH 1/9] playwright.webkit: fix libjxl override --- pkgs/development/web/playwright/webkit.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/web/playwright/webkit.nix b/pkgs/development/web/playwright/webkit.nix index 55f20bdcd9eb..1a29cf31c1e5 100644 --- a/pkgs/development/web/playwright/webkit.nix +++ b/pkgs/development/web/playwright/webkit.nix @@ -79,6 +79,13 @@ let hash = "sha256-I3PGgh0XqRkCFz7lUZ3Q4eU0+0GwaQcVb6t4Pru1kKo="; fetchSubmodules = true; }; + + # override split output shenanigans from the main package + outputs = [ + "out" + "dev" + ]; + patches = [ # Add missing content to fix gcc compilation for RISCV architecture # https://github.com/libjxl/libjxl/pull/2211 From 4f39574b549ef678d7b2318515746d82f087d587 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 28 Jun 2026 14:38:52 +0300 Subject: [PATCH 2/9] python3Packages.fontparts: unpin setuptools-scm --- pkgs/development/python-modules/fontparts/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/fontparts/default.nix b/pkgs/development/python-modules/fontparts/default.nix index bc6b8c1e797a..43bf78c3dd3b 100644 --- a/pkgs/development/python-modules/fontparts/default.nix +++ b/pkgs/development/python-modules/fontparts/default.nix @@ -31,7 +31,10 @@ buildPythonPackage (finalAttrs: { postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail ', "vcs-versioning"' "" + --replace-fail ', "vcs-versioning"' "" \ + --replace-fail "setuptools_scm[toml]>=3.4,<10" "setuptools_scm[toml]" + substituteInPlace setup.cfg \ + --replace-fail "setuptools_scm==9.2.2" "setuptools_scm" ''; build-system = [ From b812bc2a4a1597b73bc9a5422318fe6bcc9bde34 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 28 Jun 2026 14:47:03 +0300 Subject: [PATCH 3/9] treewide: drop gst-vaapi Upstream dropped it and it no longer builds. --- .../obs-studio/plugins/obs-vaapi/default.nix | 2 - pkgs/by-name/ci/citrix-workspace/package.nix | 1 - pkgs/by-name/de/deltachat-tauri/package.nix | 1 - .../fl/flet-client-flutter/package.nix | 2 +- .../gn/gnome-network-displays/package.nix | 1 - pkgs/by-name/ka/kazumi/package.nix | 1 - pkgs/by-name/pi/picard/package.nix | 18 +-- pkgs/by-name/pi/pipeline/package.nix | 1 - pkgs/by-name/py/pympress/package.nix | 1 - pkgs/by-name/xp/xpra/package.nix | 1 - .../libraries/gstreamer/default.nix | 3 +- .../libraries/gstreamer/vaapi/default.nix | 120 ------------------ pkgs/development/libraries/qt-6/default.nix | 1 - .../qt-6/modules/qtmultimedia/default.nix | 2 - 14 files changed, 9 insertions(+), 146 deletions(-) delete mode 100644 pkgs/development/libraries/gstreamer/vaapi/default.nix diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix index fd7837eb5cc3..840c5a50ac76 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix @@ -36,7 +36,6 @@ stdenv.mkDerivation rec { # - We need "getLib" instead of default derivation, otherwise it brings gstreamer-bin; # - without gst-plugins-base it won't even show proper errors in logs; # - Without gst-plugins-bad it won't find element "vapostproc"; - # - gst-vaapi adds "VA-API" to "Encoder type"; # Tip: "could not link appsrc to videoconvert1" can mean a lot of things, enable GST_DEBUG=2 for help. passthru.obsWrapperArguments = let @@ -48,7 +47,6 @@ stdenv.mkDerivation rec { gstreamer gst-plugins-base gst-plugins-bad - gst-vaapi ]; # Fix output directory diff --git a/pkgs/by-name/ci/citrix-workspace/package.nix b/pkgs/by-name/ci/citrix-workspace/package.nix index 7b1f996bfcf2..9051b4e72b37 100644 --- a/pkgs/by-name/ci/citrix-workspace/package.nix +++ b/pkgs/by-name/ci/citrix-workspace/package.nix @@ -91,7 +91,6 @@ let gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly - gst_all_1.gst-vaapi ]; gstPluginPath = lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" gstPackages; diff --git a/pkgs/by-name/de/deltachat-tauri/package.nix b/pkgs/by-name/de/deltachat-tauri/package.nix index 26cb46756bca..1387196ffbae 100644 --- a/pkgs/by-name/de/deltachat-tauri/package.nix +++ b/pkgs/by-name/de/deltachat-tauri/package.nix @@ -64,7 +64,6 @@ rustPlatform.buildRustPackage (finalAttrs: { gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad - gst_all_1.gst-vaapi gst_all_1.gstreamer libayatana-appindicator openssl diff --git a/pkgs/by-name/fl/flet-client-flutter/package.nix b/pkgs/by-name/fl/flet-client-flutter/package.nix index 867b9d0f2e9c..7733ee43da04 100644 --- a/pkgs/by-name/fl/flet-client-flutter/package.nix +++ b/pkgs/by-name/fl/flet-client-flutter/package.nix @@ -51,7 +51,7 @@ flutter338.buildFlutterApplication rec { mpv-unwrapped gst_all_1.gst-libav gst_all_1.gst-plugins-base - gst_all_1.gst-vaapi + gst_all_1.gst-plugins-bad gst_all_1.gstreamer libunwind orc diff --git a/pkgs/by-name/gn/gnome-network-displays/package.nix b/pkgs/by-name/gn/gnome-network-displays/package.nix index 681954677367..57e2576d2b7d 100644 --- a/pkgs/by-name/gn/gnome-network-displays/package.nix +++ b/pkgs/by-name/gn/gnome-network-displays/package.nix @@ -59,7 +59,6 @@ stdenv.mkDerivation (finalAttrs: { gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly gst_all_1.gst-rtsp-server - gst_all_1.gst-vaapi pipewire networkmanager json-glib diff --git a/pkgs/by-name/ka/kazumi/package.nix b/pkgs/by-name/ka/kazumi/package.nix index 511e88086d0e..da2c473ae1bb 100644 --- a/pkgs/by-name/ka/kazumi/package.nix +++ b/pkgs/by-name/ka/kazumi/package.nix @@ -91,7 +91,6 @@ flutter.buildFlutterApplication { gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good - gst_all_1.gst-vaapi gst_all_1.gstreamer libayatana-appindicator mpv-unwrapped diff --git a/pkgs/by-name/pi/picard/package.nix b/pkgs/by-name/pi/picard/package.nix index db9009ebaedf..51336472ded0 100644 --- a/pkgs/by-name/pi/picard/package.nix +++ b/pkgs/by-name/pi/picard/package.nix @@ -45,17 +45,13 @@ pythonPackages.buildPythonApplication (finalAttrs: { ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform qt5.qtwayland) [ qt5.qtwayland ] - ++ lib.optionals (pyqt5.multimediaEnabled) ( - [ - qt5.qtmultimedia.bin - gst_all_1.gst-libav - gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good - ] - ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform gst_all_1.gst-vaapi) [ - gst_all_1.gst-vaapi - ] - ); + ++ lib.optionals (pyqt5.multimediaEnabled) [ + qt5.qtmultimedia.bin + gst_all_1.gst-libav + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + ]; pythonRelaxDeps = lib.optionals stdenv.hostPlatform.isDarwin [ # Should be resolved in the next version diff --git a/pkgs/by-name/pi/pipeline/package.nix b/pkgs/by-name/pi/pipeline/package.nix index ffd0e38f62a7..32e6e5e887b6 100644 --- a/pkgs/by-name/pi/pipeline/package.nix +++ b/pkgs/by-name/pi/pipeline/package.nix @@ -74,7 +74,6 @@ stdenv.mkDerivation (finalAttrs: { gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly - gst_all_1.gst-vaapi glib-networking # For GIO_EXTRA_MODULES. Fixes "TLS support is not available" ]; diff --git a/pkgs/by-name/py/pympress/package.nix b/pkgs/by-name/py/pympress/package.nix index 288ea438fb5d..55a6b40b82cb 100644 --- a/pkgs/by-name/py/pympress/package.nix +++ b/pkgs/by-name/py/pympress/package.nix @@ -56,7 +56,6 @@ python3Packages.buildPythonApplication (finalAttrs: { gst_all_1.gst-plugins-ugly (gst_all_1.gst-plugins-good.override { gtkSupport = true; }) gst_all_1.gst-libav - gst_all_1.gst-vaapi ]; doCheck = false; # there are no tests diff --git a/pkgs/by-name/xp/xpra/package.nix b/pkgs/by-name/xp/xpra/package.nix index 6d9c26e42de9..bcd5776b7d21 100644 --- a/pkgs/by-name/xp/xpra/package.nix +++ b/pkgs/by-name/xp/xpra/package.nix @@ -159,7 +159,6 @@ effectiveBuildPythonApplication rec { ] ++ (with gst_all_1; [ gst-libav - gst-vaapi gst-plugins-ugly gst-plugins-bad gst-plugins-base diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix index b41e8192aaa4..21712e04da55 100644 --- a/pkgs/development/libraries/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/default.nix @@ -37,8 +37,6 @@ lib.makeScope newScope ( gst-editing-services = callPackage ./ges { }; - gst-vaapi = callPackage ./vaapi { }; - icamerasrc-ipu6 = callPackage ./icamerasrc { }; icamerasrc-ipu6ep = callPackage ./icamerasrc { ipu6-camera-hal = ipu6ep-camera-hal; @@ -51,5 +49,6 @@ lib.makeScope newScope ( } // lib.optionalAttrs config.allowAliases { gst-plugins-viperfx = throw "'gst_all_1.gst-plugins-viperfx' was removed as it is broken and not maintained upstream"; # Added 2024-12-16 + gst-vaapi = throw "'gst_all_1.gst-vaapi' has been removed in GStreamer 1.28. Users are recommended to switch to gst-plugins-bad, however it is not an in-place upgrade."; # Added 2026-06-28 } ) diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix deleted file mode 100644 index e5796cc6a9e8..000000000000 --- a/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ /dev/null @@ -1,120 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - meson, - ninja, - pkg-config, - gst-plugins-base, - bzip2, - libva, - wayland, - wayland-protocols, - wayland-scanner, - libdrm, - udev, - libxv, - libxrandr, - libxext, - libx11, - libsm, - libice, - libxcb, - libGLU, - libGL, - gstreamer, - gst-plugins-bad, - nasm, - libvpx, - python3, - # Checks meson.is_cross_build(), so even canExecute isn't enough. - enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform, - hotdoc, - directoryListingUpdater, - apple-sdk_gstreamer, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "gstreamer-vaapi"; - version = "1.26.11"; - - outputs = [ - "out" - "dev" - ]; - - src = fetchurl { - url = "https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-${finalAttrs.version}.tar.xz"; - hash = "sha256-8S+TAnPHodPg1/hblP+dE3nRYqzMky6Mo9OJk+0n/Kw="; - }; - - separateDebugInfo = true; - - __structuredAttrs = true; - strictDeps = true; - - nativeBuildInputs = [ - meson - ninja - pkg-config - python3 - bzip2 - wayland-scanner - ] - ++ lib.optionals enableDocumentation [ - hotdoc - ]; - - buildInputs = [ - gstreamer - gst-plugins-base - gst-plugins-bad - libva - wayland - wayland-protocols - libdrm - udev - libx11 - libxcb - libxext - libxv - libxrandr - libsm - libice - nasm - libvpx - ] - ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ - libGL - libGLU - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_gstreamer - ]; - - mesonFlags = [ - "-Dexamples=disabled" # requires many dependencies and probably not useful for our users - (lib.mesonEnable "doc" enableDocumentation) - ]; - - postPatch = '' - patchShebangs \ - scripts/extract-release-date-from-doap-file.py - ''; - - preFixup = '' - moveToOutput "lib/gstreamer-1.0/pkgconfig" "$dev" - ''; - - passthru = { - updateScript = directoryListingUpdater { odd-unstable = true; }; - }; - - meta = { - description = "Set of VAAPI GStreamer Plug-ins"; - homepage = "https://gstreamer.freedesktop.org"; - license = lib.licenses.lgpl21Plus; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ tmarkus ]; - }; -}) diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index b8a7afb5496c..6f1489005a12 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -89,7 +89,6 @@ let gst-plugins-base gst-plugins-good gst-libav - gst-vaapi ; }; qtmqtt = callPackage ./modules/qtmqtt.nix { }; diff --git a/pkgs/development/libraries/qt-6/modules/qtmultimedia/default.nix b/pkgs/development/libraries/qt-6/modules/qtmultimedia/default.nix index 104bfb752531..50829d0b0ef7 100644 --- a/pkgs/development/libraries/qt-6/modules/qtmultimedia/default.nix +++ b/pkgs/development/libraries/qt-6/modules/qtmultimedia/default.nix @@ -14,7 +14,6 @@ gst-plugins-base, gst-plugins-good, gst-libav, - gst-vaapi, ffmpeg, libva, libpulseaudio, @@ -59,7 +58,6 @@ qtModule { gst-plugins-base gst-plugins-good gst-libav - gst-vaapi ]; patches = lib.optionals stdenv.hostPlatform.isMinGW [ From d5f3ba05b658a8842ed5d483b29564c968c78209 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 28 Jun 2026 14:49:03 +0300 Subject: [PATCH 4/9] python3Packages.jq: skip another test that relies on exact jq error text --- pkgs/development/python-modules/jq/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/jq/default.nix b/pkgs/development/python-modules/jq/default.nix index 01c93b61a9fe..39fc694fa546 100644 --- a/pkgs/development/python-modules/jq/default.nix +++ b/pkgs/development/python-modules/jq/default.nix @@ -38,6 +38,7 @@ buildPythonPackage rec { disabledTests = [ # tries to match exact error text, fails with jq 1.8 "test_value_error_is_raised_if_program_is_invalid" + "test_value_error_is_raised_if_input_cannot_be_processed_by_program" ]; pythonImportsCheck = [ "jq" ]; From 22927b96798d1cdbf665448f97898f1b32253e52 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 28 Jun 2026 14:50:45 +0300 Subject: [PATCH 5/9] treewide: drop python3Packages.aiosasl and friends --- pkgs/by-name/ur/urlwatch/package.nix | 1 - .../python-modules/aiosasl/default.nix | 52 ---------- .../python-modules/aioxmpp/default.nix | 98 ------------------- pkgs/top-level/python-aliases.nix | 2 + pkgs/top-level/python-packages.nix | 4 - 5 files changed, 2 insertions(+), 155 deletions(-) delete mode 100644 pkgs/development/python-modules/aiosasl/default.nix delete mode 100644 pkgs/development/python-modules/aioxmpp/default.nix diff --git a/pkgs/by-name/ur/urlwatch/package.nix b/pkgs/by-name/ur/urlwatch/package.nix index 662eb3ec4fe1..8e9a88908a66 100644 --- a/pkgs/by-name/ur/urlwatch/package.nix +++ b/pkgs/by-name/ur/urlwatch/package.nix @@ -19,7 +19,6 @@ python3Packages.buildPythonApplication (finalAttrs: { build-system = with python3Packages; [ setuptools ]; dependencies = with python3Packages; [ - aioxmpp beautifulsoup4 cssbeautifier cssselect diff --git a/pkgs/development/python-modules/aiosasl/default.nix b/pkgs/development/python-modules/aiosasl/default.nix deleted file mode 100644 index 95f5ed8e7470..000000000000 --- a/pkgs/development/python-modules/aiosasl/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - fetchpatch, - pyopenssl, - pytestCheckHook, - setuptools, -}: - -buildPythonPackage rec { - pname = "aiosasl"; - version = "0.5.0"; - pyproject = true; - - src = fetchFromGitHub { - owner = "horazont"; - repo = "aiosasl"; - tag = "v${version}"; - hash = "sha256-JIuNPb/l4QURMQc905H2iNGCfMz+zM/QJhDQOR8LPdc="; - }; - - patches = [ - (fetchpatch { - name = "python311-compat.patch"; - url = "https://github.com/horazont/aiosasl/commit/44c48d36b416bd635d970dba2607a31b2167ea1b.patch"; - hash = "sha256-u6PJKV54dU2MA9hXa/9hJ3eLVds1DuLHGbt8y/OakWs="; - }) - ]; - - postPatch = '' - # https://github.com/horazont/aiosasl/issues/28 - substituteInPlace tests/test_aiosasl.py \ - --replace-fail "assertRaisesRegexp" "assertRaisesRegex" - ''; - - build-system = [ setuptools ]; - - nativeCheckInputs = [ - pyopenssl - pytestCheckHook - ]; - - pythonImportsCheck = [ "aiosasl" ]; - - meta = { - description = "Asyncio SASL library"; - homepage = "https://github.com/horazont/aiosasl"; - license = lib.licenses.lgpl3Plus; - maintainers = with lib.maintainers; [ dotlambda ]; - }; -} diff --git a/pkgs/development/python-modules/aioxmpp/default.nix b/pkgs/development/python-modules/aioxmpp/default.nix deleted file mode 100644 index e0285de62caa..000000000000 --- a/pkgs/development/python-modules/aioxmpp/default.nix +++ /dev/null @@ -1,98 +0,0 @@ -{ - lib, - aioopenssl, - aiosasl, - babel, - buildPythonPackage, - dnspython, - fetchFromCodeberg, - lxml, - multidict, - pyasn1-modules, - pyasn1, - pyopenssl, - pytestCheckHook, - pythonAtLeast, - pytz, - setuptools, - sortedcollections, - tzlocal, -}: - -buildPythonPackage rec { - pname = "aioxmpp"; - version = "0.13.3"; - pyproject = true; - - src = fetchFromCodeberg { - owner = "jssfr"; - repo = "aioxmpp"; - tag = "v${version}"; - hash = "sha256-bQPKEM5eKhFI3Kx3U1espdxqjnG4yUgOXmYCrd98PDo="; - }; - - postPatch = '' - substituteInPlace tests/bookmarks/test_service.py \ - --replace-fail 'can only assign an iterable$' 'must assign iterable' - substituteInPlace tests/test_utils.py \ - --replace-fail 'property of .* has no' 'property .*of .* has no' - ''; - - pythonRelaxDeps = [ - "lxml" - ]; - - build-system = [ setuptools ]; - - dependencies = [ - aiosasl - aioopenssl - babel - dnspython - lxml - multidict - pyasn1 - pyasn1-modules - pyopenssl - pytz - sortedcollections - tzlocal - ]; - - pythonImportsCheck = [ - "aioxmpp" - "aioxmpp.node" - "aioxmpp.security_layer" - "aioxmpp.stanza" - "aioxmpp.stream" - ]; - - nativeCheckInputs = [ pytestCheckHook ]; - - disabledTestPaths = [ "benchmarks" ]; - - disabledTests = [ - # AttributeError: 'zoneinfo.ZoneInfo' object has no attribute 'normalize' - "test_convert_field_datetime_default_locale" - ] - ++ lib.optionals (pythonAtLeast "3.12") [ - # asyncio issues - "test_is_abstract" - "Testbackground" - "TestCapturingXSO" - "Testcheck_x509" - "TestClient" - "TestIntegerType" - "TestStanzaStream" - "TestStanzaToken" - "TestXMLStream" - ]; - - meta = { - description = "Pure-python XMPP library for asyncio"; - homepage = "https://codeberg.org/jssfr/aioxmpp"; - changelog = "https://codeberg.org/jssfr/aioxmpp/src/tag/${src.tag}/docs/api/changelog.rst"; - license = lib.licenses.lgpl3Plus; - maintainers = with lib.maintainers; [ dotlambda ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index bb7a0d656d72..09ee27d347d3 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -78,8 +78,10 @@ mapAliases { abjad = throw "'abjad' was removed due to lack of maintenance"; # Added 2026-03-24 abodepy = throw "'abodepy' has been renamed to/replaced by 'jaraco-abode'"; # Converted to throw 2025-10-29 aioinflux = throw "'aioinflux' was removed because it is abandonned upstream. For InfluxDB v2+ support, please use the official Python client library"; # Added 2026-01-15 + aiosasl = throw "'aiosasl' was removed because it is abandoned upstream and does not work on modern Python versions."; # Added 2026-06-28 aiosenz = throw "aiosenz was removed because Home Assistant switched to pysenz"; # added 2025-12-29 aioshutil = throw "'aioshutil' was removed because uiprotect no longer depends on it"; # added 2026-02-16 + aioxmpp = throw "'aioxmpp' was removed because it depends on aiosasl, which is abandoned and does not work on modern Python versions."; # Added 2026-06-28 amazon-kclpy = throw "amazon-kclpy has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-03 amazon_kclpy = throw "'amazon_kclpy' has been renamed to/replaced by 'amazon-kclpy'"; # Converted to throw 2025-10-29 amqplib = throw "amqplib has been removed as it was unmaintained upstream"; # Added 2025-11-22 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8f90a996d573..921aef1f726a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -516,8 +516,6 @@ self: super: with self; { aiorwlock = callPackage ../development/python-modules/aiorwlock { }; - aiosasl = callPackage ../development/python-modules/aiosasl { }; - aiosendspin = callPackage ../development/python-modules/aiosendspin { }; aiosendspin-mpris = callPackage ../development/python-modules/aiosendspin-mpris { }; @@ -600,8 +598,6 @@ self: super: with self; { aiowmi = callPackage ../development/python-modules/aiowmi { }; - aioxmpp = callPackage ../development/python-modules/aioxmpp { }; - aioymaps = callPackage ../development/python-modules/aioymaps { }; aiozeroconf = callPackage ../development/python-modules/aiozeroconf { }; From 8240c4665a8083eef1f75d2d6f29ffed313c627d Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 28 Jun 2026 15:10:01 +0300 Subject: [PATCH 6/9] python3Packages.aiohttp-jinja2: fix build with aiohttp 3.14 --- .../python-modules/aiohttp-jinja2/aiohttp-3.14.patch | 11 +++++++++++ .../python-modules/aiohttp-jinja2/default.nix | 5 +++++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/python-modules/aiohttp-jinja2/aiohttp-3.14.patch diff --git a/pkgs/development/python-modules/aiohttp-jinja2/aiohttp-3.14.patch b/pkgs/development/python-modules/aiohttp-jinja2/aiohttp-3.14.patch new file mode 100644 index 000000000000..7070f63fefb1 --- /dev/null +++ b/pkgs/development/python-modules/aiohttp-jinja2/aiohttp-3.14.patch @@ -0,0 +1,11 @@ +--- a/aiohttp_jinja2/__init__.py ++++ b/aiohttp_jinja2/__init__.py +@@ -38,7 +38,7 @@ + "APP_CONTEXT_PROCESSORS_KEY" + ) + APP_KEY: Final = web.AppKey[jinja2.Environment]("APP_KEY") +-REQUEST_CONTEXT_KEY: Final = "aiohttp_jinja2_context" ++REQUEST_CONTEXT_KEY: Final = web.RequestKey("jinja_context", dict) + + _T = TypeVar("_T") + _P = ParamSpec("_P") \ No newline at end of file diff --git a/pkgs/development/python-modules/aiohttp-jinja2/default.nix b/pkgs/development/python-modules/aiohttp-jinja2/default.nix index 9ccf48edc5e1..d917bc9eaced 100644 --- a/pkgs/development/python-modules/aiohttp-jinja2/default.nix +++ b/pkgs/development/python-modules/aiohttp-jinja2/default.nix @@ -20,6 +20,11 @@ buildPythonPackage rec { hash = "sha256-o6f/UmTlvKUuiuVHu/0HYbcklSMNQ40FtsCRW+YZsOI="; }; + patches = [ + # Adapted from https://github.com/aio-libs/aiohttp-jinja2/pull/1025 + ./aiohttp-3.14.patch + ]; + build-system = [ setuptools ]; dependencies = [ From db6a86467918a3cd155b8e0eedee144d628931ec Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 28 Jun 2026 15:10:13 +0300 Subject: [PATCH 7/9] tpm2-tss: don't test on 32-bit swtpm doesn't build on 32-bit targets so we can't run the tests. --- pkgs/development/libraries/tpm2-tss/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/tpm2-tss/default.nix b/pkgs/development/libraries/tpm2-tss/default.nix index b4bce91d0878..6bf372a5dd92 100644 --- a/pkgs/development/libraries/tpm2-tss/default.nix +++ b/pkgs/development/libraries/tpm2-tss/default.nix @@ -167,7 +167,9 @@ stdenv.mkDerivation (finalAttrs: { stdenv.buildPlatform.canExecute stdenv.hostPlatform && !stdenv.hostPlatform.isDarwin # Tests rely on mocking, which can't work with static libs. - && !stdenv.hostPlatform.isStatic; + && !stdenv.hostPlatform.isStatic + # swtpm does not build on 32-bit targets + && !stdenv.hostPlatform.is32bit; # Since we rewrote the load path in the dynamic loader for the TCTI # The various tcti implementation should be placed in their target directory # before we could run tests, so we make turn checkPhase into installCheckPhase From 87e2e48e4e3d3fc4057446c16a59af901e4c08bd Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 28 Jun 2026 15:12:21 +0300 Subject: [PATCH 8/9] lemmy-server: allow warnings Remember kids, don't -Werror in production. --- pkgs/servers/web-apps/lemmy/server.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/servers/web-apps/lemmy/server.nix b/pkgs/servers/web-apps/lemmy/server.nix index c3cb5c6444e1..1b6028b4f37e 100644 --- a/pkgs/servers/web-apps/lemmy/server.nix +++ b/pkgs/servers/web-apps/lemmy/server.nix @@ -49,6 +49,9 @@ rustPlatform.buildRustPackage rec { PROTOC = "${protobuf}/bin/protoc"; PROTOC_INCLUDE = "${protobuf}/include"; + + # #[deny(warnings)] trips on newer rustc + RUSTFLAGS = "--cap-lints warn"; }; nativeBuildInputs = [ protobuf From b9ec3822af779f9bb6df21b40fe7d12ca8e5bd64 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 28 Jun 2026 17:09:01 +0300 Subject: [PATCH 9/9] python3Packages.pandas: 3.0.3 -> 3.0.4 Fixes crash --- pkgs/development/python-modules/pandas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index e4b838dba6ba..a0519d35c2ab 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -63,7 +63,7 @@ let pandas = buildPythonPackage rec { pname = "pandas"; - version = "3.0.3"; + version = "3.0.4"; pyproject = true; src = fetchFromGitHub { @@ -73,7 +73,7 @@ let postFetch = '' sed -i 's/git_refnames = "[^"]*"/git_refnames = " (tag: ${src.tag})"/' $out/pandas/_version.py ''; - hash = "sha256-G+pWdmft/kcxv97ySa+0ZFEgvMKuNaK33DseZQ8R1z8="; + hash = "sha256-cPnvBVs5xXjbRoj6KU/KeNn+To9oue7H0OBaJ2JdJG4="; }; # A NOTE regarding the Numpy version relaxing: Both Numpy versions 1.x &