Qyriad/dynix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

little more cleanup

Browse source
This commit is contained in:
Qyriad 2026-02-13 17:19:54 +01:00
parent 15641360ca
commit 4268754afb
2 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tests/default.nix
View file

@ -28,7 +28,9 @@
*/ */
imports = (import "${modulesPath}/module-list.nix") ++ [ imports = (import "${modulesPath}/module-list.nix") ++ [
# For the VM node, but not the in-VM configuration.nix
./module-allow-rebuild-in-vm.nix ./module-allow-rebuild-in-vm.nix
# For the VM node, and the in-VM configuration.nix
./dynix-vm-configuration.nix ./dynix-vm-configuration.nix
(toString dynix) (toString dynix)
]; ];
@ -37,12 +39,12 @@
enable = true; enable = true;
serviceConfig.Type = "oneshot"; serviceConfig.Type = "oneshot";
serviceConfig.RemainAfterExit = true; serviceConfig.RemainAfterExit = true;
serviceConfig.RequisteOf = [ "multi-user.target" ];
path = [ config.system.path ]; path = [ config.system.path ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
serviceConfig.requisteOf = [ "multi-user.target" ];
after = [ "default.target" ]; after = [ "default.target" ];
script = '' script = ''
nix profile install -vv "${dynix.modules}" nix profile install -vv "${dynix.modules}" # "
mkdir -vp /etc/nixos mkdir -vp /etc/nixos
nixos-generate-config nixos-generate-config

15
tests/mk-test-configuration-dot-nix.nix
View file

@ -6,6 +6,9 @@
mkDynixConfigurationDotNix = finalAttrs: { mkDynixConfigurationDotNix = finalAttrs: {
name, name,
/** A *path* to a `configuration.nix`-like NixOS module.
* NOT a NixOS module *value*.
*/
configuration, configuration,
}: assert lib.isStringLike configuration; let }: assert lib.isStringLike configuration; let
self = finalAttrs.finalPackage; self = finalAttrs.finalPackage;
@ -17,18 +20,17 @@
phases = [ "installPhase" ]; phases = [ "installPhase" ];
#outputs = [ "out" "modules" ];
outputs = [ "out" ]; outputs = [ "out" ];
modulesOut = "${placeholder "out"}/share/nixos"; modulesOut = "${placeholder "out"}/share/nixos";
#modulesOut = "${placeholder "modules"}/share/nixos/modules";
baseConfiguration = configuration; baseConfiguration = configuration;
dynixVmConfiguration = ./dynix-vm-configuration.nix;
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall
install -Dm a=r "$baseConfiguration" "$modulesOut/test-configuration.nix" install -Dm a=r "$baseConfiguration" "$modulesOut/test-configuration.nix"
install -Dm a=r "${./dynix-vm-configuration.nix}" "$modulesOut/dynix-vm-configuration.nix" install -Dm a=r "$dynixVmConfiguration" "$modulesOut/dynix-vm-configuration.nix"
echo "/** GENERATED BY mk-test-configuration-dot-nix! */" >> "$modulesOut/configuration.nix" echo "/** GENERATED BY mk-test-configuration-dot-nix! */" >> "$modulesOut/configuration.nix"
echo "{ ... }:" >> "$modulesOut/configuration.nix" echo "{ ... }:" >> "$modulesOut/configuration.nix"
@ -42,9 +44,6 @@
echo " ];" >> "$modulesOut/configuration.nix" echo " ];" >> "$modulesOut/configuration.nix"
echo "}" >> "$modulesOut/configuration.nix" echo "}" >> "$modulesOut/configuration.nix"
#mkdir -p "$out"
#cp -r --reflink=auto "$modulesOut/"* "$out/"
runHook postInstall runHook postInstall
''; '';
@ -52,10 +51,6 @@
modulesPath = self.out + "/share/nixos"; modulesPath = self.out + "/share/nixos";
configuration = self.out + "/share/nixos/configuration.nix"; configuration = self.out + "/share/nixos/configuration.nix";
}; };
meta = {
#outputsToInstall = [ "modules" ];
};
}; };
in lib.extendMkDerivation { in lib.extendMkDerivation {
constructDrv = stdenv.mkDerivation; constructDrv = stdenv.mkDerivation;