diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-29 12:02:32 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-29 12:02:32 +0000 |
| commit | 1785d7020c1941a84455afa4df64acec7062989e (patch) | |
| tree | e8dc5dec638ea94d24bd53123f75dd682bad1405 | |
| parent | Merge release-21.05 into staging-next-21.05 (diff) | |
| parent | linuxPackages_latest.perf: fix build (diff) | |
| download | nixpkgs-1785d7020c1941a84455afa4df64acec7062989e.tar.gz | |
Merge release-21.05 into staging-next-21.05
| -rw-r--r-- | pkgs/os-specific/linux/bpftools/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/perf.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/bpftools/default.nix b/pkgs/os-specific/linux/bpftools/default.nix index 3e20efa9f012..f2ca8d874714 100644 --- a/pkgs/os-specific/linux/bpftools/default.nix +++ b/pkgs/os-specific/linux/bpftools/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { buildInputs = [ libopcodes libbfd libelf zlib readline ]; preConfigure = '' - patchShebangs scripts/bpf_helpers_doc.py + patchShebangs scripts/bpf_doc.py cd tools/bpf substituteInPlace ./bpftool/Makefile \ diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index b28e16590839..55ed30bc724d 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation { ]; postPatch = '' - patchShebangs scripts/bpf_helpers_doc.py + patchShebangs scripts/bpf*_doc.py ''; doCheck = false; # requires "sparse" |