From 4cf92787c80aa627979ccc89047f2146d2a2704c Mon Sep 17 00:00:00 2001 From: Jack O'Sullivan Date: Sat, 7 Jan 2023 18:12:38 +0000 Subject: [PATCH 1/5] maintainers: add devplayer0 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 64db85e00369..42e28419b5c2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4657,6 +4657,12 @@ githubId = 30475873; name = "Andrei Hava"; }; + devplayer0 = { + email = "dev@nul.ie"; + github = "devplayer0"; + githubId = 1427254; + name = "Jack O'Sullivan"; + }; devusb = { email = "mhelton@devusb.us"; github = "devusb"; From 6cc7f7b9b1a1739ab964443386e9cca1ab79052f Mon Sep 17 00:00:00 2001 From: Jack O'Sullivan Date: Sat, 7 May 2022 18:35:39 +0100 Subject: [PATCH 2/5] python3Packages.qemu: init at 0.6.1.0a1 --- .../python-modules/qemu/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/qemu/default.nix diff --git a/pkgs/development/python-modules/qemu/default.nix b/pkgs/development/python-modules/qemu/default.nix new file mode 100644 index 000000000000..3c9c4bfafec2 --- /dev/null +++ b/pkgs/development/python-modules/qemu/default.nix @@ -0,0 +1,36 @@ +{ lib +, pkgs +, buildPythonPackage +, pythonOlder +, fuseSupport ? false, fusepy +, tuiSupport ? false, urwid, urwid-readline, pygments +}: + +buildPythonPackage rec { + pname = "qemu"; + version = "0.6.1.0a1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = pkgs.qemu.src; + prePatch = '' + cd python + ''; + + propagatedBuildInputs = [ ] + ++ lib.optionals fuseSupport [ fusepy ] + ++ lib.optionals tuiSupport [ urwid urwid-readline pygments ]; + + # Project requires avocado-framework for testing + doCheck = false; + + pythonImportsCheck = [ "qemu" ]; + + meta = with lib; { + homepage = "http://www.qemu.org/"; + description = "Python tooling used by the QEMU project to build, configure, and test QEMU"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ devplayer0 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c46adcf249fd..36c731a4bca9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12280,6 +12280,8 @@ self: super: with self; { qgrid = callPackage ../development/python-modules/qgrid { }; + qemu = callPackage ../development/python-modules/qemu { }; + qiling = callPackage ../development/python-modules/qiling { }; qimage2ndarray = callPackage ../development/python-modules/qimage2ndarray { }; From ddbfc50d8f539cbaeb5222e151168ba5d4681548 Mon Sep 17 00:00:00 2001 From: DavHau Date: Fri, 2 Feb 2024 14:11:03 +0700 Subject: [PATCH 3/5] python3Packages.qemu: add maintainer davhau --- pkgs/development/python-modules/qemu/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/qemu/default.nix b/pkgs/development/python-modules/qemu/default.nix index 3c9c4bfafec2..41482df0c398 100644 --- a/pkgs/development/python-modules/qemu/default.nix +++ b/pkgs/development/python-modules/qemu/default.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { homepage = "http://www.qemu.org/"; description = "Python tooling used by the QEMU project to build, configure, and test QEMU"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ devplayer0 ]; + maintainers = with maintainers; [ devplayer0 davhau ]; }; } From 9c4a65790a0001872ccf6787471818a9fe5c72a3 Mon Sep 17 00:00:00 2001 From: DavHau Date: Fri, 2 Feb 2024 15:35:19 +0700 Subject: [PATCH 4/5] qemu-python-utils: init at "0.6.1.0a1" --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e2cdc3a51cec..6e815cfc8904 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34760,6 +34760,8 @@ with pkgs; inherit (darwin) sigtool; }; + qemu-python-utils = python3Packages.toPythonApplication python3Packages.qemu; + qemu-utils = qemu.override { toolsOnly = true; }; From 11749a4e25e609832eaad35da94a0467469627d1 Mon Sep 17 00:00:00 2001 From: DavHau Date: Fri, 2 Feb 2024 15:36:08 +0700 Subject: [PATCH 5/5] python3Packages.qemu: fix shadowed qemu; improve expression - fix all shadowed references of qemu in python-packages.nix - migrate to pyproject = true - add a check to ensure that the version attribute is up to date - implement check phase testing all executables - enable tui and fuse support by default for the application only - if fuse/tui disabled, ensure that corresponding executables are not exported --- .../python-modules/qemu/default.nix | 39 ++++++++++++++++--- pkgs/top-level/all-packages.nix | 7 +++- pkgs/top-level/python-packages.nix | 12 ++++-- 3 files changed, 48 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/qemu/default.nix b/pkgs/development/python-modules/qemu/default.nix index 41482df0c398..ba730548bca8 100644 --- a/pkgs/development/python-modules/qemu/default.nix +++ b/pkgs/development/python-modules/qemu/default.nix @@ -1,32 +1,59 @@ { lib -, pkgs , buildPythonPackage , pythonOlder +, qemu +, setuptools , fuseSupport ? false, fusepy , tuiSupport ? false, urwid, urwid-readline, pygments }: -buildPythonPackage rec { +buildPythonPackage { pname = "qemu"; version = "0.6.1.0a1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.6"; - src = pkgs.qemu.src; + src = qemu.src; + prePatch = '' cd python ''; + # ensure the version matches qemu-xxx/python/VERSION + preConfigure = '' + if [ "$version" != "$(cat ./VERSION)" ]; then + echo "The nix package version attribute is not in sync with the QEMU source version" > /dev/stderr + echo "Please update the version attribute in the nix expression of python3Packages.qemu to '$version'" > /dev/stderr + exit 1 + fi + ''; + + buildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ ] ++ lib.optionals fuseSupport [ fusepy ] ++ lib.optionals tuiSupport [ urwid urwid-readline pygments ]; - # Project requires avocado-framework for testing - doCheck = false; + # Project requires avocado-framework for testing, therefore replacing check phase + checkPhase = '' + for bin in $out/bin/*; do + $bin --help + done + ''; pythonImportsCheck = [ "qemu" ]; + preFixup = + (lib.optionalString (! tuiSupport) '' + rm $out/bin/qmp-tui + '') + + (lib.optionalString (! fuseSupport) '' + rm $out/bin/qom-fuse + ''); + meta = with lib; { homepage = "http://www.qemu.org/"; description = "Python tooling used by the QEMU project to build, configure, and test QEMU"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e815cfc8904..64747f415b8f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34760,7 +34760,12 @@ with pkgs; inherit (darwin) sigtool; }; - qemu-python-utils = python3Packages.toPythonApplication python3Packages.qemu; + qemu-python-utils = python3Packages.toPythonApplication ( + python3Packages.qemu.override { + fuseSupport = true; + tuiSupport = true; + } + ); qemu-utils = qemu.override { toolsOnly = true; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 36c731a4bca9..d39b8ccd751f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2389,7 +2389,9 @@ self: super: with self; { cose = callPackage ../development/python-modules/cose { }; - cot = callPackage ../development/python-modules/cot { }; + cot = callPackage ../development/python-modules/cot { + qemu = pkgs.qemu; + }; cov-core = callPackage ../development/python-modules/cov-core { }; @@ -5008,7 +5010,9 @@ self: super: with self; { guessit = callPackage ../development/python-modules/guessit { }; - guestfs = callPackage ../development/python-modules/guestfs { }; + guestfs = callPackage ../development/python-modules/guestfs { + qemu = pkgs.qemu; + }; gudhi = callPackage ../development/python-modules/gudhi { }; @@ -12280,7 +12284,9 @@ self: super: with self; { qgrid = callPackage ../development/python-modules/qgrid { }; - qemu = callPackage ../development/python-modules/qemu { }; + qemu = callPackage ../development/python-modules/qemu { + qemu = pkgs.qemu; + }; qiling = callPackage ../development/python-modules/qiling { };