diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2022-12-04 16:38:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-04 16:38:30 +0100 |
| commit | a5878154938d3bb6d06ecc9311af253d01945370 (patch) | |
| tree | c0d712a81bbf4d95e074f242e13f6a638d22323f /pkgs/top-level | |
| parent | 5f6f7b474d330f4a7a5b0e75eb86e0004f56b89e (diff) | |
| parent | 3e5b243639786781dbdfcf5a9faba41b1364406a (diff) | |
Merge pull request #189078 from martinetd/bpftrace
bcc: 0.24.0 -> 0.25.0; bpftrace: 0.15.0 -> 0.16.0
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 11 | ||||
| -rw-r--r-- | pkgs/top-level/linux-kernels.nix | 3 |
2 files changed, 10 insertions, 4 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bcac77fdaebb2..033ffae5648e1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5105,6 +5105,8 @@ with pkgs; oci-cli = callPackage ../tools/admin/oci-cli { }; + oci-seccomp-bpf-hook = callPackage ../os-specific/linux/oci-seccomp-bpf-hook { }; + ocrmypdf = with python3.pkgs; toPythonApplication ocrmypdf; ocrfeeder = callPackage ../applications/graphics/ocrfeeder { }; @@ -16771,10 +16773,15 @@ with pkgs; bpftools = callPackage ../os-specific/linux/bpftools { }; bcc = callPackage ../os-specific/linux/bcc { - python = pkgs.python3; + python = python3; + libbpf = libbpf_1; + llvmPackages = llvmPackages_14; }; - bpftrace = callPackage ../os-specific/linux/bpftrace { }; + bpftrace = callPackage ../os-specific/linux/bpftrace { + libbpf = libbpf_1; + llvmPackages = llvmPackages_14; + }; bpm-tools = callPackage ../tools/audio/bpm-tools { }; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 760e3b1f20bf2..166f09f6e49a1 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -254,6 +254,7 @@ in { # Obsolete aliases (these packages do not depend on the kernel). inherit (pkgs) odp-dpdk pktgen; # added 2018-05 inherit (pkgs) bcc bpftrace; # added 2021-12 + inherit (pkgs) oci-seccomp-bpf-hook; # added 2022-11 acpi_call = callPackage ../os-specific/linux/acpi-call {}; @@ -421,8 +422,6 @@ in { netatop = callPackage ../os-specific/linux/netatop { }; - oci-seccomp-bpf-hook = if lib.versionAtLeast kernel.version "5.4" then callPackage ../os-specific/linux/oci-seccomp-bpf-hook { } else null; - perf = callPackage ../os-specific/linux/kernel/perf { }; phc-intel = if lib.versionAtLeast kernel.version "4.10" then callPackage ../os-specific/linux/phc-intel { } else null; |