* [PATCH] fix imports after repo merge
@ 2021-12-12 13:22 Yureka
2021-12-16 4:12 ` Alyssa Ross
0 siblings, 1 reply; 2+ messages in thread
From: Yureka @ 2021-12-12 13:22 UTC (permalink / raw)
To: devel; +Cc: Yureka
---
host/initramfs/extfs.nix | 6 +++---
host/initramfs/live.nix | 2 +-
host/rootfs/default.nix | 6 +++---
installer/default.nix | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/host/initramfs/extfs.nix b/host/initramfs/extfs.nix
index b26f6e1..c50df21 100644
--- a/host/initramfs/extfs.nix
+++ b/host/initramfs/extfs.nix
@@ -1,17 +1,17 @@
{ pkgs, runCommand, s6-rc, tar2ext4 }:
let
- netvm = import ../spectrum-netvm {
+ netvm = import ../../vm/sys/net {
inherit pkgs;
# inherit (foot) terminfo;
};
- appvm-catgirl = import ../spectrum-appvm-catgirl {
+ appvm-catgirl = import ../../vm/app/catgirl {
inherit pkgs;
# inherit (foot) terminfo;
};
- appvm-lynx = import ../spectrum-appvm-lynx {
+ appvm-lynx = import ../../vm/app/lynx {
inherit pkgs;
# inherit (foot) terminfo;
};
diff --git a/host/initramfs/live.nix b/host/initramfs/live.nix
index 27d868b..6446593 100644
--- a/host/initramfs/live.nix
+++ b/host/initramfs/live.nix
@@ -6,7 +6,7 @@
let
initramfs = callPackage ./. { };
- host-rootfs = import ../spectrum-rootfs { inherit pkgs; };
+ host-rootfs = import ../rootfs { inherit pkgs; };
extfs = pkgsStatic.callPackage ./extfs.nix { inherit pkgs; };
kernelTarget = stdenv.hostPlatform.linux-kernel.target;
diff --git a/host/rootfs/default.nix b/host/rootfs/default.nix
index fc347aa..21a9818 100644
--- a/host/rootfs/default.nix
+++ b/host/rootfs/default.nix
@@ -62,17 +62,17 @@ let
-T ${writeReferencesToFile packagesSysroot} .
'';
- netvm = import ../spectrum-netvm {
+ netvm = import ../../vm/sys/net {
inherit pkgs;
inherit (foot) terminfo;
};
- appvm-catgirl = import ../spectrum-appvm-catgirl {
+ appvm-catgirl = import ../../vm/app/catgirl {
inherit pkgs;
inherit (foot) terminfo;
};
- appvm-lynx = import ../spectrum-appvm-lynx {
+ appvm-lynx = import ../../vm/app/lynx {
inherit pkgs;
inherit (foot) terminfo;
};
diff --git a/installer/default.nix b/installer/default.nix
index 183a962..0685bdd 100644
--- a/installer/default.nix
+++ b/installer/default.nix
@@ -8,7 +8,7 @@ let
inherit (pkgs.lib) removePrefix;
inherit (nixos ./configuration.nix) config;
- image = import ../spectrum-initramfs/live.nix { inherit pkgs; };
+ image = import ../host/initramfs/live.nix { inherit pkgs; };
grub = grub2_efi;
--
2.34.0
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] fix imports after repo merge
2021-12-12 13:22 [PATCH] fix imports after repo merge Yureka
@ 2021-12-16 4:12 ` Alyssa Ross
0 siblings, 0 replies; 2+ messages in thread
From: Alyssa Ross @ 2021-12-16 4:12 UTC (permalink / raw)
To: Yureka; +Cc: devel
[-- Attachment #1: Type: text/plain, Size: 348 bytes --]
Yureka <yuka@yuka.dev> writes:
> ---
> host/initramfs/extfs.nix | 6 +++---
> host/initramfs/live.nix | 2 +-
> host/rootfs/default.nix | 6 +++---
> installer/default.nix | 2 +-
> 4 files changed, 8 insertions(+), 8 deletions(-)
Hi! Sorry, I'd missed this patch, and in the meantime fixed it myself
(in 6c692f8). Thanks anyway, though!
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-12-16 4:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-12 13:22 [PATCH] fix imports after repo merge Yureka
2021-12-16 4:12 ` Alyssa Ross
Code repositories for project(s) associated with this public inbox
https://spectrum-os.org/git/crosvm
https://spectrum-os.org/git/doc
https://spectrum-os.org/git/mktuntap
https://spectrum-os.org/git/nixpkgs
https://spectrum-os.org/git/spectrum
https://spectrum-os.org/git/ucspi-vsock
https://spectrum-os.org/git/www
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).