diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2023-09-03 22:02:54 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-03 22:02:54 -0500 |
| commit | 4f2c2764977018ec1a65ad78511aafaa8df135b6 (patch) | |
| tree | 88df3082a6ce042f3712227c4f48f1507208b99b /nixos/release.nix | |
| parent | 12aaefa78d85ac6a3de62e5ac51a4e2d834e5ae5 (diff) | |
| parent | efd1605be6a14d0c169d20b6cbea191b0aa7eb99 (diff) | |
| download | nixpkgs-4f2c2764977018ec1a65ad78511aafaa8df135b6.tar nixpkgs-4f2c2764977018ec1a65ad78511aafaa8df135b6.tar.gz nixpkgs-4f2c2764977018ec1a65ad78511aafaa8df135b6.tar.bz2 nixpkgs-4f2c2764977018ec1a65ad78511aafaa8df135b6.tar.lz nixpkgs-4f2c2764977018ec1a65ad78511aafaa8df135b6.tar.xz nixpkgs-4f2c2764977018ec1a65ad78511aafaa8df135b6.tar.zst nixpkgs-4f2c2764977018ec1a65ad78511aafaa8df135b6.zip | |
Merge pull request #244093 from adamcstephens/lxd/vm
lxd: Add VM image and server support for QEMU VMs
Diffstat (limited to 'nixos/release.nix')
| -rw-r--r-- | nixos/release.nix | 40 |
1 files changed, 36 insertions, 4 deletions
diff --git a/nixos/release.nix b/nixos/release.nix index 377e5700e0d..abaa7ef9a71 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -313,7 +313,7 @@ in rec { ); # An image that can be imported into lxd and used for container creation - lxdImage = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system: + lxdContainerImage = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system: with import ./.. { inherit system; }; @@ -322,14 +322,14 @@ in rec { modules = [ configuration versionModule - ./maintainers/scripts/lxd/lxd-image.nix + ./maintainers/scripts/lxd/lxd-container-image.nix ]; }).config.system.build.tarball) ); # Metadata for the lxd image - lxdMeta = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system: + lxdContainerMeta = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system: with import ./.. { inherit system; }; @@ -338,7 +338,39 @@ in rec { modules = [ configuration versionModule - ./maintainers/scripts/lxd/lxd-image.nix + ./maintainers/scripts/lxd/lxd-container-image.nix + ]; + }).config.system.build.metadata) + + ); + + # An image that can be imported into lxd and used for container creation + lxdVirtualMachineImage = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system: + + with import ./.. { inherit system; }; + + hydraJob ((import lib/eval-config.nix { + inherit system; + modules = + [ configuration + versionModule + ./maintainers/scripts/lxd/lxd-virtual-machine-image.nix + ]; + }).config.system.build.qemuImage) + + ); + + # Metadata for the lxd image + lxdVirtualMachineImageMeta = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system: + + with import ./.. { inherit system; }; + + hydraJob ((import lib/eval-config.nix { + inherit system; + modules = + [ configuration + versionModule + ./maintainers/scripts/lxd/lxd-virtual-machine-image.nix ]; }).config.system.build.metadata) |