From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id EEC2922C47; Sat, 23 Aug 2025 22:22:24 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id BBFEC22C30; Sat, 23 Aug 2025 22:22:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-0.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DMARC_PASS,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=4.0.1 Received: from mail.cyberchaos.dev (mail.cyberchaos.dev [IPv6:2a0f:4ac0::3a11]) by atuin.qyliss.net (Postfix) with ESMTPS id 04A9222C2B for ; Sat, 23 Aug 2025 22:22:21 +0000 (UTC) From: Yureka Lilian DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cyberchaos.dev; s=mail; t=1755987740; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=b3OL6A01tLpCFLgPp32eSQwZjw0Ul7cCUJ/jxEDYIEw=; b=O3jvfQinlZqyyyJvm07VJXENJLvj3s9Q8CB8tSTNy+UhawZjmZ4xNWKn47RYaAea8DNaH7 5K4/+pnnLM08GpxLuT+k6cWbaMRnnyHWSHPl60YOuuwFy3GXDo6/WDPdg5szzJdBjw3bgE TKYNz5cZ1ytKU1oXScQqvMi0yfVnH9A= To: devel@spectrum-os.org Subject: [DO_NOT_APPLY 2/2] temporary changes for testing Date: Sun, 24 Aug 2025 00:21:32 +0200 Message-ID: <20250823222134.1772413-3-yureka@cyberchaos.dev> In-Reply-To: <20250823222134.1772413-1-yureka@cyberchaos.dev> References: <20250823222134.1772413-1-yureka@cyberchaos.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: 64HSE6X3OFZA6DDESXPYNCJO3X3WE3YD X-Message-ID-Hash: 64HSE6X3OFZA6DDESXPYNCJO3X3WE3YD X-MailFrom: yureka@cyberchaos.dev X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-devel.spectrum-os.org-0; header-match-devel.spectrum-os.org-1; header-match-devel.spectrum-os.org-2; header-match-devel.spectrum-os.org-3; header-match-devel.spectrum-os.org-4; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Yureka Lilian X-Mailman-Version: 3.3.9 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Signed-off-by: Yureka Lilian --- lib/nixpkgs.default.nix | 4 ++-- vm/sys/net/default.nix | 19 +++++++++++++++++-- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/lib/nixpkgs.default.nix b/lib/nixpkgs.default.nix index 50ffa84..5ac9986 100644 --- a/lib/nixpkgs.default.nix +++ b/lib/nixpkgs.default.nix @@ -4,6 +4,6 @@ # Generated by scripts/update-nixpkgs.sh. import (builtins.fetchTarball { - url = "https://github.com/NixOS/nixpkgs/archive/6e1ffe6ba3c38d429bd15079a0935f3a86ae5e2c.tar.gz"; - sha256 = "0mh2g0x6f8sfk9n4wl6mmwd3qwwfcdm0wjmcfqk28vb2hi6j7xxm"; + url = "https://github.com/NixOS/nixpkgs/archive/0d2db936fc6a3b4b6723957ed2e51ce315b848e1.tar.gz"; + sha256 = "1ydp8lwpk7zira5ms429k2ig3qcm7bd4jlwvzmhhvzjsm4qm36xn"; }) diff --git a/vm/sys/net/default.nix b/vm/sys/net/default.nix index 335c938..5620d52 100644 --- a/vm/sys/net/default.nix +++ b/vm/sys/net/default.nix @@ -8,7 +8,8 @@ pkgsMusl.callPackage ( { lib, stdenvNoCC, nixos, runCommand, writeClosure , erofs-utils, jq, s6-rc, util-linux, xorg , busybox, dbus, execline, kmod, linux_latest, mdevd -, s6, s6-linux-init, xdp-tools +, s6, s6-linux-init, xdp-tools, libbpf, fetchFromGitHub +, iproute2 }: let @@ -16,7 +17,20 @@ let inherit (nixosAllHardware.config.hardware) firmware; packages = [ - dbus execline kmod mdevd s6 s6-linux-init s6-rc xdp-tools + dbus execline kmod mdevd s6 s6-linux-init s6-rc iproute2 + + (xdp-tools.override { + libbpf = libbpf.overrideAttrs (_old: rec { + version = "1.6.2"; + src = fetchFromGitHub { + owner = "libbpf"; + repo = "libbpf"; + rev = "v${version}"; + hash = "sha256-igjjwirg3O5mC3DzGCAO9OgrH2drnE/gV6NH7ZLNnFE="; + }; + postInstall = " "; + }); + }) (pkgsMusl.callPackage ./xdp-forwarder { linux = kernel; @@ -24,6 +38,7 @@ let (busybox.override { extraConfig = '' + CONFIG_IP n CONFIG_DEPMOD n CONFIG_INIT n CONFIG_INSMOD n -- 2.50.1