Unverified Commit 037bda55 authored by Aleksana's avatar Aleksana Committed by GitHub
Browse files

Merge pull request #311566 from martinetd/bpftrace_llvm17 

bcc/bpftrace: use default llvmPackages
parents 01c9b375 27e5b8e6

pkgs/by-name/bc/bcc/package.nix

+1 −0
Original line number Diff line number Diff line
@@ -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;

  };

}

pkgs/by-name/bp/bpftrace/package.nix

+1 −0
Original line number Diff line number Diff line
@@ -67,5 +67,6 @@ stdenv.mkDerivation rec { 
    mainProgram = "bpftrace";

    license     = licenses.asl20;

    maintainers = with maintainers; [ rvl thoughtpolice martinetd mfrw ];

    platforms   = platforms.linux;

  };

}

pkgs/top-level/all-packages.nix

+0 −8
Original line number Diff line number Diff line
@@ -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 { };