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/6e1ffe6ba3c38d429bd15079a0935f3a86a..."; - sha256 = "0mh2g0x6f8sfk9n4wl6mmwd3qwwfcdm0wjmcfqk28vb2hi6j7xxm"; + url = "https://github.com/NixOS/nixpkgs/archive/0d2db936fc6a3b4b6723957ed2e51ce315b..."; + 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