M-Labs
/
wfvm
8
0
Fork 5
Code Issues 4 Pull Requests 2 Releases Wiki Activity

downgrade nixpkgs, cleanup

This commit is contained in:
mwojcik 2022-02-21 16:53:52 +08:00
parent 2dc90870b8
commit dc36fd61d2
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
flake.lock
View File

@ -2,17 +2,17 @@
"nodes": { "nodes": {
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1645010845, "lastModified": 1593034146,
"narHash": "sha256-hO9X4PvxkSLMQnGGB7tOrKPwufhLMiNQMNXNwzLqneo=", "narHash": "sha256-EypP7RyPq5Yv05VgsQoIkdn26KJUIgQCItHgVY1MMQE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2128d0aa28edef51fd8fef38b132ffc0155595df", "rev": "f8248ab6d9e69ea9c07950d73d48807ec595e923",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-21.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f8248ab6d9e69ea9c07950d73d48807ec595e923",
"type": "github" "type": "github"
} }
}, },

5
flake.nix
View File

@ -1,6 +1,6 @@
{ {
description = "A Nix library to create and manage virtual machines running Windows."; description = "A Nix library to create and manage virtual machines running Windows.";
inputs.nixpkgs.url = github:NixOS/nixpkgs/nixos-21.11; inputs.nixpkgs.url = github:NixOS/nixpkgs/f8248ab6d9e69ea9c07950d73d48807ec595e923;
outputs = { self, nixpkgs }: outputs = { self, nixpkgs }:
let let
pkgs = import nixpkgs { system = "x86_64-linux"; }; pkgs = import nixpkgs { system = "x86_64-linux"; };
@ -10,8 +10,6 @@
# layers # layers
layers = (import wfvm/layers { inherit pkgs; }); # end of layers layers = (import wfvm/layers { inherit pkgs; }); # end of layers
# ============
# bundle # bundle
bundleInstaller = pkgs.runCommandNoCC "win-bundle-installer.exe" {} '' bundleInstaller = pkgs.runCommandNoCC "win-bundle-installer.exe" {} ''
mkdir bundle mkdir bundle
@ -21,7 +19,6 @@
env HOME=$(mktemp -d) GOOS=windows GOARCH=amd64 ${pkgs.go}/bin/go build env HOME=$(mktemp -d) GOOS=windows GOARCH=amd64 ${pkgs.go}/bin/go build
mv bundle.exe $out mv bundle.exe $out
''; '';
# /bundle ===========
# makeWindowsImage # makeWindowsImage
makeWindowsImage = attrs: ( import wfvm/win.nix { inherit pkgs bundleInstaller; } // attrs ); makeWindowsImage = attrs: ( import wfvm/win.nix { inherit pkgs bundleInstaller; } // attrs );