diff options
| author | rnhmjoj <rnhmjoj@inventati.org> | 2021-06-23 17:46:46 +0200 |
|---|---|---|
| committer | rnhmjoj <rnhmjoj@inventati.org> | 2021-09-18 16:58:16 +0200 |
| commit | b29c2f97c37f7cb4a1b3411ff9888a49873597d2 (patch) | |
| tree | 7352ff4d0310afcb03cb1be6ad15745c28d3cd5f /nixos/lib/testing-python.nix | |
| parent | b8bfc81d5b2d88b734a311f712fc0ba2b267f9e0 (diff) | |
| download | nixpkgs-b29c2f97c37f7cb4a1b3411ff9888a49873597d2.tar nixpkgs-b29c2f97c37f7cb4a1b3411ff9888a49873597d2.tar.gz nixpkgs-b29c2f97c37f7cb4a1b3411ff9888a49873597d2.tar.bz2 nixpkgs-b29c2f97c37f7cb4a1b3411ff9888a49873597d2.tar.lz nixpkgs-b29c2f97c37f7cb4a1b3411ff9888a49873597d2.tar.xz nixpkgs-b29c2f97c37f7cb4a1b3411ff9888a49873597d2.tar.zst nixpkgs-b29c2f97c37f7cb4a1b3411ff9888a49873597d2.zip | |
nixos/lib/qemu-flags: rename to qemu-common
The current name is misleading: it doesn't contain cli arguments, but several constants and utility functions related to qemu. This commit also removes the use of `with import ...` for clarity.
Diffstat (limited to 'nixos/lib/testing-python.nix')
| -rw-r--r-- | nixos/lib/testing-python.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/nixos/lib/testing-python.nix b/nixos/lib/testing-python.nix index 7c8c64211f1..a1c3624d149 100644 --- a/nixos/lib/testing-python.nix +++ b/nixos/lib/testing-python.nix @@ -217,7 +217,7 @@ rec { nodes = qemu_pkg: let build-vms = import ./build-vms.nix { - inherit system pkgs minimal specialArgs; + inherit system lib pkgs minimal specialArgs; extraConfigurations = extraConfigurations ++ [( { virtualisation.qemu.package = qemu_pkg; @@ -257,7 +257,6 @@ rec { inherit test driver driverInteractive nodes; }; - abortForFunction = functionName: abort ''The ${functionName} function was removed because it is not an essential part of the NixOS testing infrastructure. It had no usage in NixOS or Nixpkgs and it had no designated |