From e9f015480c0573736cc87b5a90588a0b92a507d3 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Thu, 3 Feb 2022 09:57:01 -0500 Subject: openstack-image: make it easy to disable copying the channel to improve iteration time --- nixos/maintainers/scripts/openstack/openstack-image.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'nixos/maintainers') diff --git a/nixos/maintainers/scripts/openstack/openstack-image.nix b/nixos/maintainers/scripts/openstack/openstack-image.nix index 6638eb099938c..6728a98758b83 100644 --- a/nixos/maintainers/scripts/openstack/openstack-image.nix +++ b/nixos/maintainers/scripts/openstack/openstack-image.nix @@ -1,14 +1,18 @@ # nix-build '' -A config.system.build.openstackImage --arg configuration "{ imports = [ ./nixos/maintainers/scripts/openstack/openstack-image.nix ]; }" { config, lib, pkgs, ... }: +let + copyChannel = true; +in { imports = [ - ../../../modules/installer/cd-dvd/channel.nix ../../../modules/virtualisation/openstack-config.nix - ]; + ] ++ (lib.optional copyChannel ../../../modules/installer/cd-dvd/channel.nix); + + documentation.enable = copyChannel; system.build.openstackImage = import ../../../lib/make-disk-image.nix { - inherit lib config; + inherit lib config copyChannel; additionalSpace = "1024M"; pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package format = "qcow2"; -- cgit 1.4.1