From: Yureka Lilian <yureka@cyberchaos.dev>
To: devel@spectrum-os.org
Cc: Yureka Lilian <yureka@cyberchaos.dev>
Subject: [DO_NOT_APPLY 2/2] temporary changes for testing
Date: Sun, 24 Aug 2025 00:21:32 +0200 [thread overview]
Message-ID: <20250823222134.1772413-3-yureka@cyberchaos.dev> (raw)
In-Reply-To: <20250823222134.1772413-1-yureka@cyberchaos.dev>
Signed-off-by: Yureka Lilian <yureka@cyberchaos.dev>
---
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
prev parent reply other threads:[~2025-08-23 22:22 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-23 22:21 [DO_NOT_APPLY 0/2] xdp-forwarder Yureka Lilian
2025-08-23 22:21 ` [DO_NOT_APPLY 1/2] integrate xdp-forwarder into net-vm Yureka Lilian
2025-08-30 10:59 ` Alyssa Ross
2025-08-31 17:10 ` Alyssa Ross
2025-08-31 18:06 ` Yureka
2025-08-31 20:50 ` Yureka
2025-09-01 13:59 ` Alyssa Ross
2025-09-01 14:04 ` Yureka
2025-09-01 14:12 ` Alyssa Ross
2025-08-23 22:21 ` Yureka Lilian [this message]
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=20250823222134.1772413-3-yureka@cyberchaos.dev \
--to=yureka@cyberchaos.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).