forked from M-Labs/nix-scripts
wfvm: clean up nix imports
This commit is contained in:
parent
446dbbfbf2
commit
996802257d
|
@ -1,5 +1,4 @@
|
|||
{ pkgs
|
||||
, lib ? pkgs.lib
|
||||
, fullName
|
||||
, organization
|
||||
, administratorPassword
|
||||
|
@ -19,7 +18,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
|
||||
lib = pkgs.lib;
|
||||
serviceCommands = lib.mapAttrsToList (
|
||||
serviceName: attrs: "powershell Set-Service -Name ${serviceName} " + (
|
||||
lib.concatStringsSep " " (
|
||||
|
|
|
@ -1,6 +1,4 @@
|
|||
{ pkgs ? import <nixpkgs> {}
|
||||
, lib ? pkgs.lib
|
||||
}:
|
||||
{ pkgs }:
|
||||
|
||||
pkgs.runCommandNoCC "win-bundle-installer.exe" {} ''
|
||||
cp ${./main.go} main.go
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ pkgs ? import <nixpkgs> {} }:
|
||||
{ pkgs }:
|
||||
|
||||
{
|
||||
makeWindowsImage = attrs: import ./win.nix ({ inherit pkgs; } // attrs);
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ pkgs ? import <nixpkgs> {}, impureMode ? false }:
|
||||
{ pkgs ? import <nixpkgs> {}, impureMode ? false }:
|
||||
|
||||
let
|
||||
win = (import ./default.nix { inherit pkgs; });
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
{ pkgs ? import <nixpkgs> {}
|
||||
, lib ? pkgs.lib
|
||||
{ pkgs
|
||||
, diskImageSize ? "22G"
|
||||
, qemuMem ? "4G"
|
||||
, windowsImage ? null
|
||||
|
@ -12,6 +11,7 @@
|
|||
}@attrs:
|
||||
|
||||
let
|
||||
lib = pkgs.lib;
|
||||
# qemu_test is a smaller closure only building for a single system arch
|
||||
qemu = pkgs.qemu_test;
|
||||
libguestfs = pkgs.libguestfs-with-appliance;
|
||||
|
|
Loading…
Reference in New Issue