Commit 8353a681 authored by K900's avatar K900
Browse files

nixos-build-vms: move to pkgs/by-name

parent 1bf0ffb2
Loading
Loading
Loading
Loading
+1 −6
Original line number Diff line number Diff line
@@ -17,12 +17,7 @@ let
    '';
  });

  nixos-build-vms = makeProg {
    name = "nixos-build-vms";
    src = ./nixos-build-vms/nixos-build-vms.sh;
    inherit (pkgs) runtimeShell;
    manPage = ./manpages/nixos-build-vms.8;
  };
  inherit (pkgs) nixos-build-vms;

  nixos-install = makeProg {
    name = "nixos-install";
+3 −2
Original line number Diff line number Diff line
{ system ? builtins.currentSystem
, config ? {}
, nixpkgs
, networkExpr
}:

@@ -9,9 +10,9 @@ let
    imports = [ module ];
  }) (import networkExpr);

  pkgs = import ../../../../.. { inherit system config; };
  pkgs = import nixpkgs { inherit system config; };

  testing = import ../../../../lib/testing-python.nix {
  testing = import "${pkgs.path}/nixos/lib/testing-python.nix" {
    inherit system pkgs;
  };

+3 −2
Original line number Diff line number Diff line
@@ -49,5 +49,6 @@ then
fi

# Build a network of VMs
nix-build '<nixpkgs/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix>' \
    --argstr networkExpr "$networkExpr" "${nixBuildArgs[@]}"
nix-build @buildVms@ \
    --argstr networkExpr "$networkExpr" "${nixBuildArgs[@]}" \
    --arg nixpkgs "<nixpkgs>"
+22 −0
Original line number Diff line number Diff line
{
  substituteAll,
  runtimeShell,
  installShellFiles,
}:
substituteAll {
  name = "nixos-build-vms";
  src = ./nixos-build-vms.sh;
  inherit runtimeShell;
  buildVms = ./build-vms.nix;

  dir = "bin";
  isExecutable = true;

  nativeBuildInputs = [ installShellFiles ];

  postInstall = ''
    installManPage ${./nixos-build-vms.8}
  '';

  meta.mainProgram = "nixos-build-vms";
}