diff options
author | Alyssa Ross <hi@alyssa.is> | 2022-10-09 11:40:36 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2022-11-13 23:58:55 +0000 |
commit | 2b0083087c127c5abbc8d694719fd6b94c2a9995 (patch) | |
tree | a7c20de4bfd3579ca0d4623959cd4215e6b9f1ad /vm/app/lynx | |
parent | d30f0248583e523eddb716aa931489b11a44e3f6 (diff) | |
download | spectrum-2b0083087c127c5abbc8d694719fd6b94c2a9995.tar spectrum-2b0083087c127c5abbc8d694719fd6b94c2a9995.tar.gz spectrum-2b0083087c127c5abbc8d694719fd6b94c2a9995.tar.bz2 spectrum-2b0083087c127c5abbc8d694719fd6b94c2a9995.tar.lz spectrum-2b0083087c127c5abbc8d694719fd6b94c2a9995.tar.xz spectrum-2b0083087c127c5abbc8d694719fd6b94c2a9995.tar.zst spectrum-2b0083087c127c5abbc8d694719fd6b94c2a9995.zip |
img/app: extract from appvm-{lynx,catgirl}
This patch introduces a generic application VM image. It mounts a filesystem containing the application, and then launches a "run" script on that filesystem to start the application. The Nix store on the application filesystem is overlaid onto the generic Nix store, so shared paths don't have to be duplicated in the application filesystem. The "appvm" image is part of the Spectrum system — it lives on the root filesystem, not the user data partition. Users of course have the choice not to use the built in image if they don't want to, but this gives us a default to use for future features like starting VMs at runtime. Individual application VMs are now defined in a single Nix file each, using a VM builder function. I expect this is how Nix-based VMs would be defined in the user data partition, and then built with Nix into Spectrum VM configurations. The new top-level vm-lib directory is intended to be copied into user Nix expressions that build VMs, and therefore has to be usable standalone. User-defined VMs should not do any path deduplication with the system-provided base VM, so that the two can independently update Nixpkgs. But for VMs that are part of the system (which I consider the pre-built VMs to be, even though they're currently on the user data partition), we can safely deduplicate paths that we know to be present in the base image. So they go through vm/make-vm.nix, which is a wrapper around vm-lib/make-vm.nix that does this deduplication. Signed-off-by: Alyssa Ross <hi@alyssa.is> Message-Id: <20221009114036.463071-7-hi@alyssa.is>
Diffstat (limited to 'vm/app/lynx')
29 files changed, 0 insertions, 372 deletions
diff --git a/vm/app/lynx/Makefile b/vm/app/lynx/Makefile deleted file mode 100644 index ff42501..0000000 --- a/vm/app/lynx/Makefile +++ /dev/null @@ -1,129 +0,0 @@ -# SPDX-License-Identifier: EUPL-1.2+ -# SPDX-FileCopyrightText: 2021-2022 Alyssa Ross <hi@alyssa.is> - -# qemu-kvm is non-standard, but is present in at least Fedora and -# Nixpkgs. If you don't have qemu-kvm, you'll need to set e.g. -# QEMU_KVM = qemu-system-x86_64 -enable-kvm. -QEMU_KVM = qemu-kvm -CLOUD_HYPERVISOR = cloud-hypervisor - -VMM = qemu -SCRIPTS = ../../../scripts - -HOST_FILES = host/data/appvm-lynx/providers/net/netvm - -HOST_BUILD_FILES = \ - build/host/data/appvm-lynx/blk/root.img \ - build/host/data/appvm-lynx/vmlinux - -# We produce a directory, but that doesn't play nice with Make, -# because it won't know to update if some file in the directory is -# changed, or a file is created or removed in a subdirectory. Using -# the whole directory could also end up including files that aren't -# intended to be part of the input, like temporary editor files or -# .license files. So for all these reasons, only explicitly listed -# files are included in the build result. -build/svc: $(HOST_FILES) $(HOST_BUILD_FILES) - rm -rf $@ - mkdir -p $@ - - tar -c $(HOST_FILES) | tar -C $@ -x --strip-components 1 - tar -c $(HOST_BUILD_FILES) | tar -C $@ -x --strip-components 2 - -build/host/data/appvm-lynx/vmlinux: $(VMLINUX) - mkdir -p $$(dirname $@) - cp $(VMLINUX) $@ - -build/host/data/appvm-lynx/blk/root.img: $(SCRIPTS)/make-gpt.sh $(SCRIPTS)/sfdisk-field.awk build/rootfs.ext4 - mkdir -p $$(dirname $@) - $(SCRIPTS)/make-gpt.sh $@.tmp \ - build/rootfs.ext4:4f68bce3-e8cd-4db1-96e7-fbcaf984b709:41e8068d-38d5-4135-ad77-0da704743940:root - mv $@.tmp $@ - -# tar2ext4 will leave half a filesystem behind if it's interrupted -# half way through. -build/rootfs.ext4: build/rootfs.tar - mkdir -p $$(dirname $@) - tar2ext4 -i build/rootfs.tar -o $@.tmp - mv $@.tmp $@ - -VM_FILES = \ - etc/fstab \ - etc/init \ - etc/mdev.conf \ - etc/mdev/iface \ - etc/passwd \ - etc/resolv.conf \ - etc/s6-linux-init/scripts/rc.init -VM_DIRS = dev run proc sys \ - etc/s6-linux-init/env \ - etc/s6-linux-init/run-image/service - -# These are separate because they need to be included, but putting -# them as make dependencies would confuse make. -VM_LINKS = bin etc/ssl/certs/ca-certificates.crt - -VM_BUILD_FILES = build/etc/s6-rc - -build/empty: - mkdir -p $@ - -build/rootfs.tar: build/empty $(PACKAGES_TAR) $(VM_FILES) $(VM_BUILD_FILES) - cp --no-preserve=mode -f $(PACKAGES_TAR) $@ - tar $(TARFLAGS) --append -f $@ $(VM_FILES) $(VM_LINKS) - echo $(VM_BUILD_FILES) | cut -d/ -f2 | \ - tar $(TARFLAGS) --append -f $@ -C build -T - - for m in $(VM_DIRS); do \ - tar $(TARFLAGS) --append -hf $@ --xform="s,.*,$$m," build/empty ; \ - done - -VM_S6_RC_FILES = \ - etc/s6-rc/lynx/run \ - etc/s6-rc/lynx/type \ - etc/s6-rc/mdevd-coldplug/dependencies \ - etc/s6-rc/mdevd-coldplug/type \ - etc/s6-rc/mdevd-coldplug/up \ - etc/s6-rc/mdevd/notification-fd \ - etc/s6-rc/mdevd/run \ - etc/s6-rc/mdevd/type \ - etc/s6-rc/ok-all/contents \ - etc/s6-rc/ok-all/type - -build/etc/s6-rc: $(VM_S6_RC_FILES) - mkdir -p $$(dirname $@) - rm -rf $@ - - dir=$$(mktemp -d) && \ - tar -c $(VM_S6_RC_FILES) | tar -C $$dir -x --strip-components 2 && \ - s6-rc-compile $@ $$dir; \ - exit=$$?; rm -r $$dir; exit $$exit - -run-qemu: build/host/data/appvm-lynx/blk/root.img - $(QEMU_KVM) -m 128 -cpu host -machine q35,kernel=$(KERNEL) -vga none \ - -drive file=build/host/data/appvm-lynx/blk/root.img,if=virtio,format=raw,readonly=on \ - -append "console=ttyS0 root=PARTLABEL=root" \ - -netdev user,id=net0 \ - -device virtio-net,netdev=net0,mac=0A:B3:EC:00:00:00 \ - -chardev vc,id=virtiocon0 \ - -device virtio-serial-pci \ - -device virtconsole,chardev=virtiocon0 -.PHONY: run-qemu - -run-cloud-hypervisor: build/host/data/appvm-lynx/blk/root.img - $(CLOUD_HYPERVISOR) \ - --api-socket path=vmm.sock \ - --memory size=128M \ - --disk path=build/host/data/appvm-lynx/blk/root.img,readonly=on \ - --net tap=tap0,mac=0A:B3:EC:00:00:00 \ - --kernel $(KERNEL) \ - --cmdline "console=ttyS0 root=PARTLABEL=root" \ - --console tty \ - --serial pty -.PHONY: run-cloud-hypervisor - -run: run-$(VMM) -.PHONY: run - -clean: - rm -rf build -.PHONY: clean diff --git a/vm/app/lynx/bin b/vm/app/lynx/bin deleted file mode 120000 index 1e881ed..0000000 --- a/vm/app/lynx/bin +++ /dev/null @@ -1 +0,0 @@ -usr/bin \ No newline at end of file diff --git a/vm/app/lynx/default.nix b/vm/app/lynx/default.nix deleted file mode 100644 index 92635f3..0000000 --- a/vm/app/lynx/default.nix +++ /dev/null @@ -1,96 +0,0 @@ -# SPDX-License-Identifier: MIT -# SPDX-FileCopyrightText: 2021-2022 Alyssa Ross <hi@alyssa.is> - -{ config ? import ../../../nix/eval-config.nix {} -, terminfo ? config.pkgs.foot.terminfo -}: - -config.pkgs.pkgsStatic.callPackage ( - -{ lib, stdenvNoCC, runCommand, writeReferencesToFile, buildPackages -, jq, s6-rc, tar2ext4, util-linux -, busybox, cacert, execline, kmod, lynx, mdevd, s6, s6-linux-init -}: - -let - inherit (lib) cleanSource cleanSourceWith concatMapStringsSep hasSuffix; - - scripts = import ../../../scripts { inherit config; }; - - packages = [ - execline kmod lynx mdevd s6 s6-linux-init s6-rc - - (busybox.override { - extraConfig = '' - CONFIG_DEPMOD n - CONFIG_INSMOD n - CONFIG_LSMOD n - CONFIG_MODINFO n - CONFIG_MODPROBE n - CONFIG_RMMOD n - ''; - }) - ]; - - packagesSysroot = runCommand "packages-sysroot" { - inherit packages; - passAsFile = [ "packages" ]; - } '' - mkdir -p $out/usr/bin $out/usr/share - ln -s ${concatMapStringsSep " " (p: "${p}/bin/*") packages} $out/usr/bin - ln -s ${kernel}/lib "$out" - ln -s ${terminfo}/share/terminfo $out/usr/share - ln -s ${cacert}/etc/ssl $out/usr/share - ''; - - packagesTar = runCommand "packages.tar" {} '' - cd ${packagesSysroot} - tar -cf $out --verbatim-files-from \ - -T ${writeReferencesToFile packagesSysroot} . - ''; - - kernel = buildPackages.linux.override { - structuredExtraConfig = with lib.kernel; { - VIRTIO = yes; - VIRTIO_PCI = yes; - VIRTIO_BLK = yes; - VIRTIO_CONSOLE = yes; - EXT4_FS = yes; - DRM_BOCHS = yes; - DRM = yes; - AGP = yes; - }; - }; -in - -stdenvNoCC.mkDerivation { - name = "spectrum-appvm-lynx"; - - src = cleanSourceWith { - filter = name: _type: - name != "${toString ./.}/build" && - !(hasSuffix ".nix" name); - src = cleanSource ./.; - }; - - nativeBuildInputs = [ jq s6-rc tar2ext4 util-linux ]; - - PACKAGES_TAR = packagesTar; - VMLINUX = "${kernel.dev}/vmlinux"; - - makeFlags = [ "SCRIPTS=${scripts}" ]; - - installPhase = '' - mv build/svc $out - ''; - - enableParallelBuilding = true; - - passthru = { inherit kernel; }; - - meta = with lib; { - license = licenses.eupl12; - platforms = platforms.linux; - }; -} -) {} diff --git a/vm/app/lynx/etc/fstab b/vm/app/lynx/etc/fstab deleted file mode 100644 index 6a82ecc..0000000 --- a/vm/app/lynx/etc/fstab +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-License-Identifier: CC0-1.0 -# SPDX-FileCopyrightText: 2020-2021 Alyssa Ross <hi@alyssa.is> -proc /proc proc defaults 0 0 -devpts /dev/pts devpts defaults,gid=4,mode=620 0 0 -tmpfs /dev/shm tmpfs defaults 0 0 -sysfs /sys sysfs defaults 0 0 diff --git a/vm/app/lynx/etc/init b/vm/app/lynx/etc/init deleted file mode 100755 index 6424e22..0000000 --- a/vm/app/lynx/etc/init +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/execlineb -s0 -# SPDX-License-Identifier: EUPL-1.2+ -# SPDX-FileCopyrightText: 2022 Alyssa Ross <hi@alyssa.is> - -/bin/s6-linux-init -Bc /etc/s6-linux-init -- $@ diff --git a/vm/app/lynx/etc/mdev.conf b/vm/app/lynx/etc/mdev.conf deleted file mode 100644 index f114719..0000000 --- a/vm/app/lynx/etc/mdev.conf +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: EUPL-1.2+ -# SPDX-FileCopyrightText: 2021 Alyssa Ross <hi@alyssa.is> - --$MODALIAS=.* 0:0 660 +importas -iu MODALIAS MODALIAS modprobe -q $MODALIAS -$INTERFACE=.* 0:0 660 ! +/etc/mdev/iface diff --git a/vm/app/lynx/etc/mdev/iface b/vm/app/lynx/etc/mdev/iface deleted file mode 100755 index eb91e33..0000000 --- a/vm/app/lynx/etc/mdev/iface +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/execlineb -P -# SPDX-License-Identifier: EUPL-1.2+ -# SPDX-FileCopyrightText: 2020-2021 Alyssa Ross <hi@alyssa.is> - -importas -i INTERFACE INTERFACE - -if { test $INTERFACE != lo } - -# Our IP is encoded in the NIC-specific portion of the interface's MAC -# address. -backtick -E LOCAL_IP { - awk -F: "{printf \"100.64.%d.%d\\n\", \"0x\" $5, \"0x\" $6}" - /sys/class/net/${INTERFACE}/address -} - -if { ip address add ${LOCAL_IP}/32 dev $INTERFACE } -if { ip link set $INTERFACE up } -if { ip route add 169.254.0.1 dev $INTERFACE } -if { ip route add default via 169.254.0.1 dev $INTERFACE } - -# Try to wait for the network to be up. -# If we time out, well, there's not much we can do, so just carry on. -# In future, it would be better if the network VM notified us about -# network changes. -foreground { printf "Waiting for network… " } -foreground { - ifte { echo "Connected." } { echo "Timed out." } - pipeline { seq 10 } - forstdin _ - if -n { - redirfd -w 2 /dev/null - wget -qT 6 -O /dev/null http://ipv4.connman.net/online/status.html - } -} - -s6-rc -u change lynx diff --git a/vm/app/lynx/etc/passwd b/vm/app/lynx/etc/passwd deleted file mode 100644 index 29f3b25..0000000 --- a/vm/app/lynx/etc/passwd +++ /dev/null @@ -1 +0,0 @@ -root:x:0:0:System administrator:/:/bin/sh diff --git a/vm/app/lynx/etc/passwd.license b/vm/app/lynx/etc/passwd.license deleted file mode 100644 index 2b3b032..0000000 --- a/vm/app/lynx/etc/passwd.license +++ /dev/null @@ -1,2 +0,0 @@ -SPDX-License-Identifier: CC0-1.0 -SPDX-FileCopyrightText: 2020 Alyssa Ross <hi@alyssa.is> diff --git a/vm/app/lynx/etc/resolv.conf b/vm/app/lynx/etc/resolv.conf deleted file mode 100644 index 7fcdf3a..0000000 --- a/vm/app/lynx/etc/resolv.conf +++ /dev/null @@ -1,4 +0,0 @@ -# SPDX-License-Identifier: CC0-1.0 -# SPDX-FileCopyrightText: 2021 Alyssa Ross <hi@alyssa.is> - -nameserver 1.1.1.1 diff --git a/vm/app/lynx/etc/s6-linux-init/scripts/rc.init b/vm/app/lynx/etc/s6-linux-init/scripts/rc.init deleted file mode 100755 index 1016d0c..0000000 --- a/vm/app/lynx/etc/s6-linux-init/scripts/rc.init +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/execlineb -P -# SPDX-License-Identifier: EUPL-1.2+ -# SPDX-FileCopyrightText: 2020-2022 Alyssa Ross <hi@alyssa.is> - -if { s6-rc-init -c /etc/s6-rc /run/service } - -if { mkdir -p /dev/pts /dev/shm } -if { mount -a } - -s6-rc change ok-all diff --git a/vm/app/lynx/etc/s6-rc/lynx/run b/vm/app/lynx/etc/s6-rc/lynx/run deleted file mode 100755 index d0e7a83..0000000 --- a/vm/app/lynx/etc/s6-rc/lynx/run +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/execlineb -P -# SPDX-License-Identifier: EUPL-1.2+ -# SPDX-FileCopyrightText: 2021 Alyssa Ross <hi@alyssa.is> - -export TERM foot -export TERMINFO_DIRS /usr/share/terminfo -export TMPDIR /run - -backtick USER { id -un } -backtick HOME { - importas -i user USER - homeof $user -} - -importas -i home HOME -cd $home - -redirfd -u 0 /dev/hvc0 -fdmove -c 1 0 -fdmove -c 2 0 - -foreground { clear } -unexport ? - -# Run lynx, then a login shell to allow for debugging. -foreground { lynx https://spectrum-os.org/ } -exec -l sh diff --git a/vm/app/lynx/etc/s6-rc/lynx/type b/vm/app/lynx/etc/s6-rc/lynx/type deleted file mode 100644 index 5883cff..0000000 --- a/vm/app/lynx/etc/s6-rc/lynx/type +++ /dev/null @@ -1 +0,0 @@ -longrun diff --git a/vm/app/lynx/etc/s6-rc/lynx/type.license b/vm/app/lynx/etc/s6-rc/lynx/type.license deleted file mode 100644 index c49c11b..0000000 --- a/vm/app/lynx/etc/s6-rc/lynx/type.license +++ /dev/null @@ -1,2 +0,0 @@ -SPDX-License-Identifier: CC0-1.0 -SPDX-FileCopyrightText: 2021 Alyssa Ross <hi@alyssa.is> diff --git a/vm/app/lynx/etc/s6-rc/mdevd-coldplug/dependencies b/vm/app/lynx/etc/s6-rc/mdevd-coldplug/dependencies deleted file mode 100644 index 59b02b7..0000000 --- a/vm/app/lynx/etc/s6-rc/mdevd-coldplug/dependencies +++ /dev/null @@ -1,4 +0,0 @@ -# SPDX-License-Identifier: CC0-1.0 -# SPDX-FileCopyrightText: 2020 Alyssa Ross <hi@alyssa.is> -# -mdevd diff --git a/vm/app/lynx/etc/s6-rc/mdevd-coldplug/type b/vm/app/lynx/etc/s6-rc/mdevd-coldplug/type deleted file mode 100644 index bdd22a1..0000000 --- a/vm/app/lynx/etc/s6-rc/mdevd-coldplug/type +++ /dev/null @@ -1 +0,0 @@ -oneshot diff --git a/vm/app/lynx/etc/s6-rc/mdevd-coldplug/type.license b/vm/app/lynx/etc/s6-rc/mdevd-coldplug/type.license deleted file mode 100644 index 2b3b032..0000000 --- a/vm/app/lynx/etc/s6-rc/mdevd-coldplug/type.license +++ /dev/null @@ -1,2 +0,0 @@ -SPDX-License-Identifier: CC0-1.0 -SPDX-FileCopyrightText: 2020 Alyssa Ross <hi@alyssa.is> diff --git a/vm/app/lynx/etc/s6-rc/mdevd-coldplug/up b/vm/app/lynx/etc/s6-rc/mdevd-coldplug/up deleted file mode 100644 index 8698f7d..0000000 --- a/vm/app/lynx/etc/s6-rc/mdevd-coldplug/up +++ /dev/null @@ -1,4 +0,0 @@ -# SPDX-License-Identifier: EUPL-1.2+ -# SPDX-FileCopyrightText: 2020-2021 Alyssa Ross <hi@alyssa.is> - -mdevd-coldplug diff --git a/vm/app/lynx/etc/s6-rc/mdevd/notification-fd b/vm/app/lynx/etc/s6-rc/mdevd/notification-fd deleted file mode 100644 index 00750ed..0000000 --- a/vm/app/lynx/etc/s6-rc/mdevd/notification-fd +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/vm/app/lynx/etc/s6-rc/mdevd/notification-fd.license b/vm/app/lynx/etc/s6-rc/mdevd/notification-fd.license deleted file mode 100644 index 2b3b032..0000000 --- a/vm/app/lynx/etc/s6-rc/mdevd/notification-fd.license +++ /dev/null @@ -1,2 +0,0 @@ -SPDX-License-Identifier: CC0-1.0 -SPDX-FileCopyrightText: 2020 Alyssa Ross <hi@alyssa.is> diff --git a/vm/app/lynx/etc/s6-rc/mdevd/run b/vm/app/lynx/etc/s6-rc/mdevd/run deleted file mode 100644 index 6dacb13..0000000 --- a/vm/app/lynx/etc/s6-rc/mdevd/run +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/execlineb -P -# SPDX-License-Identifier: EUPL-1.2+ -# SPDX-FileCopyrightText: 2020-2021 Alyssa Ross <hi@alyssa.is> - -mdevd -D3 diff --git a/vm/app/lynx/etc/s6-rc/mdevd/type b/vm/app/lynx/etc/s6-rc/mdevd/type deleted file mode 100644 index 5883cff..0000000 --- a/vm/app/lynx/etc/s6-rc/mdevd/type +++ /dev/null @@ -1 +0,0 @@ -longrun diff --git a/vm/app/lynx/etc/s6-rc/mdevd/type.license b/vm/app/lynx/etc/s6-rc/mdevd/type.license deleted file mode 100644 index 2b3b032..0000000 --- a/vm/app/lynx/etc/s6-rc/mdevd/type.license +++ /dev/null @@ -1,2 +0,0 @@ -SPDX-License-Identifier: CC0-1.0 -SPDX-FileCopyrightText: 2020 Alyssa Ross <hi@alyssa.is> diff --git a/vm/app/lynx/etc/s6-rc/ok-all/contents b/vm/app/lynx/etc/s6-rc/ok-all/contents deleted file mode 100644 index c4ea84f..0000000 --- a/vm/app/lynx/etc/s6-rc/ok-all/contents +++ /dev/null @@ -1,4 +0,0 @@ -# SPDX-License-Identifier: CC0-1.0 -# SPDX-FileCopyrightText: 2021 Alyssa Ross <hi@alyssa.is> -# -mdevd-coldplug diff --git a/vm/app/lynx/etc/s6-rc/ok-all/type b/vm/app/lynx/etc/s6-rc/ok-all/type deleted file mode 100644 index 757b422..0000000 --- a/vm/app/lynx/etc/s6-rc/ok-all/type +++ /dev/null @@ -1 +0,0 @@ -bundle diff --git a/vm/app/lynx/etc/s6-rc/ok-all/type.license b/vm/app/lynx/etc/s6-rc/ok-all/type.license deleted file mode 100644 index c49c11b..0000000 --- a/vm/app/lynx/etc/s6-rc/ok-all/type.license +++ /dev/null @@ -1,2 +0,0 @@ -SPDX-License-Identifier: CC0-1.0 -SPDX-FileCopyrightText: 2021 Alyssa Ross <hi@alyssa.is> diff --git a/vm/app/lynx/etc/ssl/certs/ca-certificates.crt b/vm/app/lynx/etc/ssl/certs/ca-certificates.crt deleted file mode 120000 index 42d8e23..0000000 --- a/vm/app/lynx/etc/ssl/certs/ca-certificates.crt +++ /dev/null @@ -1 +0,0 @@ -/usr/share/ssl/certs/ca-bundle.crt \ No newline at end of file diff --git a/vm/app/lynx/host/data/appvm-lynx/providers/net/netvm b/vm/app/lynx/host/data/appvm-lynx/providers/net/netvm deleted file mode 100644 index e69de29..0000000 --- a/vm/app/lynx/host/data/appvm-lynx/providers/net/netvm +++ /dev/null diff --git a/vm/app/lynx/shell.nix b/vm/app/lynx/shell.nix deleted file mode 100644 index 852b246..0000000 --- a/vm/app/lynx/shell.nix +++ /dev/null @@ -1,17 +0,0 @@ -# SPDX-License-Identifier: MIT -# SPDX-FileCopyrightText: 2021 Alyssa Ross <hi@alyssa.is> - -{ config ? import ../../../nix/eval-config.nix {} }: - -with config.pkgs; - -(import ./. { inherit config; }).overrideAttrs ( -{ passthru ? {}, nativeBuildInputs ? [], ... }: - -{ - nativeBuildInputs = nativeBuildInputs ++ [ - cloud-hypervisor jq qemu_kvm reuse - ]; - - KERNEL = "${passthru.kernel.dev}/vmlinux"; -}) |