From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.6 Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 6813760DE3; Tue, 20 Sep 2022 11:10:07 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id 69F0960DB5; Tue, 20 Sep 2022 11:10:05 +0000 (UTC) Received: from mail-lj1-x22d.google.com (mail-lj1-x22d.google.com [IPv6:2a00:1450:4864:20::22d]) by atuin.qyliss.net (Postfix) with ESMTPS id 8799760E71 for ; Tue, 20 Sep 2022 11:10:02 +0000 (UTC) Received: by mail-lj1-x22d.google.com with SMTP id z20so2569648ljq.3 for ; Tue, 20 Sep 2022 04:10:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unikie.com; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date; bh=2ioIMVpXE8vaFwaW3dJ+eVoC27Grc/SLsMsJNYqoHUU=; b=OOCakOvTEZ4SsvHw7Vs6L/eCyJ8sNCqe6fmelaRsJj6TJf/QCEFX/UT+uFsH6jFeiX 0jTJvY/Ghj3qPdox17KGOvimkNWiRk8p2xXQVviS/9WIz+Z5DBEiOD5TZD4Sx80ho34U +vK/rHVuiULAIF12BuGzp8J+LtOnPxXM5b5MDAMizE8MJmiHIRzLJt82S/07dhb5QmpN 8ZHZ7SzRuP2zwvxfLQ/2B64ufzBu0+/cfvgbh3VLJ1DprYvLFG2jAtxrDghrttw3kUEk 25BNuML40iP0bN2WxrUhK2mutzzaxQKEDpSY79RXtx/GZ2jbtJjHsWRC1sB/xM4xDTYI K64w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date; bh=2ioIMVpXE8vaFwaW3dJ+eVoC27Grc/SLsMsJNYqoHUU=; b=XVWokn4jkDJz1kMuXOZIuNZ0YgRGgYv2b5RQLYZIm7XWSCewXO03ZrP2fFMLEcDAG1 3RnM/XikM274fXzPJ2NS8i88rNuCN1mlrspd9XK7QsMlMWrYEpy7uVFHCor6yMqRT/8g fA68MbMtedc1qG8oM3IkbOEgaFjW8/RF/48lVQaS6t6hOgRa664paA+ycbh7K50i4e6E rlwVHkdYozreh3wIPVo9gY8q5NE2ezNbvw9obmFIA7t+J7WsDlWpPdv058XZssSpYiKu AOFoi5HbE++kcEcy1AL03Oqv1DmjTLLw2oAmFgOGAW0rNkVXHxQv+0nPC70lj7JK2fls IBpA== X-Gm-Message-State: ACrzQf1vYO3YaUXejuKdgKQnIvErfVg49hdDFabnm3ed+GDr2X2k7W4k kUWdwCtHZSAYow/LRVKT5+1/0XcTeQ4ccg== X-Google-Smtp-Source: AMsMyM4qmj3d/Quj9JIHfTzhABanBH88Op/FRN2/9H15u5YLs9RAW2Xf42yucAqvPD4bRK+ZybpGSw== X-Received: by 2002:a05:651c:a05:b0:26c:5010:39d1 with SMTP id k5-20020a05651c0a0500b0026c501039d1mr3230440ljq.115.1663672201500; Tue, 20 Sep 2022 04:10:01 -0700 (PDT) Received: from blip.net (mobile-access-567351-194.dhcp.inet.fi. [86.115.81.194]) by smtp.gmail.com with ESMTPSA id n12-20020a05651203ec00b00494a8fecacesm256610lfq.192.2022.09.20.04.10.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Sep 2022 04:10:01 -0700 (PDT) From: Ville Ilvonen To: devel@spectrum-os.org Subject: [PATCH] fix: config support with vms Date: Tue, 20 Sep 2022 14:09:58 +0300 Message-Id: <20220920110958.2548848-1-ville.ilvonen@unikie.com> X-Mailer: git-send-email 2.37.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: KK3BLBSUCD7SJFO7PKRGTCTFEJ5WAODZ X-Message-ID-Hash: KK3BLBSUCD7SJFO7PKRGTCTFEJ5WAODZ X-MailFrom: ville.ilvonen@unikie.com X-Mailman-Rule-Hits: header-match-devel.spectrum-os.org-0 X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1 CC: Ville Ilvonen X-Mailman-Version: 3.3.5 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: with config.nix, the build of vms fails with error: undefined variable 'pkgs' .. 49| 50| kernel = pkgs.linux_latest.override { | ^ This fixes the issue for all default vms Signed-off-by: Ville Ilvonen --- vm/app/catgirl/default.nix | 1 + vm/app/lynx/default.nix | 1 + vm/sys/net/default.nix | 1 + 3 files changed, 3 insertions(+) diff --git a/vm/app/catgirl/default.nix b/vm/app/catgirl/default.nix index 61f1462..c33f512 100644 --- a/vm/app/catgirl/default.nix +++ b/vm/app/catgirl/default.nix @@ -13,6 +13,7 @@ config.pkgs.pkgsStatic.callPackage ( }: let + inherit (config) pkgs; inherit (lib) cleanSource cleanSourceWith concatMapStringsSep hasSuffix; packages = [ diff --git a/vm/app/lynx/default.nix b/vm/app/lynx/default.nix index ba715ec..f06ef1f 100644 --- a/vm/app/lynx/default.nix +++ b/vm/app/lynx/default.nix @@ -13,6 +13,7 @@ config.pkgs.pkgsStatic.callPackage ( }: let + inherit (config) pkgs; inherit (lib) cleanSource cleanSourceWith concatMapStringsSep hasSuffix; packages = [ diff --git a/vm/sys/net/default.nix b/vm/sys/net/default.nix index dfc7c35..b3dac9a 100644 --- a/vm/sys/net/default.nix +++ b/vm/sys/net/default.nix @@ -14,6 +14,7 @@ config.pkgs.pkgsStatic.callPackage ( }: let + inherit (config) pkgs; inherit (lib) cleanSource cleanSourceWith concatMapStringsSep hasSuffix; connman = connmanMinimal; -- 2.37.2