From f90ee627a3733a6e1ef760a0a4ced5442478f141 Mon Sep 17 00:00:00 2001
From: Kiara Grouwstra <kiara@procolix.eu>
Date: Mon, 25 Aug 2025 00:21:54 +0200
Subject: [PATCH] simplify inputDerivations

---
 deployment/check/common/deployerNode.nix  | 28 -----------------------
 deployment/check/data-model/nixosTest.nix |  5 ++++
 2 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/deployment/check/common/deployerNode.nix b/deployment/check/common/deployerNode.nix
index 694a9eee..dcb5deef 100644
--- a/deployment/check/common/deployerNode.nix
+++ b/deployment/check/common/deployerNode.nix
@@ -96,35 +96,7 @@ in
           machine.system.build.vm.inputDerivation
           machine.system.build.bootStage1.inputDerivation
           machine.system.build.bootStage2.inputDerivation
-          pkgs.automake.inputDerivation
-          pkgs.autoconf.inputDerivation
-          pkgs.bash.inputDerivation
-          pkgs.binutils.inputDerivation
-          pkgs.bison.inputDerivation
         ]
-        ++ concatLists (
-          lib.lists.map (
-            pkg:
-            if
-              pkg ? inputDerivation
-              # error: output '/nix/store/dki9d3vldafg9ydrfm7x0g0rr0qljk98-sudo-1.9.16p2' is not allowed to refer to the following paths:
-              #          /nix/store/2xdmps65ryklmbf025bm4pxv16gb8ajv-sudo-1.9.16p2.tar.gz
-              #          /nix/store/58br4vk3q5akf4g8lx0pqzfhn47k3j8d-bash-5.2p37
-              #          /nix/store/8v6k283dpbc0qkdq81nb6mrxrgcb10i1-gcc-wrapper-14-20241116
-              #          /nix/store/9r1nl9ksiyszy4qzzg6y2gcdkca0xmhy-stdenv-linux
-              #          /nix/store/a4rmp6in7igbl1wbz9pli5nq0wiclq0y-groff-1.23.0
-              #          /nix/store/dki9d3vldafg9ydrfm7x0g0rr0qljk98-sudo-1.9.16p2
-              #          /nix/store/f5y58qz2fzpzgkhp0nizixi10x04ppyy-linux-pam-1.6.1
-              #          /nix/store/shkw4qm9qcw5sc5n1k5jznc83ny02r39-default-builder.sh
-              #          /nix/store/vj1c3wf9c11a0qs6p3ymfvrnsdgsdcbq-source-stdenv.sh
-              #          /nix/store/yh6qg1nsi5h2xblcr67030pz58fsaxx3-coreutils-9.6
-              && !(lib.strings.hasInfix "sudo" (builtins.toString pkg))
-            then
-              [ pkg.inputDerivation ]
-            else
-              [ ]
-          ) machine.environment.systemPackages
-        )
         ++ concatLists (
           lib.mapAttrsToList (
             _k: v: if v ? source.inputDerivation then [ v.source.inputDerivation ] else [ ]
diff --git a/deployment/check/data-model/nixosTest.nix b/deployment/check/data-model/nixosTest.nix
index e9f57e2d..6f4dd3cf 100644
--- a/deployment/check/data-model/nixosTest.nix
+++ b/deployment/check/data-model/nixosTest.nix
@@ -31,6 +31,11 @@ in
       system.extraDependencies = with pkgs; [
         jq
         jq.inputDerivation
+        automake.inputDerivation
+        autoconf.inputDerivation
+        bash.inputDerivation
+        binutils.inputDerivation
+        bison.inputDerivation
       ];
 
       system.extraDependenciesFromModule =