diff --git a/pkgs/tools/virtualization/mkosi/default.nix b/pkgs/tools/virtualization/mkosi/default.nix index 867428ef1a17..42705165bf61 100644 --- a/pkgs/tools/virtualization/mkosi/default.nix +++ b/pkgs/tools/virtualization/mkosi/default.nix @@ -1,8 +1,8 @@ { lib, + python3Packages, fetchFromGitHub, stdenv, - python, systemd, pandoc, kmod, @@ -16,13 +16,6 @@ replaceVars, udevCheckHook, - # Python packages - setuptools, - setuptools-scm, - wheel, - buildPythonApplication, - pytestCheckHook, - # Optional dependencies withQemu ? false, qemu, @@ -46,7 +39,7 @@ let withKernelInstall = true; }; - pythonWithPefile = python.withPackages (ps: [ ps.pefile ]); + pythonWithPefile = python3Packages.python.withPackages (ps: [ ps.pefile ]); deps = [ bash @@ -63,7 +56,7 @@ let qemu ]; in -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "mkosi"; version = "25.3-unstable-2025-04-01"; format = "pyproject"; @@ -106,9 +99,9 @@ buildPythonApplication rec { nativeBuildInputs = [ pandoc - setuptools - setuptools-scm - wheel + python3Packages.setuptools + python3Packages.setuptools-scm + python3Packages.wheel udevCheckHook ]; @@ -119,7 +112,7 @@ buildPythonApplication rec { ''; checkInputs = [ - pytestCheckHook + python3Packages.pytestCheckHook ]; postInstall = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f1f178de9235..4e87a8b4a789 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1102,7 +1102,7 @@ with pkgs; }; }; - mkosi = python3Packages.callPackage ../tools/virtualization/mkosi { inherit systemd; }; + mkosi = callPackage ../tools/virtualization/mkosi { }; mkosi-full = mkosi.override { withQemu = true; };