From 54f1d62c3403c770c286bed8c234aa9440b8fbf1 Mon Sep 17 00:00:00 2001 From: Lein Matsumaru Date: Sat, 6 Jun 2026 13:55:46 +0000 Subject: [PATCH] python3Packages.qemu,qemu-python-utils: fix build tuiSupport for qemu is dropped https://github.com/qemu/qemu/commit/e1e49b35b3c3cf6b7c68b6b1df18a477ac3183e5 --- .../python-modules/qemu/default.nix | 29 ++++++------------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 9 insertions(+), 21 deletions(-) diff --git a/pkgs/development/python-modules/qemu/default.nix b/pkgs/development/python-modules/qemu/default.nix index bf3901980fc4..0b05055b31e6 100644 --- a/pkgs/development/python-modules/qemu/default.nix +++ b/pkgs/development/python-modules/qemu/default.nix @@ -5,10 +5,7 @@ setuptools, fuseSupport ? false, fusepy, - tuiSupport ? false, - urwid, - urwid-readline, - pygments, + qemu-qmp, }: buildPythonPackage { @@ -31,18 +28,12 @@ buildPythonPackage { fi ''; - buildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = - [ ] - ++ lib.optionals fuseSupport [ fusepy ] - ++ lib.optionals tuiSupport [ - urwid - urwid-readline - pygments - ]; + dependencies = [ qemu-qmp ] ++ lib.optionals fuseSupport [ fusepy ]; - # Project requires avocado-framework for testing, therefore replacing check phase + # Project now uses pytest instead of avocado-framework for testing but does not perform functional testing. + # let's keep it this way. checkPhase = '' for bin in $out/bin/*; do $bin --help @@ -51,13 +42,11 @@ buildPythonPackage { pythonImportsCheck = [ "qemu" ]; - preFixup = - (lib.optionalString (!tuiSupport) '' - rm $out/bin/qmp-tui - '') - + (lib.optionalString (!fuseSupport) '' + preFixup = ( + lib.optionalString (!fuseSupport) '' rm $out/bin/qom-fuse - ''); + '' + ); meta = { homepage = "https://www.qemu.org/"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a880fea0db60..71f041171a7d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9656,7 +9656,6 @@ with pkgs; qemu-python-utils = python3Packages.toPythonApplication ( python3Packages.qemu.override { fuseSupport = true; - tuiSupport = true; } );