Skip to content

aliases: fix the warnings from nixpkgs change #426

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 3, 2025
Merged

aliases: fix the warnings from nixpkgs change #426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
name = builtins.replaceStrings [ "${system}-" ] [ "" ] systemName;
inherit (nixos.config.microvm) hypervisor;
in
if nixos.pkgs.system == nixpkgs.lib.replaceString "-darwin" "-linux" system
if nixos.pkgs.stdenv.hostPlatform.system == nixpkgs.lib.replaceString "-darwin" "-linux" system
then result // {
"${name}" = nixos.config.microvm.runner.${hypervisor};
}
Expand Down
6 changes: 3 additions & 3 deletions lib/runners/cloud-hypervisor.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ let
kernelPath = {
x86_64-linux = "${kernel.dev}/vmlinux";
aarch64-linux = "${kernel.out}/${pkgs.stdenv.hostPlatform.linux-kernel.target}";
}.${pkgs.stdenv.system};
}.${pkgs.stdenv.hostPlatform.system};

kernelConsoleDefault =
if pkgs.stdenv.system == "x86_64-linux"
if pkgs.stdenv.hostPlatform.system == "x86_64-linux"
then "earlyprintk=ttyS0 console=ttyS0"
else if pkgs.stdenv.system == "aarch64-linux"
else if pkgs.stdenv.hostPlatform.system == "aarch64-linux"
then "console=ttyAMA0"
else "";

Expand Down
2 changes: 1 addition & 1 deletion lib/runners/crosvm.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

let
inherit (pkgs) lib;
inherit (pkgs.stdenv) system;
inherit (pkgs.stdenv.hostPlatform) system;
inherit (microvmConfig)
vcpu mem balloon initialBalloonMem hotplugMem hotpluggedMem user volumes shares
socket devices vsock graphics credentialFiles
Expand Down
3 changes: 2 additions & 1 deletion lib/runners/firecracker.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
}:

let
inherit (pkgs) lib system;
inherit (pkgs) lib;
inherit (pkgs.stdenv.hostPlatform) system;
inherit (microvmConfig)
hostName user socket preStart
vcpu mem balloon initialBalloonMem hotplugMem hotpluggedMem
Expand Down
2 changes: 1 addition & 1 deletion lib/runners/qemu.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

let
inherit (pkgs) lib;
inherit (pkgs.stdenv) system;
inherit (pkgs.stdenv.hostPlatform) system;
inherit (microvmConfig) vmHostPackages;

enableLibusb = pkg: pkg.overrideAttrs (oa: {
Expand Down
3 changes: 2 additions & 1 deletion lib/runners/stratovirt.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
}:

let
inherit (pkgs) lib system;
inherit (pkgs) lib;
inherit (pkgs.stdenv.hostPlatform) system;

inherit (microvmConfig)
hostName
Expand Down
4 changes: 2 additions & 2 deletions nixos-modules/microvm/options.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -730,12 +730,12 @@ in

config = lib.mkMerge [ {
microvm.qemu.machine =
lib.mkIf (pkgs.stdenv.system == "x86_64-linux") (
lib.mkIf (pkgs.stdenv.hostPlatform.system == "x86_64-linux") (
lib.mkDefault "microvm"
);
} {
microvm.qemu.machine =
lib.mkIf (pkgs.stdenv.system == "aarch64-linux") (
lib.mkIf (pkgs.stdenv.hostPlatform.system == "aarch64-linux") (
lib.mkDefault "virt"
);
} ];
Expand Down