From 82fe56d5fa19f42fda726fc2b5dbf830a6285c4e Mon Sep 17 00:00:00 2001 From: Timothy DeHerrera Date: Fri, 26 Mar 2021 18:18:16 -0600 Subject: [PATCH] tests: remove nixpkgs patch Should have been removed in 436fbb08e8c70dec921953ba15c340680a314a62 --- ...-testing-Add-support-for-specialArgs.patch | 61 ------------------- 1 file changed, 61 deletions(-) delete mode 100644 tests/0004-nixos-testing-Add-support-for-specialArgs.patch diff --git a/tests/0004-nixos-testing-Add-support-for-specialArgs.patch b/tests/0004-nixos-testing-Add-support-for-specialArgs.patch deleted file mode 100644 index fb2155c7..00000000 --- a/tests/0004-nixos-testing-Add-support-for-specialArgs.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 9f33ab62d99c98e3f5bddd64532f15f482cf01b2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Janne=20He=C3=9F?= -Date: Tue, 2 Jun 2020 16:27:07 +0200 -Subject: [PATCH 04/22] nixos/testing: Add support for specialArgs - -Since using flakes disallows the usage of (which I use in -some tests), this adds an alternative. By setting specialArgs, all VMs -can get the `unstable` flake input as an arg. This is not possible with -extraConfigurations, as that would lead to infinite recursions. ---- - nixos/lib/build-vms.nix | 8 +++++--- - nixos/lib/testing-python.nix | 4 +++- - 2 files changed, 8 insertions(+), 4 deletions(-) - -diff --git a/nixos/lib/build-vms.nix b/nixos/lib/build-vms.nix -index 1bad63b9194..b1575fc13bb 100644 ---- a/nixos/lib/build-vms.nix -+++ b/nixos/lib/build-vms.nix -@@ -3,8 +3,10 @@ - minimal ? false - , # Ignored - config ? null -- # Nixpkgs, for qemu, lib and more --, pkgs -+, # Nixpkgs, for qemu, lib and more -+ pkgs -+, # !!! See comment about args in lib/modules.nix -+ specialArgs ? {} - , # NixOS configuration to add to the VMs - extraConfigurations ? [] - }: -@@ -31,7 +33,7 @@ rec { - nodes: configurations: - - import ./eval-config.nix { -- inherit system; -+ inherit system specialArgs; - modules = configurations ++ extraConfigurations; - baseModules = (import ../modules/module-list.nix) ++ - [ ../modules/virtualisation/qemu-vm.nix -diff --git a/nixos/lib/testing-python.nix b/nixos/lib/testing-python.nix -index 76a2022082c..498f97336c0 100644 ---- a/nixos/lib/testing-python.nix -+++ b/nixos/lib/testing-python.nix -@@ -4,10 +4,12 @@ - , minimal ? false - # Ignored - , config ? {} -+ # !!! See comment about args in lib/modules.nix -+, specialArgs ? {} - # Modules to add to each VM - , extraConfigurations ? [] }: - --with import ./build-vms.nix { inherit system pkgs minimal extraConfigurations; }; -+with import ./build-vms.nix { inherit system pkgs minimal specialArgs extraConfigurations; }; - with pkgs; - - rec { --- -2.29.2 -