From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-3.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.6 Received: by atuin.qyliss.net (Postfix, from userid 496) id 5DA2C997B; Sun, 12 Dec 2021 13:23:01 +0000 (UTC) Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 8A9729948; Sun, 12 Dec 2021 13:22:45 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id 51E33993A; Sun, 12 Dec 2021 13:22:42 +0000 (UTC) Received: from mail.yuka.dev (mail.yuka.dev [195.39.247.168]) by atuin.qyliss.net (Postfix) with ESMTPS id 224B798B2 for ; Sun, 12 Dec 2021 13:22:40 +0000 (UTC) From: Yureka DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yuka.dev; s=mail; t=1639315359; bh=SDvZlmp4Wdc+CBPlpFqguqz2bVtZi7r3+BynbCLJKRU=; h=From:To:Cc:Subject:Date; b=IFNZp3VHTxV/NbPYrv9UN0jkFWURvS40hLxbsZg4Ltn4amUrnupCr4AOoPj8dvyHQ nKdoXUVC8YD9cbfZJp+nDfuSv65AXDyF9rPJxxdNAagBpoxzce6j2E6qlYQ8iLVE+R RUFBv/29DPR9ve+BCs8qSkNl2TibNoHvbj2n6Zmc= To: devel@spectrum-os.org Subject: [PATCH] fix imports after repo merge Date: Sun, 12 Dec 2021 14:22:32 +0100 Message-Id: <20211212132232.2818660-1-yuka@yuka.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: Q7Y3WINRIEFJC47AFKD2Y43QBHU2PPJF X-Message-ID-Hash: Q7Y3WINRIEFJC47AFKD2Y43QBHU2PPJF X-MailFrom: yuka@yuka.dev X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Yureka X-Mailman-Version: 3.3.4 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: --- 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