diff options
| author | Aleksana <me@aleksana.moe> | 2024-05-18 14:42:39 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-18 14:42:39 +0800 |
| commit | 037bda55702e56f83b07f6bd617a1dd93aecdbfe (patch) | |
| tree | 3990c46acbbc18b891b090d69d2182f8af79b50b | |
| parent | 01c9b37510cdc09bfa666277b6fbef83d8d148d4 (diff) | |
| parent | 27e5b8e6ec24509b457a4332e60793d0e1e7e52c (diff) | |
Merge pull request #311566 from martinetd/bpftrace_llvm17
bcc/bpftrace: use default llvmPackages
| -rw-r--r-- | pkgs/by-name/bc/bcc/package.nix | 1 | ||||
| -rw-r--r-- | pkgs/by-name/bp/bpftrace/package.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
3 files changed, 2 insertions, 8 deletions
diff --git a/pkgs/by-name/bc/bcc/package.nix b/pkgs/by-name/bc/bcc/package.nix index 3cf9b26f4fdda..ae8ab4fcaccbd 100644 --- a/pkgs/by-name/bc/bcc/package.nix +++ b/pkgs/by-name/bc/bcc/package.nix @@ -118,5 +118,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://iovisor.github.io/bcc/"; license = licenses.asl20; maintainers = with maintainers; [ ragge mic92 thoughtpolice martinetd ]; + platforms = platforms.linux; }; } diff --git a/pkgs/by-name/bp/bpftrace/package.nix b/pkgs/by-name/bp/bpftrace/package.nix index 068f4532451b0..dff13ecab56ad 100644 --- a/pkgs/by-name/bp/bpftrace/package.nix +++ b/pkgs/by-name/bp/bpftrace/package.nix @@ -67,5 +67,6 @@ stdenv.mkDerivation rec { mainProgram = "bpftrace"; license = licenses.asl20; maintainers = with maintainers; [ rvl thoughtpolice martinetd mfrw ]; + platforms = platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b37b9e31112a5..32999844a62bc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18256,14 +18256,6 @@ with pkgs; bpftools = callPackage ../os-specific/linux/bpftools { }; - bcc = callPackage ../by-name/bc/bcc/package.nix { - llvmPackages = llvmPackages_16; - }; - - bpftrace = callPackage ../by-name/bp/bpftrace/package.nix { - llvmPackages = llvmPackages_16; - }; - bpm-tools = callPackage ../tools/audio/bpm-tools { }; byacc = callPackage ../development/tools/parsing/byacc { }; |