kiara/Fediversity
1
0
Fork 0
forked from Fediversity/Fediversity
Code Pull requests Activity

simplify inputDerivations

Browse source
This commit is contained in:
Kiara Grouwstra 2025-08-25 00:21:54 +02:00
parent c900b7a9c5
commit d51943af42
Signed by: kiara
SSH key fingerprint: SHA256:COspvLoLJ5WC5rFb9ZDe5urVCkK4LJZOsjfF4duRJFU
2 changed files with 5 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
deployment/check/common/deployerNode.nix
View file

@ -96,35 +96,7 @@ in
machine.system.build.vm.inputDerivation machine.system.build.vm.inputDerivation
machine.system.build.bootStage1.inputDerivation machine.system.build.bootStage1.inputDerivation
machine.system.build.bootStage2.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 ( ++ concatLists (
lib.mapAttrsToList ( lib.mapAttrsToList (
_k: v: if v ? source.inputDerivation then [ v.source.inputDerivation ] else [ ] _k: v: if v ? source.inputDerivation then [ v.source.inputDerivation ] else [ ]

5
deployment/check/data-model/nixosTest.nix
View file

@ -31,6 +31,11 @@ in
system.extraDependencies = with pkgs; [ system.extraDependencies = with pkgs; [
jq jq
jq.inputDerivation jq.inputDerivation
automake.inputDerivation
autoconf.inputDerivation
bash.inputDerivation
binutils.inputDerivation
bison.inputDerivation
]; ];
system.extraDependenciesFromModule = system.extraDependenciesFromModule =