ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-13 09:17:07 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #199830 from martinetd/libbpf1

Browse Source
This commit is contained in:
Sandro 2022-12-08 23:22:05 +01:00 committed by GitHub
commit cdbc227501
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/servers/dns/knot-dns/default.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, pkg-config, gnutls, liburcu, lmdb, libcap_ng, libidn2, libunistring
, systemd, nettle, libedit, zlib, libiconv, libintl, libmaxminddb, libbpf, nghttp2, libmnl
, ngtcp2-gnutls
, ngtcp2-gnutls, xdp-tools
, autoreconfHook
, nixosTests, knot-resolver, knot-dns, runCommandLocal
}:
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
# TODO: add dnstap support?
] ++ lib.optionals stdenv.isLinux [
libcap_ng systemd
libbpf libmnl # XDP support (it's Linux kernel API)
xdp-tools libbpf libmnl # XDP support (it's Linux kernel API)
] ++ lib.optional stdenv.isDarwin zlib; # perhaps due to gnutls
enableParallelBuilding = true;
@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
deps = runCommandLocal "knot-deps-test"
{ nativeBuildInputs = [ (lib.getBin stdenv.cc.libc) ]; }
''
for libname in libngtcp2 libbpf; do
for libname in libngtcp2 libxdp libbpf; do
echo "Checking for $libname:"
ldd '${knot-dns.bin}/bin/knotd' | grep -F "$libname"
echo "OK"

1
pkgs/top-level/aliases.nix
View File

@ -749,6 +749,7 @@ mapAliases ({
libayatana-appindicator-gtk3 = libayatana-appindicator; # Added 2022-10-18
libbencodetools = bencodetools; # Added 2022-07-30
libbluedevil = throw "'libbluedevil' (Qt4) is unmaintained and unused since 'kde4.bluedevil's removal in 2017"; # Added 2022-06-14
libbpf_1 = libbpf; # Added 2022-12-06
libcanberra_gtk2 = throw "'libcanberra_gtk2' has been renamed to/replaced by 'libcanberra-gtk2'"; # Converted to throw 2022-02-22
libcanberra_gtk3 = throw "'libcanberra_gtk3' has been renamed to/replaced by 'libcanberra-gtk3'"; # Converted to throw 2022-02-22
libcap_manpages = throw "'libcap_manpages' has been renamed to/replaced by 'libcap.doc'"; # Converted to throw 2022-02-22

16
pkgs/top-level/all-packages.nix
View File

@ -11720,6 +11720,7 @@ with pkgs;
suricata = callPackage ../applications/networking/ids/suricata {
python = python3;
libbpf = libbpf_0;
};
sof-firmware = callPackage ../os-specific/linux/firmware/sof-firmware { };
@ -12344,9 +12345,7 @@ with pkgs;
tracebox = callPackage ../tools/networking/tracebox { stdenv = gcc10StdenvCompat; };
tracee = callPackage ../tools/security/tracee {
libbpf = libbpf_1; # keep inline with their submodule
};
tracee = callPackage ../tools/security/tracee { };
tracefilegen = callPackage ../development/tools/analysis/garcosim/tracefilegen { };
@ -16774,10 +16773,8 @@ with pkgs;
bump = callPackage ../development/tools/github/bump { };
libbpf_1 = callPackage ../os-specific/linux/libbpf { };
libbpf = callPackage ../os-specific/linux/libbpf { };
libbpf_0 = callPackage ../os-specific/linux/libbpf/0.x.nix { };
# until more issues are fixed default to libbpf 0.x
libbpf = libbpf_0;
bundlewrap = with python3.pkgs; toPythonApplication bundlewrap;
@ -16785,12 +16782,10 @@ with pkgs;
bcc = callPackage ../os-specific/linux/bcc {
python = python3;
libbpf = libbpf_1;
llvmPackages = llvmPackages_14;
};
bpftrace = callPackage ../os-specific/linux/bpftrace {
libbpf = libbpf_1;
llvmPackages = llvmPackages_14;
};
@ -17699,9 +17694,7 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security;
};
pahole = callPackage ../development/tools/misc/pahole {
libbpf = libbpf_1;
};
pahole = callPackage ../development/tools/misc/pahole { };
panopticon = callPackage ../development/tools/analysis/panopticon {};
@ -25976,7 +25969,6 @@ with pkgs;
enableMinimal = true;
guiSupport = false;
};
libbpf = libbpf_1;
};
systemdMinimal = systemd.override {
pname = "systemd-minimal";