From 8549d2f23d94acf80d126649245c12521464cf8a Mon Sep 17 00:00:00 2001 From: awkawb Date: Wed, 1 Jan 2025 12:19:25 -0500 Subject: [PATCH] Makefile: build-vm now reflects the repo being a flake --- Makefile | 8 +++----- flake.lock | 12 ++++++------ 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 1a5f31b..6b5e760 100644 --- a/Makefile +++ b/Makefile @@ -34,14 +34,12 @@ clean: ## Clean build artifacts and shutdown running virtual machines exit 0 build-vm: clean ## Build virtual machine for testing - nixos-rebuild build-vm \ - -I nixpkgs=http://nixos.org/channels/nixos-24.05/nixexprs.tar.xz \ - -I nixos-config=./tests/test-config.nix + nix build ".#nixosConfigurations.test.config.system.build.vm" boot-vm: ## Run virtual machine in current terminal QEMU_KERNEL_PARAMS=console=ttyS0 \ QEMU_NET_OPTS=hostfwd=tcp::8080-:80 \ - ./result/bin/run-nixos-vm \ - -nographic; \ + QEMU_OPTS=-nographic \ + ./result/bin/run-nixos-vm reset diff --git a/flake.lock b/flake.lock index 97b2869..f4fc453 100644 --- a/flake.lock +++ b/flake.lock @@ -96,11 +96,11 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1735389339, - "narHash": "sha256-JfQXQL0MysQSfvbw7xHto9YbqZ1VQLFgus+c4KYt6xg=", + "lastModified": 1735586022, + "narHash": "sha256-17Wosqogo+6QMddJ8qo5C9NZug8QRuFO59KyTP/XfFw=", "owner": "NixOS", "repo": "nix", - "rev": "8a3fc27f1b63a08ac983ee46435a56cf49ebaf4a", + "rev": "61c3559116f0dccdd0c69cb35f411f2d6016c41a", "type": "github" }, "original": { @@ -158,11 +158,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1735264675, - "narHash": "sha256-MgdXpeX2GuJbtlBrH9EdsUeWl/yXEubyvxM1G+yO4Ak=", + "lastModified": 1735531152, + "narHash": "sha256-As8I+ebItDKtboWgDXYZSIjGlKeqiLBvjxsQHUmAf1Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d49da4c08359e3c39c4e27c74ac7ac9b70085966", + "rev": "3ffbbdbac0566a0977da3d2657b89cbcfe9a173b", "type": "github" }, "original": {