dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #321962 from LostAttractor/iproute2/libbpf

Browse Source
This commit is contained in:
Franz Pletz 2024-07-07 02:08:31 +02:00 committed by GitHub
commit e5fadeaa27
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/doc/manual/release-notes/rl-2411.section.md
View File

@ -221,3 +221,5 @@
should be changed to using *runner authentication tokens* by configuring
{option}`services.gitlab-runner.services.<name>.authenticationTokenConfigFile` instead of the former
{option}`services.gitlab-runner.services.<name>.registrationConfigFile` option.
- `iproute2` now has libbpf support.

4
pkgs/os-specific/linux/iproute/default.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl
, buildPackages, bison, flex, pkg-config
, db, iptables, elfutils, libmnl
, db, iptables, elfutils, libmnl ,libbpf
, gitUpdater
}:
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
depsBuildBuild = [ buildPackages.stdenv.cc ]; # netem requires $HOSTCC
nativeBuildInputs = [ bison flex pkg-config ];
buildInputs = [ db iptables libmnl ]
buildInputs = [ db iptables libmnl libbpf ]
# needed to uploaded bpf programs
++ lib.optionals (!stdenv.hostPlatform.isStatic) [ elfutils ];