diff options
| author | Aaron Jheng <wentworth@outlook.com> | 2022-11-02 12:55:11 +0000 |
|---|---|---|
| committer | Aaron Jheng <wentworth@outlook.com> | 2022-11-03 22:31:38 +0000 |
| commit | d7618af3d8e0d33cfdf7303dfe1d6b32a3d69a28 (patch) | |
| tree | a2be7ced881d139fb8cbb661cfa9360aceb6b07d | |
| parent | 608eb68fd8ab9e50186ffc3d7c7e842618037c2b (diff) | |
| download | nixpkgs-d7618af3d8e0d33cfdf7303dfe1d6b32a3d69a28.tar nixpkgs-d7618af3d8e0d33cfdf7303dfe1d6b32a3d69a28.tar.gz nixpkgs-d7618af3d8e0d33cfdf7303dfe1d6b32a3d69a28.tar.bz2 nixpkgs-d7618af3d8e0d33cfdf7303dfe1d6b32a3d69a28.tar.lz nixpkgs-d7618af3d8e0d33cfdf7303dfe1d6b32a3d69a28.tar.xz nixpkgs-d7618af3d8e0d33cfdf7303dfe1d6b32a3d69a28.tar.zst nixpkgs-d7618af3d8e0d33cfdf7303dfe1d6b32a3d69a28.zip | |
perf: remove trace binary
| -rw-r--r-- | nixos/doc/manual/from_md/release-notes/rl-2211.section.xml | 7 | ||||
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-2211.section.md | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/perf/default.nix | 5 |
3 files changed, 14 insertions, 0 deletions
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index e9f4f707f52..0a7d87057a5 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -722,6 +722,13 @@ </listitem> <listitem> <para> + The <literal>trace</literal> binary from + <literal>perf-linux</literal> package has been removed, due to + being a duplicate of the <literal>perf</literal> binary. + </para> + </listitem> + <listitem> + <para> The <literal>aws</literal> package has been removed due to being abandoned by the upstream. It is recommended to use <literal>awscli</literal> or <literal>awscli2</literal> diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 9b5257ca8e1..1d0f1a013c4 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -235,6 +235,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). `python3.pkgs.influxgraph` packages, have been removed due to lack of upstream maintenance. +- The `trace` binary from `perf-linux` package has been removed, due to being a duplicate of the `perf` binary. + - The `aws` package has been removed due to being abandoned by the upstream. It is recommended to use `awscli` or `awscli2` instead. - The [CEmu TI-84 Plus CE emulator](https://ce-programming.github.io/CEmu) package has been renamed to `cemu-ti`. The [Cemu Wii U emulator](https://cemu.info) is now packaged as `cemu`. diff --git a/pkgs/os-specific/linux/kernel/perf/default.nix b/pkgs/os-specific/linux/kernel/perf/default.nix index 3693c9868df..969d1e2bb65 100644 --- a/pkgs/os-specific/linux/kernel/perf/default.nix +++ b/pkgs/os-specific/linux/kernel/perf/default.nix @@ -73,6 +73,11 @@ stdenv.mkDerivation { separateDebugInfo = true; installFlags = [ "install" "install-man" "ASCIIDOC8=1" "prefix=$(out)" ]; + postInstall ='' + # Same as perf. Remove. + rm -f $out/bin/trace + ''; + preFixup = '' # Pull in 'objdump' into PATH to make annotations work. # The embeded Python interpreter will search PATH to calculate the Python path configuration(Should be fixed by upstream). |