summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Yin <xiaoyin_c@qq.com>2024-09-04 17:18:17 +0800
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2024-10-16 16:52:25 +0000
commite0c8aa0c4a7339f19e2378eed5a9c8636d251cbd (patch)
treef2d23e2194f414a78fe11eb7db7391b86fd9c2a2
parentMerge: [Backport release-24.05] percona: update packages, init 8.4 (#346437) (diff)
downloadnixpkgs-origin/backport-339505-to-release-24.05.tar.gz
python3Packages.bcc: init at 0.31.0origin/backport-339505-to-release-24.05
(cherry picked from commit fb27fe2102a950d02cd71d4364e5f1cf11481a56)
-rw-r--r--pkgs/by-name/bc/bcc/package.nix10
-rw-r--r--pkgs/top-level/python-packages.nix2
2 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/by-name/bc/bcc/package.nix b/pkgs/by-name/bc/bcc/package.nix
index ae8ab4fcaccb..af7b3b8f6fac 100644
--- a/pkgs/by-name/bc/bcc/package.nix
+++ b/pkgs/by-name/bc/bcc/package.nix
@@ -13,12 +13,12 @@
, makeWrapper
, netperf
, nixosTests
-, python3
+, python3Packages
, stdenv
, zip
}:
-python3.pkgs.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
pname = "bcc";
version = "0.30.0";
@@ -44,14 +44,14 @@ python3.pkgs.buildPythonApplication rec {
./fix-deadlock-detector-import.patch
];
- propagatedBuildInputs = [ python3.pkgs.netaddr ];
+ propagatedBuildInputs = [ python3Packages.netaddr ];
nativeBuildInputs = [
bison
cmake
flex
llvmPackages.llvm.dev
makeWrapper
- python3.pkgs.setuptools
+ python3Packages.setuptools
zip
];
@@ -82,7 +82,7 @@ python3.pkgs.buildPythonApplication rec {
preInstall = ''
# required for setuptool during install
- export PYTHONPATH=$out/${python3.sitePackages}:$PYTHONPATH
+ export PYTHONPATH=$out/${python3Packages.python.sitePackages}:$PYTHONPATH
'';
postInstall = ''
mkdir -p $out/bin $out/share
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5ba7d0a8059f..06b1f258fdd2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1434,6 +1434,8 @@ self: super: with self; {
bbox = callPackage ../development/python-modules/bbox { };
+ bcc = toPythonModule (pkgs.bcc.override { python3Packages = self; });
+
bc-detect-secrets = callPackage ../development/python-modules/bc-detect-secrets { };
bc-jsonpath-ng = callPackage ../development/python-modules/bc-jsonpath-ng { };