From: Yureka <yuka@yuka.dev>
To: devel@spectrum-os.org
Cc: Yureka <yuka@yuka.dev>
Subject: [PATCH] fix imports after repo merge
Date: Sun, 12 Dec 2021 14:22:32 +0100 [thread overview]
Message-ID: <20211212132232.2818660-1-yuka@yuka.dev> (raw)
---
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
next reply other threads:[~2021-12-12 13:23 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-12 13:22 Yureka [this message]
2021-12-16 4:12 ` Alyssa Ross
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211212132232.2818660-1-yuka@yuka.dev \
--to=yuka@yuka.dev \
--cc=devel@spectrum-os.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).