wfvm: clean up nix imports

This commit is contained in:
Sebastien Bourdeauducq 2020-06-14 17:06:03 +08:00
parent 446dbbfbf2
commit 996802257d
5 changed files with 6 additions and 9 deletions

View File

@ -1,5 +1,4 @@
{ pkgs { pkgs
, lib ? pkgs.lib
, fullName , fullName
, organization , organization
, administratorPassword , administratorPassword
@ -19,7 +18,7 @@
}: }:
let let
lib = pkgs.lib;
serviceCommands = lib.mapAttrsToList ( serviceCommands = lib.mapAttrsToList (
serviceName: attrs: "powershell Set-Service -Name ${serviceName} " + ( serviceName: attrs: "powershell Set-Service -Name ${serviceName} " + (
lib.concatStringsSep " " ( lib.concatStringsSep " " (

View File

@ -1,6 +1,4 @@
{ pkgs ? import <nixpkgs> {} { pkgs }:
, lib ? pkgs.lib
}:
pkgs.runCommandNoCC "win-bundle-installer.exe" {} '' pkgs.runCommandNoCC "win-bundle-installer.exe" {} ''
cp ${./main.go} main.go cp ${./main.go} main.go

View File

@ -1,4 +1,4 @@
{ pkgs ? import <nixpkgs> {} }: { pkgs }:
{ {
makeWindowsImage = attrs: import ./win.nix ({ inherit pkgs; } // attrs); makeWindowsImage = attrs: import ./win.nix ({ inherit pkgs; } // attrs);

View File

@ -1,4 +1,4 @@
{ pkgs ? import <nixpkgs> {}, impureMode ? false }: { pkgs ? import <nixpkgs> {}, impureMode ? false }:
let let
win = (import ./default.nix { inherit pkgs; }); win = (import ./default.nix { inherit pkgs; });

View File

@ -1,5 +1,4 @@
{ pkgs ? import <nixpkgs> {} { pkgs
, lib ? pkgs.lib
, diskImageSize ? "22G" , diskImageSize ? "22G"
, qemuMem ? "4G" , qemuMem ? "4G"
, windowsImage ? null , windowsImage ? null
@ -12,6 +11,7 @@
}@attrs: }@attrs:
let let
lib = pkgs.lib;
# qemu_test is a smaller closure only building for a single system arch # qemu_test is a smaller closure only building for a single system arch
qemu = pkgs.qemu_test; qemu = pkgs.qemu_test;
libguestfs = pkgs.libguestfs-with-appliance; libguestfs = pkgs.libguestfs-with-appliance;