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

libbpf: make libbpf_1 the default

Browse Source 
keep libbpf_0 around for suricatta
This commit is contained in:
Dominique Martinet 2022-11-06 18:03:26 +09:00
parent c94cdd0978
commit 6fa853a7fa
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -748,6 +748,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

@ -11717,6 +11717,7 @@ with pkgs;
suricata = callPackage ../applications/networking/ids/suricata {
python = python3;
libbpf = libbpf_0;
};
sof-firmware = callPackage ../os-specific/linux/firmware/sof-firmware { };
@ -12339,9 +12340,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 { };
@ -16763,10 +16762,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;
@ -16774,12 +16771,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;
};
@ -17686,9 +17681,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 {};
@ -25947,7 +25940,6 @@ with pkgs;
enableMinimal = true;
guiSupport = false;
};
libbpf = libbpf_1;
};
systemdMinimal = systemd.override {
pname = "systemd-minimal";